diff --git a/override/classes/Accounting.php b/override/classes/Accounting.php
deleted file mode 100644
index 7d07a69ae..000000000
--- a/override/classes/Accounting.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class Accounting extends AccountingCore
-{
-
-}
-
diff --git a/override/classes/CarrierModule.php b/override/classes/module/CarrierModule.php
similarity index 100%
rename from override/classes/CarrierModule.php
rename to override/classes/module/CarrierModule.php
diff --git a/override/classes/ImportModule.php b/override/classes/module/ImportModule.php
similarity index 100%
rename from override/classes/ImportModule.php
rename to override/classes/module/ImportModule.php
diff --git a/override/classes/Module.php b/override/classes/module/Module.php
similarity index 100%
rename from override/classes/Module.php
rename to override/classes/module/Module.php
diff --git a/override/classes/ModuleGraph.php b/override/classes/module/ModuleGraph.php
similarity index 100%
rename from override/classes/ModuleGraph.php
rename to override/classes/module/ModuleGraph.php
diff --git a/override/classes/ModuleGraphEngine.php b/override/classes/module/ModuleGraphEngine.php
similarity index 100%
rename from override/classes/ModuleGraphEngine.php
rename to override/classes/module/ModuleGraphEngine.php
diff --git a/override/classes/ModuleGrid.php b/override/classes/module/ModuleGrid.php
similarity index 100%
rename from override/classes/ModuleGrid.php
rename to override/classes/module/ModuleGrid.php
diff --git a/override/classes/ModuleGridEngine.php b/override/classes/module/ModuleGridEngine.php
similarity index 100%
rename from override/classes/ModuleGridEngine.php
rename to override/classes/module/ModuleGridEngine.php
diff --git a/override/classes/range/Range.php b/override/classes/range/Range.php
new file mode 100644
index 000000000..aa79c07f1
--- /dev/null
+++ b/override/classes/range/Range.php
@@ -0,0 +1,7 @@
+<?php
+
+class Range extends RangeCore
+{
+
+}
+
diff --git a/override/classes/RangePrice.php b/override/classes/range/RangePrice.php
similarity index 100%
rename from override/classes/RangePrice.php
rename to override/classes/range/RangePrice.php
diff --git a/override/classes/RangeWeight.php b/override/classes/range/RangeWeight.php
similarity index 100%
rename from override/classes/RangeWeight.php
rename to override/classes/range/RangeWeight.php
diff --git a/override/controllers/admin/AdminAccountingConfigurationController.php b/override/controllers/admin/AdminAccountingConfigurationController.php
deleted file mode 100644
index 412a22b0b..000000000
--- a/override/controllers/admin/AdminAccountingConfigurationController.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class AdminAccountingConfigurationController extends AdminAccountingConfigurationControllerCore
-{
-
-}
-
diff --git a/override/controllers/admin/AdminAccountingExportController.php b/override/controllers/admin/AdminAccountingExportController.php
deleted file mode 100644
index a421c778d..000000000
--- a/override/controllers/admin/AdminAccountingExportController.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class AdminAccountingExportController extends AdminAccountingExportControllerCore
-{
-
-}
-
diff --git a/override/controllers/admin/AdminAccountingManagementController.php b/override/controllers/admin/AdminAccountingManagementController.php
deleted file mode 100644
index 1be562a34..000000000
--- a/override/controllers/admin/AdminAccountingManagementController.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class AdminAccountingManagementController extends AdminAccountingManagementControllerCore
-{
-
-}
-
diff --git a/override/controllers/admin/AdminAccountingRegisteredNumberController.php b/override/controllers/admin/AdminAccountingRegisteredNumberController.php
deleted file mode 100644
index aefbf5c09..000000000
--- a/override/controllers/admin/AdminAccountingRegisteredNumberController.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class AdminAccountingRegisteredNumberController extends AdminAccountingRegisteredNumberControllerCore
-{
-
-}
-