Starting refactoring of the ModuleManager.