diff --git a/cache/class_index.php b/cache/class_index.php
index 50c8518c5..be55fad6c 100644
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -240,7 +240,7 @@
   'Carrier' => 'override/classes/Carrier.php',
   'CarrierCore' => 'classes/Carrier.php',
   'CarrierModule' => 'override/classes/CarrierModule.php',
-  'CarrierModuleCore' => 'classes/CarrierModule.php',
+  'CarrierModuleCore' => 'classes/module/CarrierModule.php',
   'Cart' => 'override/classes/Cart.php',
   'CartController' => 'override/controllers/front/CartController.php',
   'CartControllerCore' => 'controllers/front/CartController.php',
@@ -380,7 +380,7 @@
   'ImageType' => 'override/classes/ImageType.php',
   'ImageTypeCore' => 'classes/ImageType.php',
   'ImportModule' => 'override/classes/ImportModule.php',
-  'ImportModuleCore' => 'classes/ImportModule.php',
+  'ImportModuleCore' => 'classes/module/ImportModule.php',
   'IndexController' => 'override/controllers/front/IndexController.php',
   'IndexControllerCore' => 'controllers/front/IndexController.php',
   'Language' => 'override/classes/Language.php',
@@ -406,17 +406,17 @@
   'Module' => 'override/classes/Module.php',
   'ModuleAdminController' => 'override/classes/controller/ModuleAdminController.php',
   'ModuleAdminControllerCore' => 'classes/controller/ModuleAdminController.php',
-  'ModuleCore' => 'classes/Module.php',
+  'ModuleCore' => 'classes/module/Module.php',
   'ModuleFrontController' => 'override/classes/controller/ModuleFrontController.php',
   'ModuleFrontControllerCore' => 'classes/controller/ModuleFrontController.php',
   'ModuleGraph' => 'override/classes/ModuleGraph.php',
-  'ModuleGraphCore' => 'classes/ModuleGraph.php',
+  'ModuleGraphCore' => 'classes/module/ModuleGraph.php',
   'ModuleGraphEngine' => 'override/classes/ModuleGraphEngine.php',
-  'ModuleGraphEngineCore' => 'classes/ModuleGraphEngine.php',
+  'ModuleGraphEngineCore' => 'classes/module/ModuleGraphEngine.php',
   'ModuleGrid' => 'override/classes/ModuleGrid.php',
-  'ModuleGridCore' => 'classes/ModuleGrid.php',
+  'ModuleGridCore' => 'classes/module/ModuleGrid.php',
   'ModuleGridEngine' => 'override/classes/ModuleGridEngine.php',
-  'ModuleGridEngineCore' => 'classes/ModuleGridEngine.php',
+  'ModuleGridEngineCore' => 'classes/module/ModuleGridEngine.php',
   'MyAccountController' => 'override/controllers/front/MyAccountController.php',
   'MyAccountControllerCore' => 'controllers/front/MyAccountController.php',
   'MySQL' => 'override/classes/db/MySQL.php',