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/Controller/Admin/CustomerController.php b/core/lib/Thelia/Controller/Admin/CustomerController.php
index 9209cb361..a8b186e87 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/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/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/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/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;
 
 
 /**