diff --git a/core/lib/Thelia/Controller/Front/AddressController.php b/local/modules/Front/Controller/AddressController.php
similarity index 99%
rename from core/lib/Thelia/Controller/Front/AddressController.php
rename to local/modules/Front/Controller/AddressController.php
index 77af4991e..dac75a195 100644
--- a/core/lib/Thelia/Controller/Front/AddressController.php
+++ b/local/modules/Front/Controller/AddressController.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Controller\Front;
+namespace Front\Controller;
+use Thelia\Controller\Front\BaseFrontController;
 use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent;
 use Thelia\Core\Event\Address\AddressEvent;
 use Thelia\Core\Event\TheliaEvents;
diff --git a/core/lib/Thelia/Controller/Front/CartController.php b/local/modules/Front/Controller/CartController.php
similarity index 98%
rename from core/lib/Thelia/Controller/Front/CartController.php
rename to local/modules/Front/Controller/CartController.php
index a2b92508c..d3d24c3bd 100755
--- a/core/lib/Thelia/Controller/Front/CartController.php
+++ b/local/modules/Front/Controller/CartController.php
@@ -20,9 +20,10 @@
 /*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
 /*                                                                                   */
 /*************************************************************************************/
-namespace Thelia\Controller\Front;
+namespace Front\Controller;
 
 use Propel\Runtime\Exception\PropelException;
+use Thelia\Controller\Front\BaseFrontController;
 use Thelia\Form\Exception\FormValidationException;
 use Thelia\Core\Event\Cart\CartEvent;
 use Thelia\Core\Event\TheliaEvents;
diff --git a/core/lib/Thelia/Controller/Front/ContactController.php b/local/modules/Front/Controller/ContactController.php
similarity index 97%
rename from core/lib/Thelia/Controller/Front/ContactController.php
rename to local/modules/Front/Controller/ContactController.php
index 7fa965921..567528836 100644
--- a/core/lib/Thelia/Controller/Front/ContactController.php
+++ b/local/modules/Front/Controller/ContactController.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Controller\Front;
+namespace Front\Controller;
+use Thelia\Controller\Front\BaseFrontController;
 use Thelia\Form\ContactForm;
 use Thelia\Form\Exception\FormValidationException;
 use Thelia\Model\ConfigQuery;
diff --git a/core/lib/Thelia/Controller/Front/CouponController.php b/local/modules/Front/Controller/CouponController.php
similarity index 98%
rename from core/lib/Thelia/Controller/Front/CouponController.php
rename to local/modules/Front/Controller/CouponController.php
index e74c14f31..90adba504 100755
--- a/core/lib/Thelia/Controller/Front/CouponController.php
+++ b/local/modules/Front/Controller/CouponController.php
@@ -20,9 +20,10 @@
 /*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
 /*                                                                                   */
 /*************************************************************************************/
-namespace Thelia\Controller\Front;
+namespace Front\Controller;
 
 use Propel\Runtime\Exception\PropelException;
+use Thelia\Controller\Front\BaseFrontController;
 use Thelia\Core\Event\Coupon\CouponConsumeEvent;
 use Thelia\Form\CouponCode;
 use Thelia\Form\Exception\FormValidationException;
diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/local/modules/Front/Controller/CustomerController.php
similarity index 99%
rename from core/lib/Thelia/Controller/Front/CustomerController.php
rename to local/modules/Front/Controller/CustomerController.php
index 7f956287e..2ae1c181e 100755
--- a/core/lib/Thelia/Controller/Front/CustomerController.php
+++ b/local/modules/Front/Controller/CustomerController.php
@@ -20,8 +20,9 @@
 /*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
 /*                                                                                   */
 /*************************************************************************************/
-namespace Thelia\Controller\Front;
+namespace Front\Controller;
 
+use Thelia\Controller\Front\BaseFrontController;
 use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
 use Thelia\Core\Event\Customer\CustomerLoginEvent;
 use Thelia\Core\Event\LostPasswordEvent;
diff --git a/core/lib/Thelia/Controller/Front/NewsletterController.php b/local/modules/Front/Controller/NewsletterController.php
similarity index 98%
rename from core/lib/Thelia/Controller/Front/NewsletterController.php
rename to local/modules/Front/Controller/NewsletterController.php
index 72c3b0878..6938a44d9 100644
--- a/core/lib/Thelia/Controller/Front/NewsletterController.php
+++ b/local/modules/Front/Controller/NewsletterController.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Controller\Front;
+namespace Front\Controller;
 
+use Thelia\Controller\Front\BaseFrontController;
 use Thelia\Core\Event\Newsletter\NewsletterEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Form\NewsletterForm;
diff --git a/core/lib/Thelia/Controller/Front/OrderController.php b/local/modules/Front/Controller/OrderController.php
similarity index 99%
rename from core/lib/Thelia/Controller/Front/OrderController.php
rename to local/modules/Front/Controller/OrderController.php
index 4c20b784e..5f496209e 100755
--- a/core/lib/Thelia/Controller/Front/OrderController.php
+++ b/local/modules/Front/Controller/OrderController.php
@@ -20,9 +20,10 @@
 /*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
 /*                                                                                   */
 /*************************************************************************************/
-namespace Thelia\Controller\Front;
+namespace Front\Controller;
 
 use Propel\Runtime\Exception\PropelException;
+use Thelia\Controller\Front\BaseFrontController;
 use Thelia\Core\Event\PdfEvent;
 use Thelia\Core\HttpFoundation\Response;
 use Thelia\Core\Template\TemplateHelper;