Reorganized module to be compatible with new ModuleInstaller.