diff --git a/local/modules/Front/Config/config.xml b/local/modules/Front/Config/config.xml
index 029e5880a..dc19adf18 100644
--- a/local/modules/Front/Config/config.xml
+++ b/local/modules/Front/Config/config.xml
@@ -10,9 +10,17 @@
         -->
     </forms>
 
-    <!--
-    <services>
 
+    <services>
+        <service id="router.front" class="%router.class%">
+            <argument type="service" id="router.module.xmlLoader"/>
+            <argument>Front/Config/front.xml</argument>
+            <argument type="collection">
+                <argument key="cache_dir">%kernel.cache_dir%</argument>
+                <argument key="debug">%kernel.debug%</argument>
+            </argument>
+            <argument type="service" id="request.context"/>
+            <tag name="router.register" priority="128"/>
+        </service>
     </services>
-    -->
 </config>
diff --git a/local/modules/Front/Config/routing.xml b/local/modules/Front/Config/front.xml
similarity index 69%
rename from local/modules/Front/Config/routing.xml
rename to local/modules/Front/Config/front.xml
index 702c050ed..94234aa20 100755
--- a/local/modules/Front/Config/routing.xml
+++ b/local/modules/Front/Config/front.xml
@@ -16,51 +16,51 @@
 
     <!-- Register -->
     <route id="customer.create.process" path="/register" methods="post">
-        <default key="_controller">Thelia\Controller\Front\CustomerController::createAction</default>
+        <default key="_controller">Front\Controller\CustomerController::createAction</default>
         <default key="_view">register</default>
     </route>
 
     <!-- Login -->
     <route id="customer.login.process" path="/login" methods="post">
-        <default key="_controller">Thelia\Controller\Front\CustomerController::loginAction</default>
+        <default key="_controller">Front\Controller\CustomerController::loginAction</default>
         <default key="_view">login</default>
     </route>
 
     <!-- Forgot Password -->
     <route id="customer.password.retrieve.process" path="/password" methods="post">
-        <default key="_controller">Thelia\Controller\Front\CustomerController::newPasswordAction</default>
+        <default key="_controller">Front\Controller\CustomerController::newPasswordAction</default>
         <default key="_view">password</default>
     </route>
 
     <!-- Logout -->
     <route id="customer.logout.process" path="/logout">
-        <default key="_controller">Thelia\Controller\Front\CustomerController::logoutAction</default>
+        <default key="_controller">Front\Controller\CustomerController::logoutAction</default>
     </route>
 
     <!-- Account -->
     <route id="customer.update.view" path="/account/update" methods="get">
-        <default key="_controller">Thelia\Controller\Front\CustomerController::viewAction</default>
+        <default key="_controller">Front\Controller\CustomerController::viewAction</default>
         <default key="_view">account-update</default>
     </route>
 
     <route id="customer.update.process" path="/account/update" methods="post">
-        <default key="_controller">Thelia\Controller\Front\CustomerController::updateAction</default>
+        <default key="_controller">Front\Controller\CustomerController::updateAction</default>
         <default key="_view">account-update</default>
     </route>
 
 
     <route id="customer.password.change.process" path="/account/password" methods="post">
-        <default key="_controller">Thelia\Controller\Front\CustomerController::updatePasswordAction</default>
+        <default key="_controller">Front\Controller\CustomerController::updatePasswordAction</default>
         <default key="_view">account-password</default>
     </route>
 
     <route id="customer.password.change.view" path="/account/password" methods="get">
-        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
+        <default key="_controller">Front\Controller\DefaultController::noAction</default>
         <default key="_view">account-password</default>
     </route>
 
     <route id="customer.order.pdf.delivery" path="/account/order/pdf/delivery/{order_id}">
-        <default key="_controller">Thelia\Controller\Front\OrderController::generateDeliveryPdf</default>
+        <default key="_controller">Front\Controller\OrderController::generateDeliveryPdf</default>
         <requirement key="order_id">\d+</requirement>
     </route>
     <!-- end customer routes -->
@@ -72,27 +72,27 @@
     </route>
 
     <route id="address.create" path="/address/create" methods="post" >
-        <default key="_controller">Thelia\Controller\Front\AddressController::createAction</default>
+        <default key="_controller">Front\Controller\AddressController::createAction</default>
         <default key="_view">address</default>
     </route>
 
     <route id="address.edit" path="/address/update/{address_id}" methods="get">
-        <default key="_controller">Thelia\Controller\Front\AddressController::updateViewAction</default>
+        <default key="_controller">Front\Controller\AddressController::updateViewAction</default>
         <default key="_view">address-update</default>
     </route>
 
     <route id="address.update" path="/address/update/{address_id}" methods="post" >
-        <default key="_controller">Thelia\Controller\Front\AddressController::processUpdateAction</default>
+        <default key="_controller">Front\Controller\AddressController::processUpdateAction</default>
         <default key="_view">address-update</default>
     </route>
 
     <route id="address.delete" path="/address/delete/{address_id}">
-        <default key="_controller">Thelia\Controller\Front\AddressController::deleteAction</default>
+        <default key="_controller">Front\Controller\AddressController::deleteAction</default>
         <default key="_view">account</default>
     </route>
 
     <route id="address.generateModal" path="/address/modal/{address_id}" methods="get">
-        <default key="_controller">Thelia\Controller\Front\AddressController::generateModalAction</default>
+        <default key="_controller">Front\Controller\AddressController::generateModalAction</default>
         <default key="_view">modal-address</default>
         <requirement key="address_id">\d+</requirement>
     </route>
@@ -106,24 +106,23 @@
     </route>
 
     <route id="cart.add.process" path="/cart/add">
-        <default key="_controller">Thelia\Controller\Front\CartController::addItem</default>
+        <default key="_controller">Front\Controller\CartController::addItem</default>
     </route>
 
     <route id="cart.delete.process" path="/cart/delete/{cart_item}">
-        <default key="_controller">Thelia\Controller\Front\CartController::deleteItem</default>
+        <default key="_controller">Front\Controller\CartController::deleteItem</default>
         <default key="_view">cart</default>
     </route>
 
     <route id="cart.update.quantity" path="/cart/update">
-        <default key="_controller">Thelia\Controller\Front\CartController::changeItem</default>
-        <default key="_controller">Thelia\Controller\Front\CartController::changeItem</default>
+        <default key="_controller">Front\Controller\CartController::changeItem</default>
         <default key="_view">cart</default>
     </route>
     <!-- end cart routes -->
 
     <!-- order management process -->
     <route id="order.delivery.process" path="/order/delivery" methods="post">
-        <default key="_controller">Thelia\Controller\Front\OrderController::deliver</default>
+        <default key="_controller">Front\Controller\OrderController::deliver</default>
         <default key="_view">order-delivery</default>
     </route>
 
@@ -133,7 +132,7 @@
     </route>
 
     <route id="order.invoice.process" path="/order/invoice" methods="post">
-        <default key="_controller">Thelia\Controller\Front\OrderController::invoice</default>
+        <default key="_controller">Front\Controller\OrderController::invoice</default>
         <default key="_view">order-invoice</default>
     </route>
 
@@ -143,23 +142,23 @@
     </route>
 
     <route id="order.coupon.process" path="/order/coupon" methods="post">
-        <default key="_controller">Thelia\Controller\Front\CouponController::consumeAction</default>
+        <default key="_controller">Front\Controller\CouponController::consumeAction</default>
         <default key="_view">order-invoice</default>
     </route>
 
     <route id="order.payment.process" path="/order/pay">
-        <default key="_controller">Thelia\Controller\Front\OrderController::pay</default>
+        <default key="_controller">Front\Controller\OrderController::pay</default>
     </route>
 
     <route id="order.placed" path="/order/placed/{order_id}">
-        <default key="_controller">Thelia\Controller\Front\OrderController::orderPlaced</default>
+        <default key="_controller">Front\Controller\OrderController::orderPlaced</default>
         <default key="_view">order-placed</default>
     </route>
     <!-- end order management process -->
 
     <!-- contact management -->
     <route id="contact.send" path="/contact" methods="post">
-        <default key="_controller">Thelia\Controller\Front\ContactController::sendAction</default>
+        <default key="_controller">Front\Controller\ContactController::sendAction</default>
         <default key="_view">contact</default>
     </route>
 
@@ -171,7 +170,7 @@
 
     <!-- newsletter management -->
     <route id="newsletter.process" path="/newsletter" methods="post">
-        <default key="_controller">Thelia\Controller\Front\NewsletterController::subscribeAction</default>
+        <default key="_controller">Front\Controller\NewsletterController::subscribeAction</default>
         <default key="_view">newsletter</default>
     </route>
     <!-- end newsletter management -->
diff --git a/local/modules/Front/Config/module.xml b/local/modules/Front/Config/module.xml
index de351133d..f2ff94b20 100644
--- a/local/modules/Front/Config/module.xml
+++ b/local/modules/Front/Config/module.xml
@@ -16,5 +16,5 @@
     </author>
     <type>classic</type>
     <thelia>2.0.0</thelia>
-    <stability>dev</stability>
+    <stability>alpha</stability>
 </module>