diff --git a/core/lib/Thelia/Action/Attribute.php b/core/lib/Thelia/Action/Attribute.php
index 50da88732..247e2db5c 100644
--- a/core/lib/Thelia/Action/Attribute.php
+++ b/core/lib/Thelia/Action/Attribute.php
@@ -37,7 +37,7 @@ use Thelia\Model\ConfigQuery;
 use Thelia\Model\AttributeAv;
 use Thelia\Model\AttributeAvQuery;
 use Thelia\Core\Event\UpdatePositionEvent;
-use Thelia\Core\Event\CategoryEvent;
+use Thelia\Core\Event\Category\CategoryEvent;
 use Thelia\Core\Event\Attribute\AttributeEvent;
 use Thelia\Model\AttributeTemplate;
 use Thelia\Model\AttributeTemplateQuery;
diff --git a/core/lib/Thelia/Action/Category.php b/core/lib/Thelia/Action/Category.php
index 25a94711f..a737498cc 100755
--- a/core/lib/Thelia/Action/Category.php
+++ b/core/lib/Thelia/Action/Category.php
@@ -30,14 +30,14 @@ use Thelia\Model\Category as CategoryModel;
 
 use Thelia\Core\Event\TheliaEvents;
 
-use Thelia\Core\Event\CategoryUpdateEvent;
-use Thelia\Core\Event\CategoryCreateEvent;
-use Thelia\Core\Event\CategoryDeleteEvent;
+use Thelia\Core\Event\Category\CategoryUpdateEvent;
+use Thelia\Core\Event\Category\CategoryCreateEvent;
+use Thelia\Core\Event\Category\CategoryDeleteEvent;
 use Thelia\Model\ConfigQuery;
 use Thelia\Core\Event\UpdatePositionEvent;
-use Thelia\Core\Event\CategoryToggleVisibilityEvent;
-use Thelia\Core\Event\CategoryAddContentEvent;
-use Thelia\Core\Event\CategoryDeleteContentEvent;
+use Thelia\Core\Event\Category\CategoryToggleVisibilityEvent;
+use Thelia\Core\Event\Category\CategoryAddContentEvent;
+use Thelia\Core\Event\Category\CategoryDeleteContentEvent;
 use Thelia\Model\CategoryAssociatedContent;
 use Thelia\Model\CategoryAssociatedContentQuery;
 
@@ -46,7 +46,7 @@ class Category extends BaseAction implements EventSubscriberInterface
     /**
      * Create a new category entry
      *
-     * @param CategoryCreateEvent $event
+     * @param \Thelia\Core\Event\Category\CategoryCreateEvent $event
      */
     public function create(CategoryCreateEvent $event)
     {
@@ -69,7 +69,7 @@ class Category extends BaseAction implements EventSubscriberInterface
     /**
      * Change a category
      *
-     * @param CategoryUpdateEvent $event
+     * @param \Thelia\Core\Event\Category\CategoryUpdateEvent $event
      */
     public function update(CategoryUpdateEvent $event)
     {
@@ -98,7 +98,7 @@ class Category extends BaseAction implements EventSubscriberInterface
     /**
      * Delete a category entry
      *
-     * @param CategoryDeleteEvent $event
+     * @param \Thelia\Core\Event\Category\CategoryDeleteEvent $event
      */
     public function delete(CategoryDeleteEvent $event)
     {
diff --git a/core/lib/Thelia/Action/Feature.php b/core/lib/Thelia/Action/Feature.php
index a746ce4e2..a32888503 100644
--- a/core/lib/Thelia/Action/Feature.php
+++ b/core/lib/Thelia/Action/Feature.php
@@ -37,7 +37,7 @@ use Thelia\Model\ConfigQuery;
 use Thelia\Model\FeatureAv;
 use Thelia\Model\FeatureAvQuery;
 use Thelia\Core\Event\UpdatePositionEvent;
-use Thelia\Core\Event\CategoryEvent;
+use Thelia\Core\Event\Category\CategoryEvent;
 use Thelia\Core\Event\FeatureEvent;
 use Thelia\Model\FeatureTemplate;
 use Thelia\Model\FeatureTemplateQuery;
diff --git a/core/lib/Thelia/Action/Template.php b/core/lib/Thelia/Action/Template.php
index f7f703df4..18ed27df9 100644
--- a/core/lib/Thelia/Action/Template.php
+++ b/core/lib/Thelia/Action/Template.php
@@ -37,7 +37,7 @@ 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\Category\CategoryEvent;
 use Thelia\Core\Event\Template\TemplateEvent;
 use Thelia\Model\TemplateTemplate;
 use Thelia\Model\TemplateTemplateQuery;
diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php
index 4d0d15ef1..ad18dcacb 100755
--- a/core/lib/Thelia/Controller/Admin/CategoryController.php
+++ b/core/lib/Thelia/Controller/Admin/CategoryController.php
@@ -23,17 +23,17 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Event\CategoryDeleteEvent;
+use Thelia\Core\Event\Category\CategoryDeleteEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\CategoryUpdateEvent;
-use Thelia\Core\Event\CategoryCreateEvent;
+use Thelia\Core\Event\Category\CategoryUpdateEvent;
+use Thelia\Core\Event\Category\CategoryCreateEvent;
 use Thelia\Model\CategoryQuery;
 use Thelia\Form\CategoryModificationForm;
 use Thelia\Form\CategoryCreationForm;
 use Thelia\Core\Event\UpdatePositionEvent;
-use Thelia\Core\Event\CategoryToggleVisibilityEvent;
-use Thelia\Core\Event\CategoryDeleteContentEvent;
-use Thelia\Core\Event\CategoryAddContentEvent;
+use Thelia\Core\Event\Category\CategoryToggleVisibilityEvent;
+use Thelia\Core\Event\Category\CategoryDeleteContentEvent;
+use Thelia\Core\Event\Category\CategoryAddContentEvent;
 use Thelia\Model\CategoryAssociatedContent;
 use Thelia\Model\FolderQuery;
 use Thelia\Model\ContentQuery;
diff --git a/core/lib/Thelia/Core/Event/CategoryAddContentEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryAddContentEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/CategoryAddContentEvent.php
rename to core/lib/Thelia/Core/Event/Category/CategoryAddContentEvent.php
index 3ca5b2ae5..115eae724 100644
--- a/core/lib/Thelia/Core/Event/CategoryAddContentEvent.php
+++ b/core/lib/Thelia/Core/Event/Category/CategoryAddContentEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Category;
 
+use Thelia\Core\Event\Category\CategoryEvent;
 use Thelia\Model\Category;
 
 class CategoryAddContentEvent extends CategoryEvent
diff --git a/core/lib/Thelia/Core/Event/CategoryAssociatedContentEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryAssociatedContentEvent.php
similarity index 98%
rename from core/lib/Thelia/Core/Event/CategoryAssociatedContentEvent.php
rename to core/lib/Thelia/Core/Event/Category/CategoryAssociatedContentEvent.php
index 1984a042c..6593419ef 100644
--- a/core/lib/Thelia/Core/Event/CategoryAssociatedContentEvent.php
+++ b/core/lib/Thelia/Core/Event/Category/CategoryAssociatedContentEvent.php
@@ -21,7 +21,7 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Category;
 
 use Thelia\Model\CategoryAssociatedContent;
 use Thelia\Core\Event\ActionEvent;
diff --git a/core/lib/Thelia/Core/Event/CategoryCreateEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryCreateEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/CategoryCreateEvent.php
rename to core/lib/Thelia/Core/Event/Category/CategoryCreateEvent.php
index 41529019c..870b0beb8 100644
--- a/core/lib/Thelia/Core/Event/CategoryCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/Category/CategoryCreateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Category;
+
+use Thelia\Core\Event\Category\CategoryEvent;
 
 class CategoryCreateEvent extends CategoryEvent
 {
diff --git a/core/lib/Thelia/Core/Event/CategoryDeleteContentEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryDeleteContentEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/CategoryDeleteContentEvent.php
rename to core/lib/Thelia/Core/Event/Category/CategoryDeleteContentEvent.php
index bb28beb21..01a92a1b8 100644
--- a/core/lib/Thelia/Core/Event/CategoryDeleteContentEvent.php
+++ b/core/lib/Thelia/Core/Event/Category/CategoryDeleteContentEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Category;
 
+use Thelia\Core\Event\Category\CategoryEvent;
 use Thelia\Model\Category;
 
 class CategoryDeleteContentEvent extends CategoryEvent
diff --git a/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryDeleteEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/CategoryDeleteEvent.php
rename to core/lib/Thelia/Core/Event/Category/CategoryDeleteEvent.php
index 9d77a7e87..a81d9c7ad 100644
--- a/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/Category/CategoryDeleteEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Category;
+
+use Thelia\Core\Event\Category\CategoryEvent;
 
 class CategoryDeleteEvent extends CategoryEvent
 {
diff --git a/core/lib/Thelia/Core/Event/CategoryEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryEvent.php
similarity index 98%
rename from core/lib/Thelia/Core/Event/CategoryEvent.php
rename to core/lib/Thelia/Core/Event/Category/CategoryEvent.php
index ab5b101e5..ae0cb3b4a 100644
--- a/core/lib/Thelia/Core/Event/CategoryEvent.php
+++ b/core/lib/Thelia/Core/Event/Category/CategoryEvent.php
@@ -21,7 +21,7 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Category;
 
 use Thelia\Model\Category;
 use Thelia\Core\Event\ActionEvent;
diff --git a/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryToggleVisibilityEvent.php
similarity index 95%
rename from core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php
rename to core/lib/Thelia/Core/Event/Category/CategoryToggleVisibilityEvent.php
index f90378e38..3d580701a 100644
--- a/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php
+++ b/core/lib/Thelia/Core/Event/Category/CategoryToggleVisibilityEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Category;
+
+use Thelia\Core\Event\Category\CategoryEvent;
 
 class CategoryToggleVisibilityEvent extends CategoryEvent
 {
diff --git a/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php b/core/lib/Thelia/Core/Event/Category/CategoryUpdateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/CategoryUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Category/CategoryUpdateEvent.php
index f5f775a22..d04e8da08 100644
--- a/core/lib/Thelia/Core/Event/CategoryUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Category/CategoryUpdateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Category;
+
+use Thelia\Core\Event\Category\CategoryCreateEvent;
 
 class CategoryUpdateEvent extends CategoryCreateEvent
 {
diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php
index 347a0f7f7..ea522b1cc 100755
--- a/core/lib/Thelia/Model/Category.php
+++ b/core/lib/Thelia/Model/Category.php
@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Core\Event\CategoryEvent;
+use Thelia\Core\Event\Category\CategoryEvent;
 use Thelia\Model\Base\Category as BaseCategory;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Tools\URL;
diff --git a/core/lib/Thelia/Model/CategoryAssociatedContent.php b/core/lib/Thelia/Model/CategoryAssociatedContent.php
index 9154767bc..e5fcddc41 100644
--- a/core/lib/Thelia/Model/CategoryAssociatedContent.php
+++ b/core/lib/Thelia/Model/CategoryAssociatedContent.php
@@ -3,7 +3,7 @@
 namespace Thelia\Model;
 
 use Thelia\Model\Base\CategoryAssociatedContent as BaseCategoryAssociatedContent;
-use Thelia\Core\Event\CategoryAssociatedContentEvent;
+use Thelia\Core\Event\Category\CategoryAssociatedContentEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Propel\Runtime\Connection\ConnectionInterface;