diff --git a/src/Wallabag/CoreBundle/Controller/AnnotationController.php b/src/Wallabag/CoreBundle/Controller/AnnotationController.php
index d19d2d9d4..c73ce26db 100644
--- a/src/Wallabag/CoreBundle/Controller/AnnotationController.php
+++ b/src/Wallabag/CoreBundle/Controller/AnnotationController.php
@@ -10,10 +10,10 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\AnnotationBundle\Form\EditAnnotationType;
-use Wallabag\AnnotationBundle\Form\NewAnnotationType;
 use Wallabag\CoreBundle\Entity\Annotation;
 use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Form\Type\EditAnnotationType;
+use Wallabag\CoreBundle\Form\Type\NewAnnotationType;
 use Wallabag\CoreBundle\Repository\AnnotationRepository;
 use Wallabag\UserBundle\Entity\User;
 
diff --git a/src/Wallabag/AnnotationBundle/Form/EditAnnotationType.php b/src/Wallabag/CoreBundle/Form/Type/EditAnnotationType.php
similarity index 89%
rename from src/Wallabag/AnnotationBundle/Form/EditAnnotationType.php
rename to src/Wallabag/CoreBundle/Form/Type/EditAnnotationType.php
index 3b587478d..cd6816437 100644
--- a/src/Wallabag/AnnotationBundle/Form/EditAnnotationType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EditAnnotationType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\AnnotationBundle\Form;
+namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
diff --git a/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php b/src/Wallabag/CoreBundle/Form/Type/NewAnnotationType.php
similarity index 95%
rename from src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php
rename to src/Wallabag/CoreBundle/Form/Type/NewAnnotationType.php
index 4035fc6f7..b46538a9f 100644
--- a/src/Wallabag/AnnotationBundle/Form/NewAnnotationType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewAnnotationType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\AnnotationBundle\Form;
+namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
diff --git a/src/Wallabag/AnnotationBundle/Form/RangeType.php b/src/Wallabag/CoreBundle/Form/Type/RangeType.php
similarity index 89%
rename from src/Wallabag/AnnotationBundle/Form/RangeType.php
rename to src/Wallabag/CoreBundle/Form/Type/RangeType.php
index 0647375e0..993cbbab6 100644
--- a/src/Wallabag/AnnotationBundle/Form/RangeType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/RangeType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\AnnotationBundle\Form;
+namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;