diff --git a/modules/module_manager/conf/action.xml b/modules/module/conf/action.xml
similarity index 100%
rename from modules/module_manager/conf/action.xml
rename to modules/module/conf/action.xml
diff --git a/modules/module_manager/conf/info.xml b/modules/module/conf/info.xml
similarity index 100%
rename from modules/module_manager/conf/info.xml
rename to modules/module/conf/info.xml
diff --git a/modules/module_manager/lang/ko.lang.php b/modules/module/lang/ko.lang.php
similarity index 100%
rename from modules/module_manager/lang/ko.lang.php
rename to modules/module/lang/ko.lang.php
diff --git a/modules/module_manager/module_manager.controller.php b/modules/module/module_manager.controller.php
similarity index 100%
rename from modules/module_manager/module_manager.controller.php
rename to modules/module/module_manager.controller.php
diff --git a/modules/module_manager/module_manager.model.php b/modules/module/module_manager.model.php
similarity index 100%
rename from modules/module_manager/module_manager.model.php
rename to modules/module/module_manager.model.php
diff --git a/modules/module_manager/module_manager.view.php b/modules/module/module_manager.view.php
similarity index 100%
rename from modules/module_manager/module_manager.view.php
rename to modules/module/module_manager.view.php
diff --git a/modules/module_manager/queries/clearDefaultModule.xml b/modules/module/queries/clearDefaultModule.xml
similarity index 100%
rename from modules/module_manager/queries/clearDefaultModule.xml
rename to modules/module/queries/clearDefaultModule.xml
diff --git a/modules/module_manager/queries/deleteModule.xml b/modules/module/queries/deleteModule.xml
similarity index 100%
rename from modules/module_manager/queries/deleteModule.xml
rename to modules/module/queries/deleteModule.xml
diff --git a/modules/module_manager/queries/getDefaultMidInfo.xml b/modules/module/queries/getDefaultMidInfo.xml
similarity index 100%
rename from modules/module_manager/queries/getDefaultMidInfo.xml
rename to modules/module/queries/getDefaultMidInfo.xml
diff --git a/modules/module_manager/queries/getMidInfo.xml b/modules/module/queries/getMidInfo.xml
similarity index 100%
rename from modules/module_manager/queries/getMidInfo.xml
rename to modules/module/queries/getMidInfo.xml
diff --git a/modules/module_manager/queries/getModuleInfoByDocument.xml b/modules/module/queries/getModuleInfoByDocument.xml
similarity index 100%
rename from modules/module_manager/queries/getModuleInfoByDocument.xml
rename to modules/module/queries/getModuleInfoByDocument.xml
diff --git a/modules/module_manager/queries/insertModule.xml b/modules/module/queries/insertModule.xml
similarity index 100%
rename from modules/module_manager/queries/insertModule.xml
rename to modules/module/queries/insertModule.xml
diff --git a/modules/module_manager/queries/updateModule.xml b/modules/module/queries/updateModule.xml
similarity index 100%
rename from modules/module_manager/queries/updateModule.xml
rename to modules/module/queries/updateModule.xml
diff --git a/modules/module_manager/queries/updateModuleExtraVars.xml b/modules/module/queries/updateModuleExtraVars.xml
similarity index 100%
rename from modules/module_manager/queries/updateModuleExtraVars.xml
rename to modules/module/queries/updateModuleExtraVars.xml
diff --git a/modules/module_manager/queries/updateModuleGrant.xml b/modules/module/queries/updateModuleGrant.xml
similarity index 100%
rename from modules/module_manager/queries/updateModuleGrant.xml
rename to modules/module/queries/updateModuleGrant.xml
diff --git a/modules/module_manager/schemas/module_addon.xml b/modules/module/schemas/module_addon.xml
similarity index 100%
rename from modules/module_manager/schemas/module_addon.xml
rename to modules/module/schemas/module_addon.xml
diff --git a/modules/module_manager/schemas/module_plugin.xml b/modules/module/schemas/module_plugin.xml
similarity index 100%
rename from modules/module_manager/schemas/module_plugin.xml
rename to modules/module/schemas/module_plugin.xml
diff --git a/modules/module_manager/schemas/modules.xml b/modules/module/schemas/modules.xml
similarity index 100%
rename from modules/module_manager/schemas/modules.xml
rename to modules/module/schemas/modules.xml
diff --git a/modules/module_manager/tpl.admin/index.html b/modules/module/tpl.admin/index.html
similarity index 100%
rename from modules/module_manager/tpl.admin/index.html
rename to modules/module/tpl.admin/index.html