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 12478e8a1..3cfab85f7 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\Category\CategoryEvent;
+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 0a72739d1..7ccf39dcc 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/Action/Cart.php b/core/lib/Thelia/Action/Cart.php
index 22760a4c7..89be6ea0a 100755
--- a/core/lib/Thelia/Action/Cart.php
+++ b/core/lib/Thelia/Action/Cart.php
@@ -25,7 +25,7 @@ namespace Thelia\Action;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Thelia\Core\Event\CartEvent;
+use Thelia\Core\Event\Cart\CartEvent;
 use Thelia\Model\ProductPrice;
 use Thelia\Model\ProductPriceQuery;
 use Thelia\Model\CartItem;
@@ -45,7 +45,7 @@ class Cart extends BaseAction implements EventSubscriberInterface
     /**
      *
      * add an article in the current cart
-     * @param \Thelia\Core\Event\CartEvent $event
+     * @param \Thelia\Core\Event\Cart\CartEvent $event
      */
     public function addItem(CartEvent $event)
     {
@@ -77,7 +77,7 @@ class Cart extends BaseAction implements EventSubscriberInterface
      *
      * Delete specify article present into cart
      *
-     * @param \Thelia\Core\Event\CartEvent $event
+     * @param \Thelia\Core\Event\Cart\CartEvent $event
      */
     public function deleteItem(CartEvent $event)
     {
@@ -97,7 +97,7 @@ class Cart extends BaseAction implements EventSubscriberInterface
      *
      * don't use Form here just test the Request.
      *
-     * @param \Thelia\Core\Event\CartEvent $event
+     * @param \Thelia\Core\Event\Cart\CartEvent $event
      */
     public function changeItem(CartEvent $event)
     {
diff --git a/core/lib/Thelia/Action/Category.php b/core/lib/Thelia/Action/Category.php
index 8429a7c4e..c11064881 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/Config.php b/core/lib/Thelia/Action/Config.php
index f8a7c027c..e925811d3 100644
--- a/core/lib/Thelia/Action/Config.php
+++ b/core/lib/Thelia/Action/Config.php
@@ -29,16 +29,16 @@ use Thelia\Model\Config as ConfigModel;
 
 use Thelia\Core\Event\TheliaEvents;
 
-use Thelia\Core\Event\ConfigUpdateEvent;
-use Thelia\Core\Event\ConfigCreateEvent;
-use Thelia\Core\Event\ConfigDeleteEvent;
+use Thelia\Core\Event\Config\ConfigUpdateEvent;
+use Thelia\Core\Event\Config\ConfigCreateEvent;
+use Thelia\Core\Event\Config\ConfigDeleteEvent;
 
 class Config extends BaseAction implements EventSubscriberInterface
 {
     /**
      * Create a new configuration entry
      *
-     * @param ConfigCreateEvent $event
+     * @param \Thelia\Core\Event\Config\ConfigCreateEvent $event
      */
     public function create(ConfigCreateEvent $event)
     {
@@ -54,7 +54,7 @@ class Config extends BaseAction implements EventSubscriberInterface
     /**
      * Change a configuration entry value
      *
-     * @param ConfigUpdateEvent $event
+     * @param \Thelia\Core\Event\Config\ConfigUpdateEvent $event
      */
     public function setValue(ConfigUpdateEvent $event)
     {
@@ -74,7 +74,7 @@ class Config extends BaseAction implements EventSubscriberInterface
     /**
      * Change a configuration entry
      *
-     * @param ConfigUpdateEvent $event
+     * @param \Thelia\Core\Event\Config\ConfigUpdateEvent $event
      */
     public function modify(ConfigUpdateEvent $event)
     {
@@ -94,7 +94,7 @@ class Config extends BaseAction implements EventSubscriberInterface
     /**
      * Delete a configuration entry
      *
-     * @param ConfigDeleteEvent $event
+     * @param \Thelia\Core\Event\Config\ConfigDeleteEvent $event
      */
     public function delete(ConfigDeleteEvent $event)
     {
diff --git a/core/lib/Thelia/Action/Currency.php b/core/lib/Thelia/Action/Currency.php
index 3c428683b..3fe24326a 100644
--- a/core/lib/Thelia/Action/Currency.php
+++ b/core/lib/Thelia/Action/Currency.php
@@ -30,9 +30,9 @@ use Thelia\Model\Currency as CurrencyModel;
 
 use Thelia\Core\Event\TheliaEvents;
 
-use Thelia\Core\Event\CurrencyUpdateEvent;
-use Thelia\Core\Event\CurrencyCreateEvent;
-use Thelia\Core\Event\CurrencyDeleteEvent;
+use Thelia\Core\Event\Currency\CurrencyUpdateEvent;
+use Thelia\Core\Event\Currency\CurrencyCreateEvent;
+use Thelia\Core\Event\Currency\CurrencyDeleteEvent;
 use Thelia\Model\ConfigQuery;
 use Thelia\Core\Event\UpdatePositionEvent;
 
@@ -41,7 +41,7 @@ class Currency extends BaseAction implements EventSubscriberInterface
     /**
      * Create a new currencyuration entry
      *
-     * @param CurrencyCreateEvent $event
+     * @param \Thelia\Core\Event\Currency\CurrencyCreateEvent $event
      */
     public function create(CurrencyCreateEvent $event)
     {
@@ -65,7 +65,7 @@ class Currency extends BaseAction implements EventSubscriberInterface
     /**
      * Change a currency
      *
-     * @param CurrencyUpdateEvent $event
+     * @param \Thelia\Core\Event\Currency\CurrencyUpdateEvent $event
      */
     public function update(CurrencyUpdateEvent $event)
     {
@@ -118,7 +118,7 @@ class Currency extends BaseAction implements EventSubscriberInterface
     /**
      * Delete a currencyuration entry
      *
-     * @param CurrencyDeleteEvent $event
+     * @param \Thelia\Core\Event\Currency\CurrencyDeleteEvent $event
      */
     public function delete(CurrencyDeleteEvent $event)
     {
diff --git a/core/lib/Thelia/Action/Customer.php b/core/lib/Thelia/Action/Customer.php
index f132a01da..061dba028 100755
--- a/core/lib/Thelia/Action/Customer.php
+++ b/core/lib/Thelia/Action/Customer.php
@@ -25,11 +25,11 @@ namespace Thelia\Action;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Thelia\Core\Event\ActionEvent;
-use Thelia\Core\Event\CustomerCreateOrUpdateEvent;
-use Thelia\Core\Event\CustomerEvent;
+use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
+use Thelia\Core\Event\Customer\CustomerEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Customer as CustomerModel;
-use Thelia\Core\Event\CustomerLoginEvent;
+use Thelia\Core\Event\Customer\CustomerLoginEvent;
 
 /**
  *
diff --git a/core/lib/Thelia/Action/Feature.php b/core/lib/Thelia/Action/Feature.php
index 01799510c..f141eba83 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\CategoryEvent;
-use Thelia\Core\Event\FeatureEvent;
+use Thelia\Core\Event\Category\CategoryEvent;
+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 25f9ae5f2..df2127ebc 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/Action/Folder.php b/core/lib/Thelia/Action/Folder.php
index b830947cc..a9dd31725 100644
--- a/core/lib/Thelia/Action/Folder.php
+++ b/core/lib/Thelia/Action/Folder.php
@@ -23,10 +23,10 @@
 
 namespace Thelia\Action;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Thelia\Core\Event\FolderCreateEvent;
-use Thelia\Core\Event\FolderDeleteEvent;
-use Thelia\Core\Event\FolderToggleVisibilityEvent;
-use Thelia\Core\Event\FolderUpdateEvent;
+use Thelia\Core\Event\Folder\FolderCreateEvent;
+use Thelia\Core\Event\Folder\FolderDeleteEvent;
+use Thelia\Core\Event\Folder\FolderToggleVisibilityEvent;
+use Thelia\Core\Event\Folder\FolderUpdateEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Core\Event\UpdatePositionEvent;
 use Thelia\Model\FolderQuery;
diff --git a/core/lib/Thelia/Action/Message.php b/core/lib/Thelia/Action/Message.php
index 8918913fe..fa9b13db5 100644
--- a/core/lib/Thelia/Action/Message.php
+++ b/core/lib/Thelia/Action/Message.php
@@ -30,16 +30,16 @@ use Thelia\Model\Message as MessageModel;
 
 use Thelia\Core\Event\TheliaEvents;
 
-use Thelia\Core\Event\MessageUpdateEvent;
-use Thelia\Core\Event\MessageCreateEvent;
-use Thelia\Core\Event\MessageDeleteEvent;
+use Thelia\Core\Event\Message\MessageUpdateEvent;
+use Thelia\Core\Event\Message\MessageCreateEvent;
+use Thelia\Core\Event\Message\MessageDeleteEvent;
 
 class Message extends BaseAction implements EventSubscriberInterface
 {
     /**
      * Create a new messageuration entry
      *
-     * @param MessageCreateEvent $event
+     * @param \Thelia\Core\Event\Message\MessageCreateEvent $event
      */
     public function create(MessageCreateEvent $event)
     {
@@ -64,7 +64,7 @@ class Message extends BaseAction implements EventSubscriberInterface
     /**
      * Change a message
      *
-     * @param MessageUpdateEvent $event
+     * @param \Thelia\Core\Event\Message\MessageUpdateEvent $event
      */
     public function modify(MessageUpdateEvent $event)
     {
@@ -94,7 +94,7 @@ class Message extends BaseAction implements EventSubscriberInterface
     /**
      * Delete a messageuration entry
      *
-     * @param MessageDeleteEvent $event
+     * @param \Thelia\Core\Event\Message\MessageDeleteEvent $event
      */
     public function delete(MessageDeleteEvent $event)
     {
diff --git a/core/lib/Thelia/Action/Product.php b/core/lib/Thelia/Action/Product.php
index cecc1df39..f229542e1 100644
--- a/core/lib/Thelia/Action/Product.php
+++ b/core/lib/Thelia/Action/Product.php
@@ -30,14 +30,14 @@ use Thelia\Model\Product as ProductModel;
 
 use Thelia\Core\Event\TheliaEvents;
 
-use Thelia\Core\Event\ProductUpdateEvent;
-use Thelia\Core\Event\ProductCreateEvent;
-use Thelia\Core\Event\ProductDeleteEvent;
+use Thelia\Core\Event\Product\ProductUpdateEvent;
+use Thelia\Core\Event\Product\ProductCreateEvent;
+use Thelia\Core\Event\Product\ProductDeleteEvent;
 use Thelia\Model\ConfigQuery;
 use Thelia\Core\Event\UpdatePositionEvent;
-use Thelia\Core\Event\ProductToggleVisibilityEvent;
-use Thelia\Core\Event\ProductAddContentEvent;
-use Thelia\Core\Event\ProductDeleteContentEvent;
+use Thelia\Core\Event\Product\ProductToggleVisibilityEvent;
+use Thelia\Core\Event\Product\ProductAddContentEvent;
+use Thelia\Core\Event\Product\ProductDeleteContentEvent;
 use Thelia\Model\ProductAssociatedContent;
 use Thelia\Model\ProductAssociatedContentQuery;
 use Thelia\Model\ProductCategory;
@@ -46,8 +46,6 @@ use Thelia\Model\TaxRuleQuery;
 use Thelia\Model\TaxQuery;
 use Thelia\Model\AccessoryQuery;
 use Thelia\Model\Accessory;
-use Thelia\Core\Event\ProductAddAccessoryEvent;
-use Thelia\Core\Event\ProductDeleteAccessoryEvent;
 use Thelia\Core\Event\FeatureProductUpdateEvent;
 use Thelia\Model\FeatureProduct;
 use Thelia\Model\FeatureQuery;
@@ -68,13 +66,15 @@ use Thelia\Model\Map\ProductTableMap;
 use Thelia\Core\Event\ProductDeleteCombinationEvent;
 use Thelia\Model\ProductPrice;
 use Thelia\Model\ProductSaleElements;
+use Thelia\Core\Event\Product\ProductAddAccessoryEvent;
+use Thelia\Core\Event\Product\ProductDeleteAccessoryEvent;
 
 class Product extends BaseAction implements EventSubscriberInterface
 {
     /**
      * Create a new product entry
      *
-     * @param ProductCreateEvent $event
+     * @param \Thelia\Core\Event\Product\ProductCreateEvent $event
      */
     public function create(ProductCreateEvent $event)
     {
@@ -108,7 +108,7 @@ class Product extends BaseAction implements EventSubscriberInterface
     /**
      * Change a product
      *
-     * @param ProductUpdateEvent $event
+     * @param \Thelia\Core\Event\Product\ProductUpdateEvent $event
      */
     public function update(ProductUpdateEvent $event)
     {
@@ -140,7 +140,7 @@ class Product extends BaseAction implements EventSubscriberInterface
     /**
      * Delete a product entry
      *
-     * @param ProductDeleteEvent $event
+     * @param \Thelia\Core\Event\Product\ProductDeleteEvent $event
      */
     public function delete(ProductDeleteEvent $event)
     {
diff --git a/core/lib/Thelia/Action/Template.php b/core/lib/Thelia/Action/Template.php
index 47d5d7a4d..e387ed615 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\Category\CategoryEvent;
+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/Cart/CartTrait.php b/core/lib/Thelia/Cart/CartTrait.php
index 8ced1b6c1..116a26da9 100755
--- a/core/lib/Thelia/Cart/CartTrait.php
+++ b/core/lib/Thelia/Cart/CartTrait.php
@@ -29,7 +29,7 @@ use Thelia\Model\Customer;
 use Symfony\Component\HttpFoundation\Request;
 use Thelia\Core\HttpFoundation\Session\Session;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\CartEvent;
+use Thelia\Core\Event\Cart\CartEvent;
 
 /**
  * managed cart
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/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php
index 0b2b310ef..e2a85913d 100755
--- a/core/lib/Thelia/Controller/Admin/CategoryController.php
+++ b/core/lib/Thelia/Controller/Admin/CategoryController.php
@@ -24,19 +24,19 @@
 namespace Thelia\Controller\Admin;
 
 use Symfony\Component\HttpFoundation\Response;
-use Thelia\Core\Event\CategoryDeleteEvent;
-use Thelia\Core\Event\ImageCreateOrUpdateEvent;
-use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\CategoryUpdateEvent;
-use Thelia\Core\Event\CategoryCreateEvent;
 use Thelia\Log\Tlog;
+use Thelia\Core\Event\Category\CategoryDeleteEvent;
+use Thelia\Core\Event\TheliaEvents;
+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;
 use Propel\Runtime\ActiveQuery\Criteria;
diff --git a/core/lib/Thelia/Controller/Admin/ConfigController.php b/core/lib/Thelia/Controller/Admin/ConfigController.php
index 8701710b0..c1d360ff4 100644
--- a/core/lib/Thelia/Controller/Admin/ConfigController.php
+++ b/core/lib/Thelia/Controller/Admin/ConfigController.php
@@ -23,10 +23,10 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Event\ConfigDeleteEvent;
+use Thelia\Core\Event\Config\ConfigDeleteEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\ConfigUpdateEvent;
-use Thelia\Core\Event\ConfigCreateEvent;
+use Thelia\Core\Event\Config\ConfigUpdateEvent;
+use Thelia\Core\Event\Config\ConfigCreateEvent;
 use Thelia\Model\ConfigQuery;
 use Thelia\Form\ConfigModificationForm;
 use Thelia\Form\ConfigCreationForm;
diff --git a/core/lib/Thelia/Controller/Admin/CurrencyController.php b/core/lib/Thelia/Controller/Admin/CurrencyController.php
index f0081d698..610de9474 100644
--- a/core/lib/Thelia/Controller/Admin/CurrencyController.php
+++ b/core/lib/Thelia/Controller/Admin/CurrencyController.php
@@ -23,10 +23,10 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Event\CurrencyDeleteEvent;
+use Thelia\Core\Event\Currency\CurrencyDeleteEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\CurrencyUpdateEvent;
-use Thelia\Core\Event\CurrencyCreateEvent;
+use Thelia\Core\Event\Currency\CurrencyUpdateEvent;
+use Thelia\Core\Event\Currency\CurrencyCreateEvent;
 use Thelia\Model\CurrencyQuery;
 use Thelia\Form\CurrencyModificationForm;
 use Thelia\Form\CurrencyCreationForm;
diff --git a/core/lib/Thelia/Controller/Admin/CustomerController.php b/core/lib/Thelia/Controller/Admin/CustomerController.php
index bc94fd7be..39f124cb0 100644
--- a/core/lib/Thelia/Controller/Admin/CustomerController.php
+++ b/core/lib/Thelia/Controller/Admin/CustomerController.php
@@ -24,8 +24,8 @@
 namespace Thelia\Controller\Admin;
 use Propel\Runtime\Exception\PropelException;
 use Symfony\Component\Form\Form;
-use Thelia\Core\Event\CustomerCreateOrUpdateEvent;
-use Thelia\Core\Event\CustomerEvent;
+use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
+use Thelia\Core\Event\Customer\CustomerEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Form\CustomerModification;
 use Thelia\Form\Exception\FormValidationException;
@@ -151,7 +151,7 @@ class CustomerController extends BaseAdminController
 
     /**
      * @param $data
-     * @return CustomerCreateOrUpdateEvent
+     * @return \Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent
      */
     private function createEventInstance($data)
     {
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/Controller/Admin/FolderController.php b/core/lib/Thelia/Controller/Admin/FolderController.php
index 9f2190442..360d97357 100644
--- a/core/lib/Thelia/Controller/Admin/FolderController.php
+++ b/core/lib/Thelia/Controller/Admin/FolderController.php
@@ -22,10 +22,10 @@
 /*************************************************************************************/
 
 namespace Thelia\Controller\Admin;
-use Thelia\Core\Event\FolderCreateEvent;
-use Thelia\Core\Event\FolderDeleteEvent;
-use Thelia\Core\Event\FolderToggleVisibilityEvent;
-use Thelia\Core\Event\FolderUpdateEvent;
+use Thelia\Core\Event\Folder\FolderCreateEvent;
+use Thelia\Core\Event\Folder\FolderDeleteEvent;
+use Thelia\Core\Event\Folder\FolderToggleVisibilityEvent;
+use Thelia\Core\Event\Folder\FolderUpdateEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Core\Event\UpdatePositionEvent;
 use Thelia\Form\FolderCreationForm;
@@ -150,7 +150,7 @@ class FolderController extends AbstractCrudController
     }
 
     /**
-     * @return FolderToggleVisibilityEvent|void
+     * @return \Thelia\Core\Event\Folder\FolderToggleVisibilityEvent|void
      */
     protected function createToggleVisibilityEvent()
     {
@@ -174,7 +174,7 @@ class FolderController extends AbstractCrudController
     /**
      * Return true if the event contains the object, e.g. the action has updated the object in the event.
      *
-     * @param \Thelia\Core\Event\FolderEvent $event
+     * @param \Thelia\Core\Event\Folder\FolderEvent $event
      */
     protected function eventContainsObject($event)
     {
@@ -184,7 +184,7 @@ class FolderController extends AbstractCrudController
     /**
      * Get the created object from an event.
      *
-     * @param $event \Thelia\Core\Event\FolderEvent $event
+     * @param $event \Thelia\Core\Event\Folder\FolderEvent $event
      *
      * @return null|\Thelia\Model\Folder
      */
@@ -257,7 +257,7 @@ class FolderController extends AbstractCrudController
     }
 
     /**
-     * @param \Thelia\Core\Event\FolderUpdateEvent $updateEvent
+     * @param \Thelia\Core\Event\Folder\FolderUpdateEvent $updateEvent
      * @return Response|void
      */
     protected function performAdditionalUpdateAction($updateEvent)
@@ -275,7 +275,7 @@ class FolderController extends AbstractCrudController
     /**
      * Put in this method post object delete processing if required.
      *
-     * @param \Thelia\Core\Event\FolderDeleteEvent $deleteEvent the delete event
+     * @param \Thelia\Core\Event\Folder\FolderDeleteEvent $deleteEvent the delete event
      * @return Response a response, or null to continue normal processing
      */
     protected function performAdditionalDeleteAction($deleteEvent)
diff --git a/core/lib/Thelia/Controller/Admin/MessageController.php b/core/lib/Thelia/Controller/Admin/MessageController.php
index a55c9deca..176fa7de8 100644
--- a/core/lib/Thelia/Controller/Admin/MessageController.php
+++ b/core/lib/Thelia/Controller/Admin/MessageController.php
@@ -23,9 +23,9 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Event\MessageDeleteEvent;
-use Thelia\Core\Event\TheliaEvents;use Thelia\Core\Event\MessageUpdateEvent;
-use Thelia\Core\Event\MessageCreateEvent;
+use Thelia\Core\Event\Message\MessageDeleteEvent;
+use Thelia\Core\Event\TheliaEvents;use Thelia\Core\Event\Message\MessageUpdateEvent;
+use Thelia\Core\Event\Message\MessageCreateEvent;
 use Thelia\Model\MessageQuery;
 use Thelia\Form\MessageModificationForm;
 use Thelia\Form\MessageCreationForm;
diff --git a/core/lib/Thelia/Controller/Admin/ProductController.php b/core/lib/Thelia/Controller/Admin/ProductController.php
index 342af6b14..c400a28a2 100644
--- a/core/lib/Thelia/Controller/Admin/ProductController.php
+++ b/core/lib/Thelia/Controller/Admin/ProductController.php
@@ -23,17 +23,17 @@
 
 namespace Thelia\Controller\Admin;
 
-use Thelia\Core\Event\ProductDeleteEvent;
+use Thelia\Core\Event\Product\ProductDeleteEvent;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\ProductUpdateEvent;
-use Thelia\Core\Event\ProductCreateEvent;
+use Thelia\Core\Event\Product\ProductUpdateEvent;
+use Thelia\Core\Event\Product\ProductCreateEvent;
 use Thelia\Model\ProductQuery;
 use Thelia\Form\ProductModificationForm;
 use Thelia\Form\ProductCreationForm;
 use Thelia\Core\Event\UpdatePositionEvent;
-use Thelia\Core\Event\ProductToggleVisibilityEvent;
-use Thelia\Core\Event\ProductDeleteContentEvent;
-use Thelia\Core\Event\ProductAddContentEvent;
+use Thelia\Core\Event\Product\ProductToggleVisibilityEvent;
+use Thelia\Core\Event\Product\ProductDeleteContentEvent;
+use Thelia\Core\Event\Product\ProductAddContentEvent;
 use Thelia\Model\ProductAssociatedContent;
 use Thelia\Model\FolderQuery;
 use Thelia\Model\ContentQuery;
@@ -41,22 +41,9 @@ use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Model\ProductAssociatedContentQuery;
 use Thelia\Model\AccessoryQuery;
 use Thelia\Model\CategoryQuery;
-use Thelia\Core\Event\ProductAddAccessoryEvent;
-use Thelia\Core\Event\ProductDeleteAccessoryEvent;
-use Thelia\Core\Event\FeatureProductUpdateEvent;
-use Thelia\Model\FeatureQuery;
-use Thelia\Core\Event\FeatureProductDeleteEvent;
-use Thelia\Model\FeatureTemplateQuery;
-use Thelia\Core\Event\ProductSetTemplateEvent;
-use Thelia\Core\Event\ProductAddCategoryEvent;
-use Thelia\Core\Event\ProductDeleteCategoryEvent;
-use Thelia\Model\AttributeQuery;
-use Thelia\Model\AttributeAvQuery;
-use Thelia\Model\ProductSaleElementsQuery;
-use Thelia\Model\AttributeCombination;
-use Thelia\Model\AttributeAv;
-use Thelia\Core\Event\ProductCreateCombinationEvent;
-use Thelia\Core\Event\ProductDeleteCombinationEvent;
+
+use Thelia\Core\Event\Product\ProductAddAccessoryEvent;
+use Thelia\Core\Event\Product\ProductDeleteAccessoryEvent;
 
 /**
  * Manages products
diff --git a/core/lib/Thelia/Controller/Admin/TemplateController.php b/core/lib/Thelia/Controller/Admin/TemplateController.php
index fb32e4231..50f25252f 100644
--- a/core/lib/Thelia/Controller/Admin/TemplateController.php
+++ b/core/lib/Thelia/Controller/Admin/TemplateController.php
@@ -23,25 +23,25 @@
 
 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;
 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;
 use Thelia\Model\FeatureTemplateQuery;
 use Thelia\Model\AttributeTemplateQuery;
 
+
 /**
  * Manages product templates
  *
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/Controller/Front/CartController.php b/core/lib/Thelia/Controller/Front/CartController.php
index e13ecd61b..ae116b40a 100755
--- a/core/lib/Thelia/Controller/Front/CartController.php
+++ b/core/lib/Thelia/Controller/Front/CartController.php
@@ -24,7 +24,7 @@ namespace Thelia\Controller\Front;
 
 use Propel\Runtime\Exception\PropelException;
 use Thelia\Form\Exception\FormValidationException;
-use Thelia\Core\Event\CartEvent;
+use Thelia\Core\Event\Cart\CartEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Symfony\Component\HttpFoundation\Request;
 use Thelia\Form\CartAdd;
@@ -102,7 +102,7 @@ class CartController extends BaseFrontController
     /**
      * use Thelia\Cart\CartTrait for searching current cart or create a new one
      *
-     * @return CartEvent
+     * @return \Thelia\Core\Event\Cart\CartEvent
      */
     protected function getCartEvent()
     {
diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/core/lib/Thelia/Controller/Front/CustomerController.php
index 3b8c2ccff..9235a6c18 100755
--- a/core/lib/Thelia/Controller/Front/CustomerController.php
+++ b/core/lib/Thelia/Controller/Front/CustomerController.php
@@ -22,8 +22,8 @@
 /*************************************************************************************/
 namespace Thelia\Controller\Front;
 
-use Thelia\Core\Event\CustomerCreateOrUpdateEvent;
-use Thelia\Core\Event\CustomerLoginEvent;
+use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
+use Thelia\Core\Event\Customer\CustomerLoginEvent;
 use Thelia\Core\Event\LostPasswordEvent;
 use Thelia\Core\Security\Authentication\CustomerUsernamePasswordFormAuthenticator;
 use Thelia\Core\Security\Exception\AuthenticationException;
@@ -257,7 +257,7 @@ class CustomerController extends BaseFrontController
 
     /**
      * @param $data
-     * @return CustomerCreateOrUpdateEvent
+     * @return \Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent
      */
     private function createEventInstance($data)
     {
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/Core/Event/CartEvent.php b/core/lib/Thelia/Core/Event/Cart/CartEvent.php
similarity index 98%
rename from core/lib/Thelia/Core/Event/CartEvent.php
rename to core/lib/Thelia/Core/Event/Cart/CartEvent.php
index b24a5c403..4e1ed304d 100755
--- a/core/lib/Thelia/Core/Event/CartEvent.php
+++ b/core/lib/Thelia/Core/Event/Cart/CartEvent.php
@@ -21,9 +21,10 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Cart;
 
 use Symfony\Component\EventDispatcher\Event;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Cart;
 
 class CartEvent extends ActionEvent
diff --git a/core/lib/Thelia/Core/Event/CartItemEvent.php b/core/lib/Thelia/Core/Event/Cart/CartItemEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/CartItemEvent.php
rename to core/lib/Thelia/Core/Event/Cart/CartItemEvent.php
index 6718b63ff..83cbd17c0 100755
--- a/core/lib/Thelia/Core/Event/CartItemEvent.php
+++ b/core/lib/Thelia/Core/Event/Cart/CartItemEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Cart;
 
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\CartItem;
 
 class CartItemEvent extends ActionEvent
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/Core/Event/ConfigCreateEvent.php b/core/lib/Thelia/Core/Event/Config/ConfigCreateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/ConfigCreateEvent.php
rename to core/lib/Thelia/Core/Event/Config/ConfigCreateEvent.php
index 986eb31b7..86cd5c84f 100644
--- a/core/lib/Thelia/Core/Event/ConfigCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/Config/ConfigCreateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Config;
+
+use Thelia\Core\Event\Config\ConfigEvent;
 
 class ConfigCreateEvent extends ConfigEvent
 {
diff --git a/core/lib/Thelia/Core/Event/ConfigDeleteEvent.php b/core/lib/Thelia/Core/Event/Config/ConfigDeleteEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/ConfigDeleteEvent.php
rename to core/lib/Thelia/Core/Event/Config/ConfigDeleteEvent.php
index 87ae50c38..f225e49b5 100644
--- a/core/lib/Thelia/Core/Event/ConfigDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/Config/ConfigDeleteEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Config;
+
+use Thelia\Core\Event\Config\ConfigEvent;
 
 class ConfigDeleteEvent extends ConfigEvent
 {
diff --git a/core/lib/Thelia/Core/Event/ConfigEvent.php b/core/lib/Thelia/Core/Event/Config/ConfigEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/ConfigEvent.php
rename to core/lib/Thelia/Core/Event/Config/ConfigEvent.php
index 646b43856..d2dab3f87 100644
--- a/core/lib/Thelia/Core/Event/ConfigEvent.php
+++ b/core/lib/Thelia/Core/Event/Config/ConfigEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Config;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Config;
 
 class ConfigEvent extends ActionEvent
diff --git a/core/lib/Thelia/Core/Event/ConfigUpdateEvent.php b/core/lib/Thelia/Core/Event/Config/ConfigUpdateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/ConfigUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Config/ConfigUpdateEvent.php
index b3d5955c4..f37f6ab55 100644
--- a/core/lib/Thelia/Core/Event/ConfigUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Config/ConfigUpdateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Config;
+
+use Thelia\Core\Event\Config\ConfigCreateEvent;
 
 class ConfigUpdateEvent extends ConfigCreateEvent
 {
diff --git a/core/lib/Thelia/Core/Event/CurrencyCreateEvent.php b/core/lib/Thelia/Core/Event/Currency/CurrencyCreateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/CurrencyCreateEvent.php
rename to core/lib/Thelia/Core/Event/Currency/CurrencyCreateEvent.php
index fe2cf078c..45f5a1bbe 100644
--- a/core/lib/Thelia/Core/Event/CurrencyCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/Currency/CurrencyCreateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Currency;
+
+use Thelia\Core\Event\Currency\CurrencyEvent;
 
 class CurrencyCreateEvent extends CurrencyEvent
 {
diff --git a/core/lib/Thelia/Core/Event/CurrencyDeleteEvent.php b/core/lib/Thelia/Core/Event/Currency/CurrencyDeleteEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/CurrencyDeleteEvent.php
rename to core/lib/Thelia/Core/Event/Currency/CurrencyDeleteEvent.php
index 706b77f9d..0845d4b9a 100644
--- a/core/lib/Thelia/Core/Event/CurrencyDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/Currency/CurrencyDeleteEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Currency;
+
+use Thelia\Core\Event\Currency\CurrencyEvent;
 
 class CurrencyDeleteEvent extends CurrencyEvent
 {
diff --git a/core/lib/Thelia/Core/Event/CurrencyEvent.php b/core/lib/Thelia/Core/Event/Currency/CurrencyEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/CurrencyEvent.php
rename to core/lib/Thelia/Core/Event/Currency/CurrencyEvent.php
index cdc0b854c..47f91b81d 100644
--- a/core/lib/Thelia/Core/Event/CurrencyEvent.php
+++ b/core/lib/Thelia/Core/Event/Currency/CurrencyEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Currency;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Currency;
 
 class CurrencyEvent extends ActionEvent
diff --git a/core/lib/Thelia/Core/Event/CurrencyUpdateEvent.php b/core/lib/Thelia/Core/Event/Currency/CurrencyUpdateEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/CurrencyUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Currency/CurrencyUpdateEvent.php
index 58f8b0af4..2d9e6e72b 100644
--- a/core/lib/Thelia/Core/Event/CurrencyUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Currency/CurrencyUpdateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Currency;
+
+use Thelia\Core\Event\Currency\CurrencyCreateEvent;
 
 class CurrencyUpdateEvent extends CurrencyCreateEvent
 {
diff --git a/core/lib/Thelia/Core/Event/CustomerCreateOrUpdateEvent.php b/core/lib/Thelia/Core/Event/Customer/CustomerCreateOrUpdateEvent.php
similarity index 98%
rename from core/lib/Thelia/Core/Event/CustomerCreateOrUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Customer/CustomerCreateOrUpdateEvent.php
index d3ae6f62d..229ec66b5 100755
--- a/core/lib/Thelia/Core/Event/CustomerCreateOrUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Customer/CustomerCreateOrUpdateEvent.php
@@ -20,9 +20,10 @@
 /*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
 /*                                                                                   */
 /*************************************************************************************/
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Customer;
 
 use Symfony\Component\EventDispatcher\Event;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Customer;
 
 /**
diff --git a/core/lib/Thelia/Core/Event/CustomerEvent.php b/core/lib/Thelia/Core/Event/Customer/CustomerEvent.php
similarity index 98%
rename from core/lib/Thelia/Core/Event/CustomerEvent.php
rename to core/lib/Thelia/Core/Event/Customer/CustomerEvent.php
index 191b67e78..f11bb7f2d 100755
--- a/core/lib/Thelia/Core/Event/CustomerEvent.php
+++ b/core/lib/Thelia/Core/Event/Customer/CustomerEvent.php
@@ -21,7 +21,7 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Customer;
 
 use Thelia\Model\Customer;
 use Thelia\Core\Event\ActionEvent;
diff --git a/core/lib/Thelia/Core/Event/CustomerLoginEvent.php b/core/lib/Thelia/Core/Event/Customer/CustomerLoginEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/CustomerLoginEvent.php
rename to core/lib/Thelia/Core/Event/Customer/CustomerLoginEvent.php
index e43968845..56c29bf6c 100755
--- a/core/lib/Thelia/Core/Event/CustomerLoginEvent.php
+++ b/core/lib/Thelia/Core/Event/Customer/CustomerLoginEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Customer;
 
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Customer;
 
 class CustomerLoginEvent extends ActionEvent
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/Core/Event/FolderCreateEvent.php b/core/lib/Thelia/Core/Event/Folder/FolderCreateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/FolderCreateEvent.php
rename to core/lib/Thelia/Core/Event/Folder/FolderCreateEvent.php
index 609fea6f8..a788373c8 100644
--- a/core/lib/Thelia/Core/Event/FolderCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/Folder/FolderCreateEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Folder;
+use Thelia\Core\Event\Folder\FolderEvent;
 
 
 /**
diff --git a/core/lib/Thelia/Core/Event/FolderDeleteEvent.php b/core/lib/Thelia/Core/Event/Folder/FolderDeleteEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/FolderDeleteEvent.php
rename to core/lib/Thelia/Core/Event/Folder/FolderDeleteEvent.php
index 1ef83ef51..ef3b875c2 100644
--- a/core/lib/Thelia/Core/Event/FolderDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/Folder/FolderDeleteEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Folder;
+use Thelia\Core\Event\Folder\FolderEvent;
 
 
 /**
diff --git a/core/lib/Thelia/Core/Event/FolderEvent.php b/core/lib/Thelia/Core/Event/Folder/FolderEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/FolderEvent.php
rename to core/lib/Thelia/Core/Event/Folder/FolderEvent.php
index 8ae8223b5..d45dabb91 100644
--- a/core/lib/Thelia/Core/Event/FolderEvent.php
+++ b/core/lib/Thelia/Core/Event/Folder/FolderEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Folder;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Folder;
 
 
diff --git a/core/lib/Thelia/Core/Event/FolderToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/Folder/FolderToggleVisibilityEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/FolderToggleVisibilityEvent.php
rename to core/lib/Thelia/Core/Event/Folder/FolderToggleVisibilityEvent.php
index 9d7c53ab7..120ec29ba 100644
--- a/core/lib/Thelia/Core/Event/FolderToggleVisibilityEvent.php
+++ b/core/lib/Thelia/Core/Event/Folder/FolderToggleVisibilityEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Folder;
+use Thelia\Core\Event\Folder\FolderEvent;
 
 
 /**
diff --git a/core/lib/Thelia/Core/Event/FolderUpdateEvent.php b/core/lib/Thelia/Core/Event/Folder/FolderUpdateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/FolderUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Folder/FolderUpdateEvent.php
index 47c3b28cf..e2b6c5805 100644
--- a/core/lib/Thelia/Core/Event/FolderUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Folder/FolderUpdateEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Folder;
+use Thelia\Core\Event\Folder\FolderCreateEvent;
 
 
 /**
diff --git a/core/lib/Thelia/Core/Event/MessageCreateEvent.php b/core/lib/Thelia/Core/Event/Message/MessageCreateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/MessageCreateEvent.php
rename to core/lib/Thelia/Core/Event/Message/MessageCreateEvent.php
index 172af5f61..fc20c2c81 100644
--- a/core/lib/Thelia/Core/Event/MessageCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/Message/MessageCreateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Message;
+
+use Thelia\Core\Event\Message\MessageEvent;
 
 class MessageCreateEvent extends MessageEvent
 {
diff --git a/core/lib/Thelia/Core/Event/MessageDeleteEvent.php b/core/lib/Thelia/Core/Event/Message/MessageDeleteEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/MessageDeleteEvent.php
rename to core/lib/Thelia/Core/Event/Message/MessageDeleteEvent.php
index 241c68463..a40b19a27 100644
--- a/core/lib/Thelia/Core/Event/MessageDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/Message/MessageDeleteEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Message;
+
+use Thelia\Core\Event\Message\MessageEvent;
 
 class MessageDeleteEvent extends MessageEvent
 {
diff --git a/core/lib/Thelia/Core/Event/MessageEvent.php b/core/lib/Thelia/Core/Event/Message/MessageEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/MessageEvent.php
rename to core/lib/Thelia/Core/Event/Message/MessageEvent.php
index c0efcf39f..82086ed05 100644
--- a/core/lib/Thelia/Core/Event/MessageEvent.php
+++ b/core/lib/Thelia/Core/Event/Message/MessageEvent.php
@@ -21,7 +21,8 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Message;
+use Thelia\Core\Event\ActionEvent;
 use Thelia\Model\Message;
 
 class MessageEvent extends ActionEvent
diff --git a/core/lib/Thelia/Core/Event/MessageUpdateEvent.php b/core/lib/Thelia/Core/Event/Message/MessageUpdateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/MessageUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Message/MessageUpdateEvent.php
index 8c9e2e740..858a668b8 100644
--- a/core/lib/Thelia/Core/Event/MessageUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Message/MessageUpdateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Message;
+
+use Thelia\Core\Event\Message\MessageCreateEvent;
 
 class MessageUpdateEvent extends MessageCreateEvent
 {
diff --git a/core/lib/Thelia/Core/Event/ProductAddAccessoryEvent.php b/core/lib/Thelia/Core/Event/Product/ProductAddAccessoryEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/ProductAddAccessoryEvent.php
rename to core/lib/Thelia/Core/Event/Product/ProductAddAccessoryEvent.php
index d3f2ba19b..fd871d4e0 100644
--- a/core/lib/Thelia/Core/Event/ProductAddAccessoryEvent.php
+++ b/core/lib/Thelia/Core/Event/Product/ProductAddAccessoryEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Product;
 
+use Thelia\Core\Event\Product\ProductEvent;
 use Thelia\Model\Product;
 
 class ProductAddAccessoryEvent extends ProductEvent
diff --git a/core/lib/Thelia/Core/Event/ProductAddContentEvent.php b/core/lib/Thelia/Core/Event/Product/ProductAddContentEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/ProductAddContentEvent.php
rename to core/lib/Thelia/Core/Event/Product/ProductAddContentEvent.php
index 8cd648753..c89385537 100644
--- a/core/lib/Thelia/Core/Event/ProductAddContentEvent.php
+++ b/core/lib/Thelia/Core/Event/Product/ProductAddContentEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Product;
 
+use Thelia\Core\Event\Product\ProductEvent;
 use Thelia\Model\Product;
 
 class ProductAddContentEvent extends ProductEvent
diff --git a/core/lib/Thelia/Core/Event/ProductAssociatedContentEvent.php b/core/lib/Thelia/Core/Event/Product/ProductAssociatedContentEvent.php
similarity index 98%
rename from core/lib/Thelia/Core/Event/ProductAssociatedContentEvent.php
rename to core/lib/Thelia/Core/Event/Product/ProductAssociatedContentEvent.php
index ba41b5ede..5cdb7c8e1 100644
--- a/core/lib/Thelia/Core/Event/ProductAssociatedContentEvent.php
+++ b/core/lib/Thelia/Core/Event/Product/ProductAssociatedContentEvent.php
@@ -21,7 +21,7 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Product;
 
 use Thelia\Model\ProductAssociatedContent;
 use Thelia\Core\Event\ActionEvent;
diff --git a/core/lib/Thelia/Core/Event/ProductCreateEvent.php b/core/lib/Thelia/Core/Event/Product/ProductCreateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/ProductCreateEvent.php
rename to core/lib/Thelia/Core/Event/Product/ProductCreateEvent.php
index 012d29793..ea8243d19 100644
--- a/core/lib/Thelia/Core/Event/ProductCreateEvent.php
+++ b/core/lib/Thelia/Core/Event/Product/ProductCreateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Product;
+
+use Thelia\Core\Event\Product\ProductEvent;
 
 class ProductCreateEvent extends ProductEvent
 {
diff --git a/core/lib/Thelia/Core/Event/ProductDeleteAccessoryEvent.php b/core/lib/Thelia/Core/Event/Product/ProductDeleteAccessoryEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/ProductDeleteAccessoryEvent.php
rename to core/lib/Thelia/Core/Event/Product/ProductDeleteAccessoryEvent.php
index 9644cdacc..deb55018b 100644
--- a/core/lib/Thelia/Core/Event/ProductDeleteAccessoryEvent.php
+++ b/core/lib/Thelia/Core/Event/Product/ProductDeleteAccessoryEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Product;
 
+use Thelia\Core\Event\Product\ProductEvent;
 use Thelia\Model\Product;
 
 class ProductDeleteAccessoryEvent extends ProductEvent
diff --git a/core/lib/Thelia/Core/Event/ProductDeleteContentEvent.php b/core/lib/Thelia/Core/Event/Product/ProductDeleteContentEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/ProductDeleteContentEvent.php
rename to core/lib/Thelia/Core/Event/Product/ProductDeleteContentEvent.php
index f3cdbda1f..aa326e0f9 100644
--- a/core/lib/Thelia/Core/Event/ProductDeleteContentEvent.php
+++ b/core/lib/Thelia/Core/Event/Product/ProductDeleteContentEvent.php
@@ -21,8 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Product;
 
+use Thelia\Core\Event\Product\ProductEvent;
 use Thelia\Model\Product;
 
 class ProductDeleteContentEvent extends ProductEvent
diff --git a/core/lib/Thelia/Core/Event/ProductDeleteEvent.php b/core/lib/Thelia/Core/Event/Product/ProductDeleteEvent.php
similarity index 96%
rename from core/lib/Thelia/Core/Event/ProductDeleteEvent.php
rename to core/lib/Thelia/Core/Event/Product/ProductDeleteEvent.php
index 43273887c..e9170134b 100644
--- a/core/lib/Thelia/Core/Event/ProductDeleteEvent.php
+++ b/core/lib/Thelia/Core/Event/Product/ProductDeleteEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Product;
+
+use Thelia\Core\Event\Product\ProductEvent;
 
 class ProductDeleteEvent extends ProductEvent
 {
diff --git a/core/lib/Thelia/Core/Event/ProductEvent.php b/core/lib/Thelia/Core/Event/Product/ProductEvent.php
similarity index 98%
rename from core/lib/Thelia/Core/Event/ProductEvent.php
rename to core/lib/Thelia/Core/Event/Product/ProductEvent.php
index 6decd8101..11359c616 100644
--- a/core/lib/Thelia/Core/Event/ProductEvent.php
+++ b/core/lib/Thelia/Core/Event/Product/ProductEvent.php
@@ -21,7 +21,7 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Product;
 
 use Thelia\Model\Product;
 use Thelia\Core\Event\ActionEvent;
diff --git a/core/lib/Thelia/Core/Event/ProductToggleVisibilityEvent.php b/core/lib/Thelia/Core/Event/Product/ProductToggleVisibilityEvent.php
similarity index 95%
rename from core/lib/Thelia/Core/Event/ProductToggleVisibilityEvent.php
rename to core/lib/Thelia/Core/Event/Product/ProductToggleVisibilityEvent.php
index 732cfac76..c6a35a660 100644
--- a/core/lib/Thelia/Core/Event/ProductToggleVisibilityEvent.php
+++ b/core/lib/Thelia/Core/Event/Product/ProductToggleVisibilityEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Product;
+
+use Thelia\Core\Event\Product\ProductEvent;
 
 class ProductToggleVisibilityEvent extends ProductEvent
 {
diff --git a/core/lib/Thelia/Core/Event/ProductUpdateEvent.php b/core/lib/Thelia/Core/Event/Product/ProductUpdateEvent.php
similarity index 97%
rename from core/lib/Thelia/Core/Event/ProductUpdateEvent.php
rename to core/lib/Thelia/Core/Event/Product/ProductUpdateEvent.php
index 8ade33c74..535f04462 100644
--- a/core/lib/Thelia/Core/Event/ProductUpdateEvent.php
+++ b/core/lib/Thelia/Core/Event/Product/ProductUpdateEvent.php
@@ -21,7 +21,9 @@
 /*                                                                                   */
 /*************************************************************************************/
 
-namespace Thelia\Core\Event;
+namespace Thelia\Core\Event\Product;
+
+use Thelia\Core\Event\Product\ProductCreateEvent;
 
 class ProductUpdateEvent extends ProductCreateEvent
 {
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/Core/TheliaHttpKernel.php b/core/lib/Thelia/Core/TheliaHttpKernel.php
index c3ed552c0..93a9e6b41 100755
--- a/core/lib/Thelia/Core/TheliaHttpKernel.php
+++ b/core/lib/Thelia/Core/TheliaHttpKernel.php
@@ -32,7 +32,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Session;
 
-use Thelia\Core\Event\CurrencyEvent;
+use Thelia\Core\Event\Currency\CurrencyEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model;
 
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 85197b802..615fa643e 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/Model/CartItem.php b/core/lib/Thelia/Model/CartItem.php
index a1fb3601a..25a4f44aa 100755
--- a/core/lib/Thelia/Model/CartItem.php
+++ b/core/lib/Thelia/Model/CartItem.php
@@ -7,7 +7,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\CartItem as BaseCartItem;
 use Thelia\Model\ConfigQuery;
-use Thelia\Core\Event\CartEvent;
+use Thelia\Core\Event\Cart\CartEvent;
 use Thelia\TaxEngine\Calculator;
 
 class CartItem extends BaseCartItem
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;
 
diff --git a/core/lib/Thelia/Model/Config.php b/core/lib/Thelia/Model/Config.php
index cc44e5053..9b44f1981 100755
--- a/core/lib/Thelia/Model/Config.php
+++ b/core/lib/Thelia/Model/Config.php
@@ -26,7 +26,7 @@ namespace Thelia\Model;
 use Thelia\Model\Base\Config as BaseConfig;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\ConfigEvent;
+use Thelia\Core\Event\Config\ConfigEvent;
 
 class Config extends BaseConfig {
 
diff --git a/core/lib/Thelia/Model/Currency.php b/core/lib/Thelia/Model/Currency.php
index 6ec452456..c5b77fc08 100755
--- a/core/lib/Thelia/Model/Currency.php
+++ b/core/lib/Thelia/Model/Currency.php
@@ -6,7 +6,7 @@ use Propel\Runtime\Exception\PropelException;
 use Thelia\Model\Base\Currency as BaseCurrency;
 use Thelia\Core\Event\TheliaEvents;
 use Propel\Runtime\Connection\ConnectionInterface;
-use Thelia\Core\Event\CurrencyEvent;
+use Thelia\Core\Event\Currency\CurrencyEvent;
 
 class Currency extends BaseCurrency {
 
diff --git a/core/lib/Thelia/Model/Customer.php b/core/lib/Thelia/Model/Customer.php
index 820928224..230023410 100755
--- a/core/lib/Thelia/Model/Customer.php
+++ b/core/lib/Thelia/Model/Customer.php
@@ -17,7 +17,7 @@ use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Propel;
 use Thelia\Model\Map\CustomerTableMap;
 use Thelia\Core\Security\Role\Role;
-use Thelia\Core\Event\CustomerEvent;
+use Thelia\Core\Event\Customer\CustomerEvent;
 
 /**
  * Skeleton subclass for representing a row from the 'customer' table.
diff --git a/core/lib/Thelia/Model/Feature.php b/core/lib/Thelia/Model/Feature.php
index ffc5ae90f..800ff832a 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 {
 
diff --git a/core/lib/Thelia/Model/Folder.php b/core/lib/Thelia/Model/Folder.php
index ffd1c38ef..d143f8a8f 100755
--- a/core/lib/Thelia/Model/Folder.php
+++ b/core/lib/Thelia/Model/Folder.php
@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Core\Event\FolderEvent;
+use Thelia\Core\Event\Folder\FolderEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\Folder as BaseFolder;
 use Thelia\Tools\URL;
diff --git a/core/lib/Thelia/Model/Message.php b/core/lib/Thelia/Model/Message.php
index aa6481ab8..4163e6d6b 100755
--- a/core/lib/Thelia/Model/Message.php
+++ b/core/lib/Thelia/Model/Message.php
@@ -5,7 +5,7 @@ namespace Thelia\Model;
 use Thelia\Model\Base\Message as BaseMessage;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\MessageEvent;
+use Thelia\Core\Event\Message\MessageEvent;
 
 class Message extends BaseMessage {
 
diff --git a/core/lib/Thelia/Model/Product.php b/core/lib/Thelia/Model/Product.php
index 2348a9c0d..f48f9e75e 100755
--- a/core/lib/Thelia/Model/Product.php
+++ b/core/lib/Thelia/Model/Product.php
@@ -8,7 +8,7 @@ use Thelia\Tools\URL;
 use Thelia\TaxEngine\Calculator;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\ProductEvent;
+use Thelia\Core\Event\Product\ProductEvent;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Propel;
 use Thelia\Model\Map\ProductTableMap;
diff --git a/core/lib/Thelia/Model/ProductAssociatedContent.php b/core/lib/Thelia/Model/ProductAssociatedContent.php
index 843d76ba1..12be080fc 100644
--- a/core/lib/Thelia/Model/ProductAssociatedContent.php
+++ b/core/lib/Thelia/Model/ProductAssociatedContent.php
@@ -4,7 +4,7 @@ namespace Thelia\Model;
 
 use Thelia\Model\Base\ProductAssociatedContent as BaseProductAssociatedContent;
 use Propel\Runtime\Connection\ConnectionInterface;
-use Thelia\Core\Event\ProductAssociatedContentEvent;
+use Thelia\Core\Event\Product\ProductAssociatedContentEvent;
 use Thelia\Core\Event\TheliaEvents;
 
 class ProductAssociatedContent extends BaseProductAssociatedContent {
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
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;
 
 /**
diff --git a/core/lib/Thelia/Tests/Action/CustomerTest.php b/core/lib/Thelia/Tests/Action/CustomerTest.php
index 10ba01587..503faedbc 100644
--- a/core/lib/Thelia/Tests/Action/CustomerTest.php
+++ b/core/lib/Thelia/Tests/Action/CustomerTest.php
@@ -23,7 +23,7 @@
 
 namespace Thelia\Tests\Action\ImageTest;
 use Thelia\Action\Customer;
-use Thelia\Core\Event\CustomerCreateOrUpdateEvent;
+use Thelia\Core\Event\Customer\CustomerCreateOrUpdateEvent;
 
 
 /**
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 4aba10120..731c6f685 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -90,12 +90,12 @@ URL: http://www.thelia.net
                         <li><a href="{url path="/customer/account"}" class="login">{intl l="My Account"}</a></li>
                     {/loop}
 
-                    {elseloop rel="customer_info_block" rel="customer_info_block"}
+                    {elseloop rel="customer_info_block"}
                     <li><a href="{url path="/register"}" class="register">{intl l="Register"}!</a></li>
                     <li><a href="{url path="/login"}" class="login">{intl l="Log In!"}</a></li>
                     {/elseloop}
                     <li class="dropdown">
-                        <a href="{url path="/cart"}" class="dropdown-toggle cart" data-toggle="dropdown">
+                        <a href="{url path="/cart"}" class="dropdown-toggle cart" {*data-toggle="dropdown"*}>
                             Cart <span class="badge">{cart attr="count_item"}</span>
                         </a>
                     </li>