diff --git a/app/config/config.yml b/app/config/config.yml
index e9129223c..386aefb99 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -168,7 +168,7 @@ fos_user:
         address: "%from_email%"
         sender_name: wallabag
     service:
-        mailer: Wallabag\UserBundle\Mailer\UserMailer
+        mailer: Wallabag\CoreBundle\Mailer\UserMailer
 
 fos_oauth_server:
     db_driver:           orm
@@ -201,7 +201,7 @@ scheb_two_factor:
         sender_email: "%twofactor_sender%"
         digits: 6
         template: "@WallabagUser/Authentication/form.html.twig"
-        mailer: Wallabag\UserBundle\Mailer\AuthCodeMailer
+        mailer: Wallabag\CoreBundle\Mailer\AuthCodeMailer
 
 rulerz:
     targets:
diff --git a/app/config/services.yml b/app/config/services.yml
index ec204cf26..0b14770db 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -318,7 +318,7 @@ services:
     wallabag_core.entry.download_images.client:
         alias: 'httplug.client.wallabag_core.entry.download_images'
 
-    Wallabag\UserBundle\Mailer\UserMailer:
+    Wallabag\CoreBundle\Mailer\UserMailer:
         arguments:
             $parameters:
                 template:
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index d3a0c1aec..97a244c70 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -30,45 +30,45 @@ parameters:
 			count: 10
 			path: src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
 
-		-
-			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
-			count: 1
-			path: src/Wallabag/ImportBundle/Controller/BrowserController.php
-
-		-
-			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
-			count: 1
-			path: src/Wallabag/ImportBundle/Controller/BrowserController.php
-
-		-
-			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
-			count: 1
-			path: src/Wallabag/ImportBundle/Controller/HtmlController.php
-
-		-
-			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
-			count: 1
-			path: src/Wallabag/ImportBundle/Controller/HtmlController.php
-
-		-
-			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
-			count: 1
-			path: src/Wallabag/ImportBundle/Controller/WallabagController.php
-
-		-
-			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
-			count: 1
-			path: src/Wallabag/ImportBundle/Controller/WallabagController.php
-
 		-
 			message: "#^Call to an undefined method Scheb\\\\TwoFactorBundle\\\\Model\\\\Email\\\\TwoFactorInterface\\:\\:getName\\(\\)\\.$#"
 			count: 2
-			path: src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
+			path: src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php
 
 		-
-			message: "#^PHPDoc type Symfony\\\\Component\\\\Mailer\\\\MailerInterface of property Wallabag\\\\UserBundle\\\\Mailer\\\\UserMailer\\:\\:\\$mailer is not covariant with PHPDoc type Swift_Mailer of overridden property FOS\\\\UserBundle\\\\Mailer\\\\TwigSwiftMailer\\:\\:\\$mailer\\.$#"
+			message: "#^PHPDoc type Symfony\\\\Component\\\\Mailer\\\\MailerInterface of property Wallabag\\\\CoreBundle\\\\Mailer\\\\UserMailer\\:\\:\\$mailer is not covariant with PHPDoc type Swift_Mailer of overridden property FOS\\\\UserBundle\\\\Mailer\\\\TwigSwiftMailer\\:\\:\\$mailer\\.$#"
 			count: 1
-			path: src/Wallabag/UserBundle/Mailer/UserMailer.php
+			path: src/Wallabag/CoreBundle/Mailer/UserMailer.php
+
+		-
+			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
+			count: 1
+			path: src/Wallabag/ImportBundle/Controller/BrowserController.php
+
+		-
+			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
+			count: 1
+			path: src/Wallabag/ImportBundle/Controller/BrowserController.php
+
+		-
+			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
+			count: 1
+			path: src/Wallabag/ImportBundle/Controller/HtmlController.php
+
+		-
+			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
+			count: 1
+			path: src/Wallabag/ImportBundle/Controller/HtmlController.php
+
+		-
+			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
+			count: 1
+			path: src/Wallabag/ImportBundle/Controller/WallabagController.php
+
+		-
+			message: "#^Call to an undefined method Wallabag\\\\ImportBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
+			count: 1
+			path: src/Wallabag/ImportBundle/Controller/WallabagController.php
 
 		-
 			message: "#^Call to an undefined method DOMNode\\:\\:getAttribute\\(\\)\\.$#"
diff --git a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php b/src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php
similarity index 98%
rename from src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
rename to src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php
index 7e355effe..c0d70c6dd 100644
--- a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
+++ b/src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\Mailer;
+namespace Wallabag\CoreBundle\Mailer;
 
 use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface;
 use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface;
diff --git a/src/Wallabag/UserBundle/Mailer/UserMailer.php b/src/Wallabag/CoreBundle/Mailer/UserMailer.php
similarity index 98%
rename from src/Wallabag/UserBundle/Mailer/UserMailer.php
rename to src/Wallabag/CoreBundle/Mailer/UserMailer.php
index 34f13e0c4..6d1f2f133 100644
--- a/src/Wallabag/UserBundle/Mailer/UserMailer.php
+++ b/src/Wallabag/CoreBundle/Mailer/UserMailer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\Mailer;
+namespace Wallabag\CoreBundle\Mailer;
 
 use FOS\UserBundle\Mailer\TwigSwiftMailer;
 use Symfony\Component\Mailer\MailerInterface;
diff --git a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/CoreBundle/Mailer/AuthCodeMailerTest.php
similarity index 96%
rename from tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
rename to tests/Wallabag/CoreBundle/Mailer/AuthCodeMailerTest.php
index 400bf8f32..497fdb833 100644
--- a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
+++ b/tests/Wallabag/CoreBundle/Mailer/AuthCodeMailerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\UserBundle\Mailer;
+namespace Tests\Wallabag\CoreBundle\Mailer;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Mailer\MailerInterface;
@@ -8,7 +8,7 @@ use Symfony\Component\Mime\Address;
 use Twig\Environment;
 use Twig\Loader\ArrayLoader;
 use Wallabag\CoreBundle\Entity\User;
-use Wallabag\UserBundle\Mailer\AuthCodeMailer;
+use Wallabag\CoreBundle\Mailer\AuthCodeMailer;
 
 class AuthCodeMailerTest extends TestCase
 {