diff --git a/core/lib/Thelia/Action/Currency.php b/core/lib/Thelia/Action/Currency.php
index 946fee375..8b3408729 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/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/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/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/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 {