Reorganization of the module structure.