diff --git a/cache/class_index.php b/cache/class_index.php
index 60f81638b..9608a198b 100644
--- a/cache/class_index.php
+++ b/cache/class_index.php
@@ -99,11 +99,9 @@
   'GenderCore' => 'classes/Gender.php',
   'Gender' => 'override/classes/Gender.php',
   'GroupCore' => 'classes/Group.php',
-  'Group' => 'override/classes/Group.php',
+  'Group' => '',
   'GroupReductionCore' => 'classes/GroupReduction.php',
   'GroupReduction' => 'override/classes/GroupReduction.php',
-  'GroupShopCore' => 'classes/GroupShop.php',
-  'GroupShop' => 'override/classes/GroupShop.php',
   'GuestCore' => 'classes/Guest.php',
   'Guest' => 'override/classes/Guest.php',
   'HelpAccessCore' => 'classes/HelpAccess.php',
@@ -203,10 +201,6 @@
   'Search' => 'override/classes/Search.php',
   'SearchEngineCore' => 'classes/SearchEngine.php',
   'SearchEngine' => 'override/classes/SearchEngine.php',
-  'ShopCore' => 'classes/Shop.php',
-  'Shop' => 'override/classes/Shop.php',
-  'ShopUrlCore' => 'classes/ShopUrl.php',
-  'ShopUrl' => 'override/classes/ShopUrl.php',
   'SpecificPriceCore' => 'classes/SpecificPrice.php',
   'SpecificPrice' => 'override/classes/SpecificPrice.php',
   'StateCore' => 'classes/State.php',
@@ -255,6 +249,12 @@
   'WebserviceSpecificManagementSearch' => 'override/classes/WebserviceSpecificManagementSearch.php',
   'ZoneCore' => 'classes/Zone.php',
   'Zone' => 'override/classes/Zone.php',
+  'GroupShopCore' => 'classes/shop/GroupShop.php',
+  'GroupShop' => 'override/classes/shop/GroupShop.php',
+  'ShopCore' => 'classes/shop/Shop.php',
+  'Shop' => 'override/classes/shop/Shop.php',
+  'ShopUrlCore' => 'classes/shop/ShopUrl.php',
+  'ShopUrl' => 'override/classes/shop/ShopUrl.php',
   'TaxCore' => 'classes/tax/Tax.php',
   'Tax' => 'override/classes/tax/Tax.php',
   'TaxCalculatorCore' => 'classes/tax/TaxCalculator.php',
diff --git a/classes/GroupShop.php b/classes/shop/GroupShop.php
old mode 100755
new mode 100644
similarity index 99%
rename from classes/GroupShop.php
rename to classes/shop/GroupShop.php
index 9a14ae4cf..79b98efb1
--- a/classes/GroupShop.php
+++ b/classes/shop/GroupShop.php
@@ -20,7 +20,7 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 1.4 $
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
diff --git a/classes/Shop.php b/classes/shop/Shop.php
similarity index 99%
rename from classes/Shop.php
rename to classes/shop/Shop.php
index ff2730f3b..a56344705 100644
--- a/classes/Shop.php
+++ b/classes/shop/Shop.php
@@ -20,7 +20,7 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7521 $
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
diff --git a/classes/ShopUrl.php b/classes/shop/ShopUrl.php
old mode 100755
new mode 100644
similarity index 99%
rename from classes/ShopUrl.php
rename to classes/shop/ShopUrl.php
index ad150d430..7b38b556d
--- a/classes/ShopUrl.php
+++ b/classes/shop/ShopUrl.php
@@ -20,7 +20,7 @@
 *
 *  @author PrestaShop SA <contact@prestashop.com>
 *  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 1.4 $
+*  @version  Release: $Revision$
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
diff --git a/override/classes/Group.php b/override/classes/Group.php
deleted file mode 100644
index 47e226745..000000000
--- a/override/classes/Group.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class Group extends GroupCore
-{
-
-}
-
diff --git a/override/classes/shop/GroupShop.php b/override/classes/shop/GroupShop.php
new file mode 100644
index 000000000..f85486195
--- /dev/null
+++ b/override/classes/shop/GroupShop.php
@@ -0,0 +1,7 @@
+<?php
+
+class GroupShop extends GroupShopCore
+{
+
+}
+
diff --git a/override/classes/Shop.php b/override/classes/shop/Shop.php
similarity index 100%
rename from override/classes/Shop.php
rename to override/classes/shop/Shop.php
diff --git a/override/classes/ShopUrl.php b/override/classes/shop/ShopUrl.php
similarity index 100%
rename from override/classes/ShopUrl.php
rename to override/classes/shop/ShopUrl.php