Continued restructuring of the code (namespace hierarchy, import control).