diff --git a/core/lib/Thelia/Action/Template.php b/core/lib/Thelia/Action/Template.php
index 18174dd26..f7f703df4 100644
--- a/core/lib/Thelia/Action/Template.php
+++ b/core/lib/Thelia/Action/Template.php
@@ -30,24 +30,24 @@ use Thelia\Model\Template as TemplateModel;
 
 use Thelia\Core\Event\TheliaEvents;
 
-use Thelia\Core\Event\TemplateUpdateEvent;
-use Thelia\Core\Event\TemplateCreateEvent;
-use Thelia\Core\Event\TemplateDeleteEvent;
+use Thelia\Core\Event\Template\TemplateUpdateEvent;
+use Thelia\Core\Event\Template\TemplateCreateEvent;
+use Thelia\Core\Event\Template\TemplateDeleteEvent;
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\TemplateAv;
 use Thelia\Model\TemplateAvQuery;
 use Thelia\Core\Event\UpdatePositionEvent;
 use Thelia\Core\Event\CategoryEvent;
-use Thelia\Core\Event\TemplateEvent;
+use Thelia\Core\Event\Template\TemplateEvent;
 use Thelia\Model\TemplateTemplate;
 use Thelia\Model\TemplateTemplateQuery;
 use Thelia\Model\ProductQuery;
-use Thelia\Core\Event\TemplateAddAttributeEvent;
-use Thelia\Core\Event\TemplateDeleteAttributeEvent;
+use Thelia\Core\Event\Template\TemplateAddAttributeEvent;
+use Thelia\Core\Event\Template\TemplateDeleteAttributeEvent;
 use Thelia\Model\AttributeTemplateQuery;
 use Thelia\Model\AttributeTemplate;
-use Thelia\Core\Event\TemplateDeleteFeatureEvent;
-use Thelia\Core\Event\TemplateAddFeatureEvent;
+use Thelia\Core\Event\Template\TemplateDeleteFeatureEvent;
+use Thelia\Core\Event\Template\TemplateAddFeatureEvent;
 use Thelia\Model\FeatureTemplateQuery;
 use Thelia\Model\FeatureTemplate;
 
@@ -56,7 +56,7 @@ class Template extends BaseAction implements EventSubscriberInterface
     /**
      * Create a new template entry
      *
-     * @param TemplateCreateEvent $event
+     * @param \Thelia\Core\Event\Template\TemplateCreateEvent $event
      */
     public function create(TemplateCreateEvent $event)
     {
@@ -77,7 +77,7 @@ class Template extends BaseAction implements EventSubscriberInterface
     /**
      * Change a product template
      *
-     * @param TemplateUpdateEvent $event
+     * @param \Thelia\Core\Event\Template\TemplateUpdateEvent $event
      */
     public function update(TemplateUpdateEvent $event)
     {
@@ -99,7 +99,7 @@ class Template extends BaseAction implements EventSubscriberInterface
     /**
      * Delete a product template entry
      *
-     * @param TemplateDeleteEvent $event
+     * @param \Thelia\Core\Event\Template\TemplateDeleteEvent $event
      */
     public function delete(TemplateDeleteEvent $event)
     {
diff --git a/core/lib/Thelia/Controller/Admin/TemplateController.php b/core/lib/Thelia/Controller/Admin/TemplateController.php
index c9e30612c..517fb9d44 100644
--- a/core/lib/Thelia/Controller/Admin/TemplateController.php
+++ b/core/lib/Thelia/Controller/Admin/TemplateController.php
@@ -23,10 +23,10 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Event\TemplateDeleteEvent;
+use Thelia\Core\Event\Template\TemplateDeleteEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\TemplateUpdateEvent;
-use Thelia\Core\Event\TemplateCreateEvent;
+use Thelia\Core\Event\Template\TemplateUpdateEvent;
+use Thelia\Core\Event\Template\TemplateCreateEvent;
 use Thelia\Model\TemplateQuery;
 use Thelia\Form\TemplateModificationForm;
 use Thelia\Form\TemplateCreationForm;
@@ -34,11 +34,11 @@ use Thelia\Core\Event\UpdatePositionEvent;
 use Thelia\Model\TemplateAv;
 use Thelia\Model\TemplateAvQuery;
 use Thelia\Core\Event\TemplateAvUpdateEvent;
-use Thelia\Core\Event\TemplateEvent;
-use Thelia\Core\Event\TemplateDeleteAttributeEvent;
-use Thelia\Core\Event\TemplateAddAttributeEvent;
-use Thelia\Core\Event\TemplateAddFeatureEvent;
-use Thelia\Core\Event\TemplateDeleteFeatureEvent;
+use Thelia\Core\Event\Template\TemplateEvent;
+use Thelia\Core\Event\Template\TemplateDeleteAttributeEvent;
+use Thelia\Core\Event\Template\TemplateAddAttributeEvent;
+use Thelia\Core\Event\Template\TemplateAddFeatureEvent;
+use Thelia\Core\Event\Template\TemplateDeleteFeatureEvent;
 
 /**
  * Manages product templates
diff --git a/core/lib/Thelia/Core/Event/TemplateAddAttributeEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateAddAttributeEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/TemplateAddAttributeEvent.php
rename to core/lib/Thelia/Core/Event/Template/TemplateAddAttributeEvent.php
index 6adebf080..f73aba820 100644
--- a/core/lib/Thelia/Core/Event/TemplateAddAttributeEvent.php
+++ b/core/lib/Thelia/Core/Event/Template/TemplateAddAttributeEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Template;
 
+use Thelia\Core\Event\Template\TemplateEvent;
 use Thelia\Model\Template;
 class TemplateAddAttributeEvent extends TemplateEvent
 {
diff --git a/core/lib/Thelia/Core/Event/TemplateAddFeatureEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateAddFeatureEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/TemplateAddFeatureEvent.php
rename to core/lib/Thelia/Core/Event/Template/TemplateAddFeatureEvent.php
index ccfecb95a..c718ea78e 100644
--- a/core/lib/Thelia/Core/Event/TemplateAddFeatureEvent.php
+++ b/core/lib/Thelia/Core/Event/Template/TemplateAddFeatureEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Template;
 
+use Thelia\Core\Event\Template\TemplateEvent;
 use Thelia\Model\Template;
 class TemplateAddFeatureEvent extends TemplateEvent
 {
diff --git a/core/lib/Thelia/Core/Event/TemplateCreateEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateCreateEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/TemplateCreateEvent.php
rename to core/lib/Thelia/Core/Event/Template/TemplateCreateEvent.php
index b966ce09b..e8b1cfb1a 100644
--- a/core/lib/Thelia/Core/Event/TemplateCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/Template/TemplateCreateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Template;
+
+use Thelia\Core\Event\Template\TemplateEvent;
 
 class TemplateCreateEvent extends TemplateEvent
 {
diff --git a/core/lib/Thelia/Core/Event/TemplateDeleteAttributeEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateDeleteAttributeEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/TemplateDeleteAttributeEvent.php
rename to core/lib/Thelia/Core/Event/Template/TemplateDeleteAttributeEvent.php
index 3df83422d..f3381678a 100644
--- a/core/lib/Thelia/Core/Event/TemplateDeleteAttributeEvent.php
+++ b/core/lib/Thelia/Core/Event/Template/TemplateDeleteAttributeEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Template;
 
+use Thelia\Core\Event\Template\TemplateEvent;
 use Thelia\Model\Template;
 
 class TemplateDeleteAttributeEvent extends TemplateEvent
diff --git a/core/lib/Thelia/Core/Event/TemplateDeleteEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateDeleteEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/TemplateDeleteEvent.php
rename to core/lib/Thelia/Core/Event/Template/TemplateDeleteEvent.php
index de504cc98..cda8c9eea 100644
--- a/core/lib/Thelia/Core/Event/TemplateDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/Template/TemplateDeleteEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Template;
+
+use Thelia\Core\Event\Template\TemplateEvent;
 
 class TemplateDeleteEvent extends TemplateEvent
 {
diff --git a/core/lib/Thelia/Core/Event/TemplateDeleteFeatureEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateDeleteFeatureEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/TemplateDeleteFeatureEvent.php
rename to core/lib/Thelia/Core/Event/Template/TemplateDeleteFeatureEvent.php
index 83f73d923..a2d795402 100644
--- a/core/lib/Thelia/Core/Event/TemplateDeleteFeatureEvent.php
+++ b/core/lib/Thelia/Core/Event/Template/TemplateDeleteFeatureEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Template;
 
+use Thelia\Core\Event\Template\TemplateEvent;
 use Thelia\Model\Template;
 
 class TemplateDeleteFeatureEvent extends TemplateEvent
diff --git a/core/lib/Thelia/Core/Event/TemplateEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/TemplateEvent.php
rename to core/lib/Thelia/Core/Event/Template/TemplateEvent.php
index 96945189e..1010cfc31 100644
--- a/core/lib/Thelia/Core/Event/TemplateEvent.php
+++ b/core/lib/Thelia/Core/Event/Template/TemplateEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Template;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Template;
 
 class TemplateEvent extends ActionEvent
diff --git a/core/lib/Thelia/Core/Event/TemplateUpdateEvent.php b/core/lib/Thelia/Core/Event/Template/TemplateUpdateEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/TemplateUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Template/TemplateUpdateEvent.php
index bae8ec7da..bce6216d9 100644
--- a/core/lib/Thelia/Core/Event/TemplateUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Template/TemplateUpdateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Template;
+
+use Thelia\Core\Event\Template\TemplateCreateEvent;
 
 class TemplateUpdateEvent extends TemplateCreateEvent
 {
diff --git a/core/lib/Thelia/Model/Template.php b/core/lib/Thelia/Model/Template.php
index 881187573..1772421bb 100644
--- a/core/lib/Thelia/Model/Template.php
+++ b/core/lib/Thelia/Model/Template.php
@@ -4,7 +4,7 @@ namespace Thelia\Model;
 
 use Thelia\Model\Base\Template as BaseTemplate;
 use Propel\Runtime\Connection\ConnectionInterface;
-use Thelia\Core\Event\TemplateEvent;
+use Thelia\Core\Event\Template\TemplateEvent;
 use Thelia\Core\Event\TheliaEvents;
 
 class Template extends BaseTemplate