diff --git a/core/lib/Thelia/Action/Product.php b/core/lib/Thelia/Action/Product.php
index 69a07c157..a30a49a41 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,15 +46,15 @@ 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\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)
     {
@@ -80,7 +80,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)
     {
@@ -109,7 +109,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/Controller/Admin/ProductController.php b/core/lib/Thelia/Controller/Admin/ProductController.php
index 27c559442..c0b52767c 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,8 +41,8 @@ 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\Product\ProductAddAccessoryEvent;
+use Thelia\Core\Event\Product\ProductDeleteAccessoryEvent;
 
 /**
  * Manages products
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/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 d2d30a11a..47330d0da 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/Model/Product.php b/core/lib/Thelia/Model/Product.php
index cbb6c0051..f433b294b 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/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>