diff --git a/core/lib/Thelia/Action/Address.php b/core/lib/Thelia/Action/Address.php
index a912888c8..92d225df4 100644
--- a/core/lib/Thelia/Action/Address.php
+++ b/core/lib/Thelia/Action/Address.php
@@ -25,8 +25,8 @@ namespace Thelia\Action;
 use Propel\Runtime\Exception\PropelException;
 use Propel\Runtime\Propel;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Thelia\Core\Event\AddressCreateOrUpdateEvent;
-use Thelia\Core\Event\AddressEvent;
+use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent;
+use Thelia\Core\Event\Address\AddressEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Address as AddressModel;
 use Thelia\Model\Map\AddressTableMap;
diff --git a/core/lib/Thelia/Action/Attribute.php b/core/lib/Thelia/Action/Attribute.php
index 44c5968a4..50da88732 100644
--- a/core/lib/Thelia/Action/Attribute.php
+++ b/core/lib/Thelia/Action/Attribute.php
@@ -30,15 +30,15 @@ use Thelia\Model\Attribute as AttributeModel;
 
 use Thelia\Core\Event\TheliaEvents;
 
-use Thelia\Core\Event\AttributeUpdateEvent;
-use Thelia\Core\Event\AttributeCreateEvent;
-use Thelia\Core\Event\AttributeDeleteEvent;
+use Thelia\Core\Event\Attribute\AttributeUpdateEvent;
+use Thelia\Core\Event\Attribute\AttributeCreateEvent;
+use Thelia\Core\Event\Attribute\AttributeDeleteEvent;
 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\AttributeEvent;
+use Thelia\Core\Event\Attribute\AttributeEvent;
 use Thelia\Model\AttributeTemplate;
 use Thelia\Model\AttributeTemplateQuery;
 use Thelia\Model\TemplateQuery;
diff --git a/core/lib/Thelia/Action/AttributeAv.php b/core/lib/Thelia/Action/AttributeAv.php
index a6b442fa2..d22242818 100644
--- a/core/lib/Thelia/Action/AttributeAv.php
+++ b/core/lib/Thelia/Action/AttributeAv.php
@@ -30,9 +30,9 @@ use Thelia\Model\AttributeAv as AttributeAvModel;
 
 use Thelia\Core\Event\TheliaEvents;
 
-use Thelia\Core\Event\AttributeAvUpdateEvent;
-use Thelia\Core\Event\AttributeAvCreateEvent;
-use Thelia\Core\Event\AttributeAvDeleteEvent;
+use Thelia\Core\Event\Attribute\AttributeAvUpdateEvent;
+use Thelia\Core\Event\Attribute\AttributeAvCreateEvent;
+use Thelia\Core\Event\Attribute\AttributeAvDeleteEvent;
 use Thelia\Model\ConfigQuery;
 use Thelia\Core\Event\UpdatePositionEvent;
 
@@ -63,7 +63,7 @@ class AttributeAv extends BaseAction implements EventSubscriberInterface
     /**
      * Change a product attribute
      *
-     * @param AttributeAvUpdateEvent $event
+     * @param \Thelia\Core\Event\Attribute\AttributeAvUpdateEvent $event
      */
     public function update(AttributeAvUpdateEvent $event)
     {
diff --git a/core/lib/Thelia/Controller/Admin/AttributeAvController.php b/core/lib/Thelia/Controller/Admin/AttributeAvController.php
index 1ab12a081..2afe66a38 100644
--- a/core/lib/Thelia/Controller/Admin/AttributeAvController.php
+++ b/core/lib/Thelia/Controller/Admin/AttributeAvController.php
@@ -23,10 +23,10 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Event\AttributeAvDeleteEvent;
+use Thelia\Core\Event\Attribute\AttributeAvDeleteEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\AttributeAvUpdateEvent;
-use Thelia\Core\Event\AttributeAvCreateEvent;
+use Thelia\Core\Event\Attribute\AttributeAvUpdateEvent;
+use Thelia\Core\Event\Attribute\AttributeAvCreateEvent;
 use Thelia\Model\AttributeAvQuery;
 use Thelia\Form\AttributeAvModificationForm;
 use Thelia\Form\AttributeAvCreationForm;
diff --git a/core/lib/Thelia/Controller/Admin/AttributeController.php b/core/lib/Thelia/Controller/Admin/AttributeController.php
index 48a65baa7..0b2ad9850 100644
--- a/core/lib/Thelia/Controller/Admin/AttributeController.php
+++ b/core/lib/Thelia/Controller/Admin/AttributeController.php
@@ -23,18 +23,18 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Event\AttributeDeleteEvent;
+use Thelia\Core\Event\Attribute\AttributeDeleteEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\AttributeUpdateEvent;
-use Thelia\Core\Event\AttributeCreateEvent;
+use Thelia\Core\Event\Attribute\AttributeUpdateEvent;
+use Thelia\Core\Event\Attribute\AttributeCreateEvent;
 use Thelia\Model\AttributeQuery;
 use Thelia\Form\AttributeModificationForm;
 use Thelia\Form\AttributeCreationForm;
 use Thelia\Core\Event\UpdatePositionEvent;
 use Thelia\Model\AttributeAv;
 use Thelia\Model\AttributeAvQuery;
-use Thelia\Core\Event\AttributeAvUpdateEvent;
-use Thelia\Core\Event\AttributeEvent;
+use Thelia\Core\Event\Attribute\AttributeAvUpdateEvent;
+use Thelia\Core\Event\Attribute\AttributeEvent;
 
 /**
  * Manages attributes
diff --git a/core/lib/Thelia/Controller/Front/AddressController.php b/core/lib/Thelia/Controller/Front/AddressController.php
index 05e3949fa..9c99146cd 100644
--- a/core/lib/Thelia/Controller/Front/AddressController.php
+++ b/core/lib/Thelia/Controller/Front/AddressController.php
@@ -22,8 +22,8 @@
 /*************************************************************************************/
 
 namespace Thelia\Controller\Front;
-use Thelia\Core\Event\AddressCreateOrUpdateEvent;
-use Thelia\Core\Event\AddressEvent;
+use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent;
+use Thelia\Core\Event\Address\AddressEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Form\AddressCreateForm;
 use Thelia\Form\AddressUpdateForm;
diff --git a/core/lib/Thelia/Core/Event/AddressCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/Address/AddressCreateOrUpdateEvent.php
similarity index 98%
rename from core/lib/Thelia/Core/Event/AddressCreateOrUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Address/AddressCreateOrUpdateEvent.php
index 01e615ff6..ecc61076e 100644
--- a/core/lib/Thelia/Core/Event/AddressCreateOrUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Address/AddressCreateOrUpdateEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Address;
 use Symfony\Component\EventDispatcher\Event;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Address;
 use Thelia\Model\Customer;
 
diff --git a/core/lib/Thelia/Core/Event/AddressEvent.php b/core/lib/Thelia/Core/Event/Address/AddressEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/AddressEvent.php
rename to core/lib/Thelia/Core/Event/Address/AddressEvent.php
index 366801075..d36fd7cab 100644
--- a/core/lib/Thelia/Core/Event/AddressEvent.php
+++ b/core/lib/Thelia/Core/Event/Address/AddressEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Address;
 use Symfony\Component\EventDispatcher\Event;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Address;
 
 /**
diff --git a/core/lib/Thelia/Core/Event/AttributeAvCreateEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeAvCreateEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/AttributeAvCreateEvent.php
rename to core/lib/Thelia/Core/Event/Attribute/AttributeAvCreateEvent.php
index 81d22cfb9..b0b0ee6a3 100644
--- a/core/lib/Thelia/Core/Event/AttributeAvCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/Attribute/AttributeAvCreateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Attribute;
+
+use Thelia\Core\Event\Attribute\AttributeAvEvent;
 
 class AttributeAvCreateEvent extends AttributeAvEvent
 {
diff --git a/core/lib/Thelia/Core/Event/AttributeAvDeleteEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeAvDeleteEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/AttributeAvDeleteEvent.php
rename to core/lib/Thelia/Core/Event/Attribute/AttributeAvDeleteEvent.php
index d710dc23f..515764e3d 100644
--- a/core/lib/Thelia/Core/Event/AttributeAvDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/Attribute/AttributeAvDeleteEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Attribute;
+
+use Thelia\Core\Event\Attribute\AttributeAvEvent;
 
 class AttributeAvDeleteEvent extends AttributeAvEvent
 {
diff --git a/core/lib/Thelia/Core/Event/AttributeAvEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeAvEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/AttributeAvEvent.php
rename to core/lib/Thelia/Core/Event/Attribute/AttributeAvEvent.php
index c6c1726bd..3dcf1e889 100644
--- a/core/lib/Thelia/Core/Event/AttributeAvEvent.php
+++ b/core/lib/Thelia/Core/Event/Attribute/AttributeAvEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Attribute;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\AttributeAv;
 
 class AttributeAvEvent extends ActionEvent
diff --git a/core/lib/Thelia/Core/Event/AttributeAvUpdateEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeAvUpdateEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/AttributeAvUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Attribute/AttributeAvUpdateEvent.php
index c76198954..318ec5817 100644
--- a/core/lib/Thelia/Core/Event/AttributeAvUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Attribute/AttributeAvUpdateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Attribute;
+
+use Thelia\Core\Event\Attribute\AttributeAvCreateEvent;
 
 class AttributeAvUpdateEvent extends AttributeAvCreateEvent
 {
diff --git a/core/lib/Thelia/Core/Event/AttributeCreateEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeCreateEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/AttributeCreateEvent.php
rename to core/lib/Thelia/Core/Event/Attribute/AttributeCreateEvent.php
index 0787b34e3..155560de0 100644
--- a/core/lib/Thelia/Core/Event/AttributeCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/Attribute/AttributeCreateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Attribute;
+
+use Thelia\Core\Event\Attribute\AttributeEvent;
 
 class AttributeCreateEvent extends AttributeEvent
 {
diff --git a/core/lib/Thelia/Core/Event/AttributeDeleteEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeDeleteEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/AttributeDeleteEvent.php
rename to core/lib/Thelia/Core/Event/Attribute/AttributeDeleteEvent.php
index d7f359f9a..d4ee6227b 100644
--- a/core/lib/Thelia/Core/Event/AttributeDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/Attribute/AttributeDeleteEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Attribute;
+
+use Thelia\Core\Event\Attribute\AttributeEvent;
 
 class AttributeDeleteEvent extends AttributeEvent
 {
diff --git a/core/lib/Thelia/Core/Event/AttributeEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/AttributeEvent.php
rename to core/lib/Thelia/Core/Event/Attribute/AttributeEvent.php
index 7ce78938c..471505270 100644
--- a/core/lib/Thelia/Core/Event/AttributeEvent.php
+++ b/core/lib/Thelia/Core/Event/Attribute/AttributeEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Attribute;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Attribute;
 
 class AttributeEvent extends ActionEvent
diff --git a/core/lib/Thelia/Core/Event/AttributeUpdateEvent.php b/core/lib/Thelia/Core/Event/Attribute/AttributeUpdateEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/AttributeUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Attribute/AttributeUpdateEvent.php
index a1bf124d9..d692586e4 100644
--- a/core/lib/Thelia/Core/Event/AttributeUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Attribute/AttributeUpdateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Attribute;
+
+use Thelia\Core\Event\Attribute\AttributeCreateEvent;
 
 class AttributeUpdateEvent extends AttributeCreateEvent
 {
diff --git a/core/lib/Thelia/Model/Address.php b/core/lib/Thelia/Model/Address.php
index 8c9bd4552..b4d5bc29a 100755
--- a/core/lib/Thelia/Model/Address.php
+++ b/core/lib/Thelia/Model/Address.php
@@ -4,7 +4,7 @@ namespace Thelia\Model;
 
 use Propel\Runtime\Connection\ConnectionInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Thelia\Core\Event\AddressEvent;
+use Thelia\Core\Event\Address\AddressEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\Address as BaseAddress;
 use Thelia\Model\AddressQuery;
diff --git a/core/lib/Thelia/Model/Attribute.php b/core/lib/Thelia/Model/Attribute.php
index b4101da8c..3439cac06 100755
--- a/core/lib/Thelia/Model/Attribute.php
+++ b/core/lib/Thelia/Model/Attribute.php
@@ -5,7 +5,7 @@ namespace Thelia\Model;
 use Thelia\Model\Base\Attribute as BaseAttribute;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\AttributeEvent;
+use Thelia\Core\Event\Attribute\AttributeEvent;
 
 class Attribute extends BaseAttribute {
 
diff --git a/core/lib/Thelia/Model/AttributeAv.php b/core/lib/Thelia/Model/AttributeAv.php
index d45b16192..8059b217e 100755
--- a/core/lib/Thelia/Model/AttributeAv.php
+++ b/core/lib/Thelia/Model/AttributeAv.php
@@ -3,7 +3,7 @@
 namespace Thelia\Model;
 
 use Thelia\Model\Base\AttributeAv as BaseAttributeAv;
-use Thelia\Core\Event\AttributeAvEvent;
+use Thelia\Core\Event\Attribute\AttributeAvEvent;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
 use Propel\Runtime\ActiveQuery\Criteria;
diff --git a/core/lib/Thelia/Tests/Action/AddressTest.php b/core/lib/Thelia/Tests/Action/AddressTest.php
index 69f5b5329..ea7a2997e 100644
--- a/core/lib/Thelia/Tests/Action/AddressTest.php
+++ b/core/lib/Thelia/Tests/Action/AddressTest.php
@@ -23,7 +23,7 @@
 
 namespace Thelia\Tests\Action;
 use Thelia\Action\Address;
-use Thelia\Core\Event\AddressCreateOrUpdateEvent;
+use Thelia\Core\Event\Address\AddressCreateOrUpdateEvent;
 use Thelia\Model\Base\CustomerQuery;
 
 /**