diff --git a/core/lib/Thelia/Action/Feature.php b/core/lib/Thelia/Action/Feature.php
index a32888503..59c263071 100644
--- a/core/lib/Thelia/Action/Feature.php
+++ b/core/lib/Thelia/Action/Feature.php
@@ -30,15 +30,15 @@ use Thelia\Model\Feature as FeatureModel;
 
 use Thelia\Core\Event\TheliaEvents;
 
-use Thelia\Core\Event\FeatureUpdateEvent;
-use Thelia\Core\Event\FeatureCreateEvent;
-use Thelia\Core\Event\FeatureDeleteEvent;
+use Thelia\Core\Event\Feature\FeatureUpdateEvent;
+use Thelia\Core\Event\Feature\FeatureCreateEvent;
+use Thelia\Core\Event\Feature\FeatureDeleteEvent;
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\FeatureAv;
 use Thelia\Model\FeatureAvQuery;
 use Thelia\Core\Event\UpdatePositionEvent;
 use Thelia\Core\Event\Category\CategoryEvent;
-use Thelia\Core\Event\FeatureEvent;
+use Thelia\Core\Event\Feature\FeatureEvent;
 use Thelia\Model\FeatureTemplate;
 use Thelia\Model\FeatureTemplateQuery;
 use Thelia\Model\TemplateQuery;
@@ -48,7 +48,7 @@ class Feature extends BaseAction implements EventSubscriberInterface
     /**
      * Create a new feature entry
      *
-     * @param FeatureCreateEvent $event
+     * @param \Thelia\Core\Event\Feature\FeatureCreateEvent $event
      */
     public function create(FeatureCreateEvent $event)
     {
@@ -74,7 +74,7 @@ class Feature extends BaseAction implements EventSubscriberInterface
     /**
      * Change a product feature
      *
-     * @param FeatureUpdateEvent $event
+     * @param \Thelia\Core\Event\Feature\FeatureUpdateEvent $event
      */
     public function update(FeatureUpdateEvent $event)
     {
diff --git a/core/lib/Thelia/Action/FeatureAv.php b/core/lib/Thelia/Action/FeatureAv.php
index 2bd117b4b..72fff6cd5 100644
--- a/core/lib/Thelia/Action/FeatureAv.php
+++ b/core/lib/Thelia/Action/FeatureAv.php
@@ -30,9 +30,9 @@ use Thelia\Model\FeatureAv as FeatureAvModel;
 
 use Thelia\Core\Event\TheliaEvents;
 
-use Thelia\Core\Event\FeatureAvUpdateEvent;
-use Thelia\Core\Event\FeatureAvCreateEvent;
-use Thelia\Core\Event\FeatureAvDeleteEvent;
+use Thelia\Core\Event\Feature\FeatureAvUpdateEvent;
+use Thelia\Core\Event\Feature\FeatureAvCreateEvent;
+use Thelia\Core\Event\Feature\FeatureAvDeleteEvent;
 use Thelia\Model\ConfigQuery;
 use Thelia\Core\Event\UpdatePositionEvent;
 
diff --git a/core/lib/Thelia/Controller/Admin/FeatureAvController.php b/core/lib/Thelia/Controller/Admin/FeatureAvController.php
index fc6571ccc..d768f8d18 100644
--- a/core/lib/Thelia/Controller/Admin/FeatureAvController.php
+++ b/core/lib/Thelia/Controller/Admin/FeatureAvController.php
@@ -23,10 +23,10 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Event\FeatureAvDeleteEvent;
+use Thelia\Core\Event\Feature\FeatureAvDeleteEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\FeatureAvUpdateEvent;
-use Thelia\Core\Event\FeatureAvCreateEvent;
+use Thelia\Core\Event\Feature\FeatureAvUpdateEvent;
+use Thelia\Core\Event\Feature\FeatureAvCreateEvent;
 use Thelia\Model\FeatureAvQuery;
 use Thelia\Form\FeatureAvModificationForm;
 use Thelia\Form\FeatureAvCreationForm;
diff --git a/core/lib/Thelia/Controller/Admin/FeatureController.php b/core/lib/Thelia/Controller/Admin/FeatureController.php
index f81f55919..9e2e581e4 100644
--- a/core/lib/Thelia/Controller/Admin/FeatureController.php
+++ b/core/lib/Thelia/Controller/Admin/FeatureController.php
@@ -23,18 +23,18 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Event\FeatureDeleteEvent;
+use Thelia\Core\Event\Feature\FeatureDeleteEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\FeatureUpdateEvent;
-use Thelia\Core\Event\FeatureCreateEvent;
+use Thelia\Core\Event\Feature\FeatureUpdateEvent;
+use Thelia\Core\Event\Feature\FeatureCreateEvent;
 use Thelia\Model\FeatureQuery;
 use Thelia\Form\FeatureModificationForm;
 use Thelia\Form\FeatureCreationForm;
 use Thelia\Core\Event\UpdatePositionEvent;
 use Thelia\Model\FeatureAv;
 use Thelia\Model\FeatureAvQuery;
-use Thelia\Core\Event\FeatureAvUpdateEvent;
-use Thelia\Core\Event\FeatureEvent;
+use Thelia\Core\Event\Feature\FeatureAvUpdateEvent;
+use Thelia\Core\Event\Feature\FeatureEvent;
 
 /**
  * Manages features
diff --git a/core/lib/Thelia/Core/Event/FeatureAvCreateEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureAvCreateEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/FeatureAvCreateEvent.php
rename to core/lib/Thelia/Core/Event/Feature/FeatureAvCreateEvent.php
index 2c8fb228e..f465d92d3 100644
--- a/core/lib/Thelia/Core/Event/FeatureAvCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/Feature/FeatureAvCreateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Feature;
+
+use Thelia\Core\Event\Feature\FeatureAvEvent;
 
 class FeatureAvCreateEvent extends FeatureAvEvent
 {
diff --git a/core/lib/Thelia/Core/Event/FeatureAvDeleteEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureAvDeleteEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/FeatureAvDeleteEvent.php
rename to core/lib/Thelia/Core/Event/Feature/FeatureAvDeleteEvent.php
index aa0a3c729..85e97f890 100644
--- a/core/lib/Thelia/Core/Event/FeatureAvDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/Feature/FeatureAvDeleteEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Feature;
+
+use Thelia\Core\Event\Feature\FeatureAvEvent;
 
 class FeatureAvDeleteEvent extends FeatureAvEvent
 {
diff --git a/core/lib/Thelia/Core/Event/FeatureAvEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureAvEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/FeatureAvEvent.php
rename to core/lib/Thelia/Core/Event/Feature/FeatureAvEvent.php
index 225acaf11..42011bfe3 100644
--- a/core/lib/Thelia/Core/Event/FeatureAvEvent.php
+++ b/core/lib/Thelia/Core/Event/Feature/FeatureAvEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Feature;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\FeatureAv;
 
 class FeatureAvEvent extends ActionEvent
diff --git a/core/lib/Thelia/Core/Event/FeatureAvUpdateEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureAvUpdateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/FeatureAvUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Feature/FeatureAvUpdateEvent.php
index 5db9604c2..cd9d375aa 100644
--- a/core/lib/Thelia/Core/Event/FeatureAvUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Feature/FeatureAvUpdateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Feature;
+
+use Thelia\Core\Event\Feature\FeatureAvCreateEvent;
 
 class FeatureAvUpdateEvent extends FeatureAvCreateEvent
 {
diff --git a/core/lib/Thelia/Core/Event/FeatureCreateEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureCreateEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/FeatureCreateEvent.php
rename to core/lib/Thelia/Core/Event/Feature/FeatureCreateEvent.php
index 574433084..34f49b541 100644
--- a/core/lib/Thelia/Core/Event/FeatureCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/Feature/FeatureCreateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Feature;
+
+use Thelia\Core\Event\Feature\FeatureEvent;
 
 class FeatureCreateEvent extends FeatureEvent
 {
diff --git a/core/lib/Thelia/Core/Event/FeatureDeleteEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureDeleteEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/FeatureDeleteEvent.php
rename to core/lib/Thelia/Core/Event/Feature/FeatureDeleteEvent.php
index 1eca57982..5d53bf4bd 100644
--- a/core/lib/Thelia/Core/Event/FeatureDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/Feature/FeatureDeleteEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Feature;
+
+use Thelia\Core\Event\Feature\FeatureEvent;
 
 class FeatureDeleteEvent extends FeatureEvent
 {
diff --git a/core/lib/Thelia/Core/Event/FeatureEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/FeatureEvent.php
rename to core/lib/Thelia/Core/Event/Feature/FeatureEvent.php
index f1510ac63..7b597acaf 100644
--- a/core/lib/Thelia/Core/Event/FeatureEvent.php
+++ b/core/lib/Thelia/Core/Event/Feature/FeatureEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Feature;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Feature;
 
 class FeatureEvent extends ActionEvent
diff --git a/core/lib/Thelia/Core/Event/FeatureUpdateEvent.php b/core/lib/Thelia/Core/Event/Feature/FeatureUpdateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/FeatureUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Feature/FeatureUpdateEvent.php
index 6bee33ebb..55c6cd651 100644
--- a/core/lib/Thelia/Core/Event/FeatureUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Feature/FeatureUpdateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Feature;
+
+use Thelia\Core\Event\Feature\FeatureCreateEvent;
 
 class FeatureUpdateEvent extends FeatureCreateEvent
 {
diff --git a/core/lib/Thelia/Model/Feature.php b/core/lib/Thelia/Model/Feature.php
index cf0284d2b..2627d5190 100755
--- a/core/lib/Thelia/Model/Feature.php
+++ b/core/lib/Thelia/Model/Feature.php
@@ -5,7 +5,7 @@ namespace Thelia\Model;
 use Thelia\Model\Base\Feature as BaseFeature;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\FeatureEvent;
+use Thelia\Core\Event\Feature\FeatureEvent;
 
 class Feature extends BaseFeature {
 
diff --git a/core/lib/Thelia/Model/FeatureAv.php b/core/lib/Thelia/Model/FeatureAv.php
index ae6e35087..8d21b4cb1 100755
--- a/core/lib/Thelia/Model/FeatureAv.php
+++ b/core/lib/Thelia/Model/FeatureAv.php
@@ -5,7 +5,7 @@ namespace Thelia\Model;
 use Thelia\Model\Base\FeatureAv as BaseFeatureAv;
 use Thelia\Core\Event\TheliaEvents;
 use Propel\Runtime\Connection\ConnectionInterface;
-use Thelia\Core\Event\FeatureAvEvent;
+use Thelia\Core\Event\Feature\FeatureAvEvent;
 
 class FeatureAv extends BaseFeatureAv {