diff --git a/app/config/services.yml b/app/config/services.yml
index 0b14770db..c62ad0de2 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -328,7 +328,7 @@ services:
                     confirmation: '%fos_user.registration.confirmation.from_email%'
                     resetting: '%fos_user.resetting.email.from_email%'
 
-    Wallabag\UserBundle\EventListener\CreateConfigListener:
+    Wallabag\CoreBundle\Event\Listener\CreateConfigListener:
         arguments:
             $itemsOnPage: "%wallabag_core.items_on_page%"
             $feedLimit: "%wallabag_core.feed_limit%"
@@ -338,7 +338,7 @@ services:
             $listMode: "%wallabag_core.list_mode%"
             $displayThumbnails: "%wallabag_core.display_thumbnails%"
 
-    Wallabag\UserBundle\EventListener\AuthenticationFailureListener:
+    Wallabag\CoreBundle\Event\Listener\AuthenticationFailureListener:
         tags:
             - { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure }
 
diff --git a/src/Wallabag/UserBundle/EventListener/AuthenticationFailureListener.php b/src/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListener.php
similarity index 96%
rename from src/Wallabag/UserBundle/EventListener/AuthenticationFailureListener.php
rename to src/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListener.php
index 20fbd2a7f..fefd700ed 100644
--- a/src/Wallabag/UserBundle/EventListener/AuthenticationFailureListener.php
+++ b/src/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListener.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\EventListener;
+namespace Wallabag\CoreBundle\Event\Listener;
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
diff --git a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php b/src/Wallabag/CoreBundle/Event/Listener/CreateConfigListener.php
similarity index 98%
rename from src/Wallabag/UserBundle/EventListener/CreateConfigListener.php
rename to src/Wallabag/CoreBundle/Event/Listener/CreateConfigListener.php
index a700115fc..bbb25a311 100644
--- a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php
+++ b/src/Wallabag/CoreBundle/Event/Listener/CreateConfigListener.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\EventListener;
+namespace Wallabag\CoreBundle\Event\Listener;
 
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Event\UserEvent;
diff --git a/src/Wallabag/UserBundle/EventListener/PasswordResettingListener.php b/src/Wallabag/CoreBundle/Event/Listener/PasswordResettingListener.php
similarity index 95%
rename from src/Wallabag/UserBundle/EventListener/PasswordResettingListener.php
rename to src/Wallabag/CoreBundle/Event/Listener/PasswordResettingListener.php
index af509f41e..a44798b73 100644
--- a/src/Wallabag/UserBundle/EventListener/PasswordResettingListener.php
+++ b/src/Wallabag/CoreBundle/Event/Listener/PasswordResettingListener.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\EventListener;
+namespace Wallabag\CoreBundle\Event\Listener;
 
 use FOS\UserBundle\Event\FormEvent;
 use FOS\UserBundle\FOSUserEvents;
diff --git a/src/Wallabag/UserBundle/EventListener/RegistrationListener.php b/src/Wallabag/CoreBundle/Event/Listener/RegistrationListener.php
similarity index 96%
rename from src/Wallabag/UserBundle/EventListener/RegistrationListener.php
rename to src/Wallabag/CoreBundle/Event/Listener/RegistrationListener.php
index dd928a878..9290cc231 100644
--- a/src/Wallabag/UserBundle/EventListener/RegistrationListener.php
+++ b/src/Wallabag/CoreBundle/Event/Listener/RegistrationListener.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\EventListener;
+namespace Wallabag\CoreBundle\Event\Listener;
 
 use FOS\UserBundle\Event\GetResponseUserEvent;
 use FOS\UserBundle\FOSUserEvents;
diff --git a/tests/Wallabag/UserBundle/EventListener/AuthenticationFailureListenerTest.php b/tests/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListenerTest.php
similarity index 94%
rename from tests/Wallabag/UserBundle/EventListener/AuthenticationFailureListenerTest.php
rename to tests/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListenerTest.php
index 519039faf..f29f0068c 100644
--- a/tests/Wallabag/UserBundle/EventListener/AuthenticationFailureListenerTest.php
+++ b/tests/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\UserBundle\EventListener;
+namespace Tests\Wallabag\CoreBundle\Event\Listener;
 
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
@@ -12,7 +12,7 @@ use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\AuthenticationEvents;
 use Symfony\Component\Security\Core\Event\AuthenticationFailureEvent;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Wallabag\UserBundle\EventListener\AuthenticationFailureListener;
+use Wallabag\CoreBundle\Event\Listener\AuthenticationFailureListener;
 
 class AuthenticationFailureListenerTest extends TestCase
 {
diff --git a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php b/tests/Wallabag/CoreBundle/Event/Listener/CreateConfigListenerTest.php
similarity index 94%
rename from tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php
rename to tests/Wallabag/CoreBundle/Event/Listener/CreateConfigListenerTest.php
index d3b05eeac..20da9f624 100644
--- a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php
+++ b/tests/Wallabag/CoreBundle/Event/Listener/CreateConfigListenerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\UserBundle\EventListener;
+namespace Tests\Wallabag\CoreBundle\Event\Listener;
 
 use Doctrine\ORM\EntityManager;
 use FOS\UserBundle\Event\FilterUserResponseEvent;
@@ -13,7 +13,7 @@ use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\CoreBundle\Entity\User;
-use Wallabag\UserBundle\EventListener\CreateConfigListener;
+use Wallabag\CoreBundle\Event\Listener\CreateConfigListener;
 
 class CreateConfigListenerTest extends TestCase
 {