diff --git a/app/config/routing.yml b/app/config/routing.yml
index 205fe8230..ec57effa2 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -3,11 +3,6 @@ wallabag_import:
     type: annotation
     prefix: /import
 
-wallabag_api:
-    resource: "@WallabagApiBundle/Controller/"
-    type: annotation
-    prefix: /
-
 app:
     resource: "@WallabagCoreBundle/Controller/"
     type: annotation
diff --git a/app/config/services.yml b/app/config/services.yml
index 3549e5def..14bfa3123 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -42,10 +42,6 @@ services:
 
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class
-    Wallabag\ApiBundle\Controller\:
-        resource: '../../src/Wallabag/ApiBundle/Controller/'
-        tags: ['controller.service_arguments']
-
     Wallabag\CoreBundle\Controller\:
         resource: '../../src/Wallabag/CoreBundle/Controller/'
         tags: ['controller.service_arguments']
diff --git a/src/Wallabag/CoreBundle/Controller/AnnotationController.php b/src/Wallabag/CoreBundle/Controller/AnnotationController.php
index fa7cc218a..aa48ac095 100644
--- a/src/Wallabag/CoreBundle/Controller/AnnotationController.php
+++ b/src/Wallabag/CoreBundle/Controller/AnnotationController.php
@@ -33,7 +33,7 @@ class AnnotationController extends AbstractFOSRestController
     /**
      * Retrieve annotations for an entry.
      *
-     * @see Wallabag\ApiBundle\Controller\WallabagRestController
+     * @see Api\WallabagRestController
      *
      * @Route("/annotations/{entry}.{_format}", methods={"GET"}, name="annotations_get_annotations", defaults={"_format": "json"})
      *
@@ -54,7 +54,7 @@ class AnnotationController extends AbstractFOSRestController
     /**
      * Creates a new annotation.
      *
-     * @see Wallabag\ApiBundle\Controller\WallabagRestController
+     * @see Api\WallabagRestController
      *
      * @Route("/annotations/{entry}.{_format}", methods={"POST"}, name="annotations_post_annotation", defaults={"_format": "json"})
      *
@@ -88,7 +88,7 @@ class AnnotationController extends AbstractFOSRestController
     /**
      * Updates an annotation.
      *
-     * @see Wallabag\ApiBundle\Controller\WallabagRestController
+     * @see Api\WallabagRestController
      *
      * @Route("/annotations/{annotation}.{_format}", methods={"PUT"}, name="annotations_put_annotation", defaults={"_format": "json"})
      *
@@ -125,7 +125,7 @@ class AnnotationController extends AbstractFOSRestController
     /**
      * Removes an annotation.
      *
-     * @see Wallabag\ApiBundle\Controller\WallabagRestController
+     * @see Api\WallabagRestController
      *
      * @Route("/annotations/{annotation}.{_format}", methods={"DELETE"}, name="annotations_delete_annotation", defaults={"_format": "json"})
      *
diff --git a/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php b/src/Wallabag/CoreBundle/Controller/Api/AnnotationRestController.php
similarity index 99%
rename from src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
rename to src/Wallabag/CoreBundle/Controller/Api/AnnotationRestController.php
index 63a3857e5..6fe11bcc9 100644
--- a/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/Api/AnnotationRestController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Nelmio\ApiDocBundle\Annotation\Operation;
 use OpenApi\Annotations as OA;
diff --git a/src/Wallabag/ApiBundle/Controller/ConfigRestController.php b/src/Wallabag/CoreBundle/Controller/Api/ConfigRestController.php
similarity index 96%
rename from src/Wallabag/ApiBundle/Controller/ConfigRestController.php
rename to src/Wallabag/CoreBundle/Controller/Api/ConfigRestController.php
index 6539291ff..ec4d84b61 100644
--- a/src/Wallabag/ApiBundle/Controller/ConfigRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/Api/ConfigRestController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\SerializerInterface;
diff --git a/src/Wallabag/ApiBundle/Controller/DeveloperController.php b/src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php
similarity index 98%
rename from src/Wallabag/ApiBundle/Controller/DeveloperController.php
rename to src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php
index 48a163d21..afad4bce0 100644
--- a/src/Wallabag/ApiBundle/Controller/DeveloperController.php
+++ b/src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/CoreBundle/Controller/Api/EntryRestController.php
similarity index 99%
rename from src/Wallabag/ApiBundle/Controller/EntryRestController.php
rename to src/Wallabag/CoreBundle/Controller/Api/EntryRestController.php
index a69978591..6adf5f33e 100644
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/Api/EntryRestController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Hateoas\Configuration\Route as HateoasRoute;
 use Hateoas\Representation\Factory\PagerfantaFactory;
diff --git a/src/Wallabag/ApiBundle/Controller/SearchRestController.php b/src/Wallabag/CoreBundle/Controller/Api/SearchRestController.php
similarity index 98%
rename from src/Wallabag/ApiBundle/Controller/SearchRestController.php
rename to src/Wallabag/CoreBundle/Controller/Api/SearchRestController.php
index cd71c83f1..323ed0353 100644
--- a/src/Wallabag/ApiBundle/Controller/SearchRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/Api/SearchRestController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Hateoas\Configuration\Route as HateoasRoute;
 use Hateoas\Representation\Factory\PagerfantaFactory;
diff --git a/src/Wallabag/ApiBundle/Controller/TagRestController.php b/src/Wallabag/CoreBundle/Controller/Api/TagRestController.php
similarity index 99%
rename from src/Wallabag/ApiBundle/Controller/TagRestController.php
rename to src/Wallabag/CoreBundle/Controller/Api/TagRestController.php
index 03bf8bef9..b97a87c93 100644
--- a/src/Wallabag/ApiBundle/Controller/TagRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/Api/TagRestController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Nelmio\ApiDocBundle\Annotation\Operation;
 use OpenApi\Annotations as OA;
diff --git a/src/Wallabag/ApiBundle/Controller/TaggingRuleRestController.php b/src/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestController.php
similarity index 97%
rename from src/Wallabag/ApiBundle/Controller/TaggingRuleRestController.php
rename to src/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestController.php
index d20cfb19c..864d8ab4c 100644
--- a/src/Wallabag/ApiBundle/Controller/TaggingRuleRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\SerializerBuilder;
diff --git a/src/Wallabag/ApiBundle/Controller/UserRestController.php b/src/Wallabag/CoreBundle/Controller/Api/UserRestController.php
similarity index 99%
rename from src/Wallabag/ApiBundle/Controller/UserRestController.php
rename to src/Wallabag/CoreBundle/Controller/Api/UserRestController.php
index a1c3e29d1..6a33b7c8b 100644
--- a/src/Wallabag/ApiBundle/Controller/UserRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/Api/UserRestController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/CoreBundle/Controller/Api/WallabagRestController.php
similarity index 99%
rename from src/Wallabag/ApiBundle/Controller/WallabagRestController.php
rename to src/Wallabag/CoreBundle/Controller/Api/WallabagRestController.php
index 9600607f5..68339e5d1 100644
--- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php
+++ b/src/Wallabag/CoreBundle/Controller/Api/WallabagRestController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ApiBundle\Controller;
+namespace Wallabag\CoreBundle\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
diff --git a/tests/Wallabag/ApiBundle/Controller/ConfigRestControllerTest.php b/tests/Wallabag/CoreBundle/Controller/Api/ConfigRestControllerTest.php
similarity index 94%
rename from tests/Wallabag/ApiBundle/Controller/ConfigRestControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/Api/ConfigRestControllerTest.php
index 5547a92fb..039d7e1ff 100644
--- a/tests/Wallabag/ApiBundle/Controller/ConfigRestControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/Api/ConfigRestControllerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
-
-use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 class ConfigRestControllerTest extends WallabagApiTestCase
 {
diff --git a/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php b/tests/Wallabag/CoreBundle/Controller/Api/DeveloperControllerTest.php
similarity index 98%
rename from tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/Api/DeveloperControllerTest.php
index 35573809a..b98ae6e43 100644
--- a/tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/Api/DeveloperControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/CoreBundle/Controller/Api/EntryRestControllerTest.php
similarity index 99%
rename from tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/Api/EntryRestControllerTest.php
index 9e683305a..a75e49590 100644
--- a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/Api/EntryRestControllerTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\DependencyInjection\Container;
-use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 use Wallabag\CoreBundle\Entity\User;
diff --git a/tests/Wallabag/ApiBundle/Controller/SearchRestControllerTest.php b/tests/Wallabag/CoreBundle/Controller/Api/SearchRestControllerTest.php
similarity index 96%
rename from tests/Wallabag/ApiBundle/Controller/SearchRestControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/Api/SearchRestControllerTest.php
index 9a354da71..b5beb064f 100644
--- a/tests/Wallabag/ApiBundle/Controller/SearchRestControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/Api/SearchRestControllerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
-
-use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 class SearchRestControllerTest extends WallabagApiTestCase
 {
diff --git a/tests/Wallabag/ApiBundle/Controller/TagRestControllerTest.php b/tests/Wallabag/CoreBundle/Controller/Api/TagRestControllerTest.php
similarity index 98%
rename from tests/Wallabag/ApiBundle/Controller/TagRestControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/Api/TagRestControllerTest.php
index 804748afa..8bbcc36ca 100644
--- a/tests/Wallabag/ApiBundle/Controller/TagRestControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/Api/TagRestControllerTest.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 
diff --git a/tests/Wallabag/ApiBundle/Controller/TaggingRuleRestControllerTest.php b/tests/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestControllerTest.php
similarity index 79%
rename from tests/Wallabag/ApiBundle/Controller/TaggingRuleRestControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestControllerTest.php
index b6477256e..43a7ebb4b 100644
--- a/tests/Wallabag/ApiBundle/Controller/TaggingRuleRestControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestControllerTest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
-
-use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 class TaggingRuleRestControllerTest extends WallabagApiTestCase
 {
diff --git a/tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php b/tests/Wallabag/CoreBundle/Controller/Api/UserRestControllerTest.php
similarity index 98%
rename from tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/Api/UserRestControllerTest.php
index 6419be390..ea2b0a6ba 100644
--- a/tests/Wallabag/ApiBundle/Controller/UserRestControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/Api/UserRestControllerTest.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
-use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
 
 class UserRestControllerTest extends WallabagApiTestCase
 {
diff --git a/tests/Wallabag/ApiBundle/WallabagApiTestCase.php b/tests/Wallabag/CoreBundle/Controller/Api/WallabagApiTestCase.php
similarity index 97%
rename from tests/Wallabag/ApiBundle/WallabagApiTestCase.php
rename to tests/Wallabag/CoreBundle/Controller/Api/WallabagApiTestCase.php
index 6543c35a3..5bdffcc58 100644
--- a/tests/Wallabag/ApiBundle/WallabagApiTestCase.php
+++ b/tests/Wallabag/CoreBundle/Controller/Api/WallabagApiTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Model\UserInterface;
diff --git a/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php b/tests/Wallabag/CoreBundle/Controller/Api/WallabagRestControllerTest.php
similarity index 95%
rename from tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php
rename to tests/Wallabag/CoreBundle/Controller/Api/WallabagRestControllerTest.php
index 9ccc8c4fe..32444ab12 100644
--- a/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/Api/WallabagRestControllerTest.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace Tests\Wallabag\ApiBundle\Controller;
+namespace Tests\Wallabag\CoreBundle\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
-use Tests\Wallabag\ApiBundle\WallabagApiTestCase;
 
 class WallabagRestControllerTest extends WallabagApiTestCase
 {