diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 55ee6a90f..d554f0550 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -816,7 +816,7 @@
 
     <!-- Modules rule management -->
 
-    <route id="admin.module" path="/admin/modules">
+    <route id="admin.module" path="/admin/configuration/modules">
         <default key="_controller">Thelia\Controller\Admin\ModuleController::indexAction</default>
     </route>
 
diff --git a/core/lib/Thelia/Controller/Admin/ModuleController.php b/core/lib/Thelia/Controller/Admin/ModuleController.php
index 03691c069..d2b96ce2e 100644
--- a/core/lib/Thelia/Controller/Admin/ModuleController.php
+++ b/core/lib/Thelia/Controller/Admin/ModuleController.php
@@ -33,6 +33,10 @@ class ModuleController extends BaseAdminController
     public function indexAction()
     {
         if (null !== $response = $this->checkAuth("admin.module.view")) return $response;
+
+
+
+
         return $this->render("modules", array("display_module" => 20));
     }
 
diff --git a/templates/admin/default/includes/module-block.html b/templates/admin/default/includes/module-block.html
new file mode 100644
index 000000000..7784c84db
--- /dev/null
+++ b/templates/admin/default/includes/module-block.html
@@ -0,0 +1,53 @@
+<div class="general-block-decorator">
+    <div class="table-responsive">
+        <table class="table table-striped table-condensed table-left-aligned">
+            <caption class="clearfix">
+                {$caption_title|default:{intl l='classic modules'}}
+            </caption>
+            <thead>
+            <tr>
+                <th>{intl l="Name"}</th>
+                <th>{intl l="Description"}</th>
+                <th>{intl l="Enable/Disable"}</th>
+
+                {module_include location='modules_table_header'}
+
+                <th class="actions">{intl l="Actions"}</th>
+            </tr>
+            </thead>
+
+            <tbody>
+            {loop type="module" name="module.{$module_type}" module_type={$module_type|default:1} backend_context=1}
+                <tr>
+                    <td><a href="#">{$TITLE}</a></td>
+                    <td>{$CHAPO}</td>
+                    <td>
+                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
+                            <input type="checkbox" {if $ACTIVE}checked{/if}>
+                        </div>
+                    </td>
+
+                    {module_include location='modules_table_row'}
+
+                    <td>
+                        <div class="btn-group">
+
+                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                                <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
+                            {/loop}
+
+                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                                <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
+                            {/loop}
+
+                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                                <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
+                            {/loop}
+                        </div>
+                    </td>
+                </tr>
+            {/loop}
+            </tbody>
+        </table>
+    </div>
+</div>
\ No newline at end of file
diff --git a/templates/admin/default/modules.html b/templates/admin/default/modules.html
index 8c86c349a..06d7420bd 100644
--- a/templates/admin/default/modules.html
+++ b/templates/admin/default/modules.html
@@ -25,221 +25,10 @@
 
         <div class="row">
             <div class="col-md-12">
-                <div class="general-block-decorator">
-                    <div class="table-responsive">
-                        <table class="table table-striped table-condensed table-left-aligned">
-                            <caption class="clearfix">
-                               {intl l='Transport modules'}
-                            </caption>
-                            <thead>
-                                <tr>
-                                   <th>{intl l="Name"}</th>
-                                   <th>{intl l="Description"}</th>
-                                   <th>{intl l="Enable/Disable"}</th>
+            {include file="includes/module-block.html" module_type="1" caption_title={intl l='Classic modules'}}
+            {include file="includes/module-block.html" module_type="2" caption_title={intl l='Delivery modules'}}
+            {include file="includes/module-block.html" module_type="3" caption_title={intl l='Payment modules'}}
 
-                                   {module_include location='modules_table_header'}
-
-                                   <th class="actions">{intl l="Actions"}</th>
-                                </tr>
-                            </thead>
-
-                            <tbody>
-                                <tr>
-                                    <td><a href="">Tinymce</a></td>                                    
-                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid! Eius, pariatur accusantium odit quidem laboriosam.</td>                                    
-                                    <td>
-                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                            <input type="checkbox" checked>
-                                        </div>
-                                    </td>
-
-                                    {module_include location='modules_table_row'}
-
-                                    <td>
-                                        <div class="btn-group">
-                                            
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                            {/loop}
-
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                            {/loop}                                                                                                                
-
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                            {/loop}
-                                        </div>
-                                    </td>
-                                </tr>                                
-                                <tr>
-                                    <td><a href="">So colissimo</a></td>                                    
-                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
-                                    <td>
-                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                            <input type="checkbox">
-                                        </div>
-                                    </td>
-
-                                    {module_include location='modules_table_row'}
-
-                                    <td>
-                                        <div class="btn-group">
-                                            
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                            {/loop}
-
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                            {/loop}                                                                                                                
-
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                            {/loop}
-                                        </div>
-                                    </td>
-                                </tr>                                
-                                <tr>
-                                    <td><a href="">Title meta</a></td>                                    
-                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
-                                    <td>
-                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                            <input type="checkbox">
-                                        </div>
-                                    </td>
-
-                                    {module_include location='modules_table_row'}
-
-                                    <td>
-                                        <div class="btn-group">
-                                            
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                            {/loop}
-
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                            {/loop}                                                                                                                
-
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                            {/loop}
-                                        </div>
-                                    </td>
-                                </tr>                                
-                            </tbody>
-                        </table>
-                    </div>
-                </div>                
-
-                <div class="general-block-decorator">
-                    <div class="table-responsive">
-                        <table class="table table-striped table-condensed table-left-aligned">
-                            <caption class="clearfix">
-                               {intl l='Delivery modules'}
-                            </caption>
-                            <thead>
-                                <tr>
-                                   <th>{intl l="Name"}</th>
-                                   <th>{intl l="Description"}</th>
-                                   <th>{intl l="Enable/Disable"}</th>
-
-                                   {module_include location='modules_table_header'}
-
-                                   <th class="actions">{intl l="Actions"}</th>
-                                </tr>
-                            </thead>
-
-                            <tbody>
-                                <tr>
-                                    <td><a href="">Tinymce</a></td>                                    
-                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid! Eius, pariatur accusantium odit quidem laboriosam.</td>                                    
-                                    <td>
-                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                            <input type="checkbox" checked>
-                                        </div>
-                                    </td>
-
-                                    {module_include location='modules_table_row'}
-
-                                    <td>
-                                        <div class="btn-group">
-                                            
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                            {/loop}
-
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                            {/loop}                                                                                                                
-
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                            {/loop}
-                                        </div>
-                                    </td>
-                                </tr>                                
-                                <tr>
-                                    <td><a href="">So colissimo</a></td>                                    
-                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
-                                    <td>
-                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                            <input type="checkbox">
-                                        </div>
-                                    </td>
-
-                                    {module_include location='modules_table_row'}
-
-                                    <td>
-                                        <div class="btn-group">
-                                            
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                            {/loop}
-
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                            {/loop}                                                                                                                
-
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                            {/loop}
-                                        </div>
-                                    </td>
-                                </tr>                                
-                                <tr>
-                                    <td><a href="">Title meta</a></td>                                    
-                                    <td>Eos minima maiores doloribus mollitia perspiciatis esse iusto odit error delectus aliquid</td>                                    
-                                    <td>
-                                        <div class="make-switch switch-small" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok-circle'></i>" data-off-label="<i class='glyphicon glyphicon-remove-circle'></i>">
-                                            <input type="checkbox">
-                                        </div>
-                                    </td>
-
-                                    {module_include location='modules_table_row'}
-
-                                    <td>
-                                        <div class="btn-group">
-                                            
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
-                                            {/loop}
-
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
-                                            {/loop}                                                                                                                
-
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
-                                               <a class="btn btn-default btn-xs" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
-                                            {/loop}
-                                        </div>
-                                    </td>
-                                </tr>                                
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
             </div>
         </div>