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/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/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/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;