Remove the CoreBundle namespace

src/Command/CleanDownloadedImagesCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -8,8 +8,8 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Finder\Finder;
-use Wallabag\CoreBundle\Helper\DownloadImages;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Helper\DownloadImages;
+use Wallabag\Repository\EntryRepository;
 
 class CleanDownloadedImagesCommand extends Command
 {

src/Command/CleanDuplicatesCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NoResultException;
@@ -9,10 +9,10 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\UserRepository;
 
 class CleanDuplicatesCommand extends Command
 {

src/Command/ExportCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\NoResultException;
 use Symfony\Component\Console\Command\Command;
@@ -8,9 +8,9 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Helper\EntriesExport;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Helper\EntriesExport;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\UserRepository;
 
 class ExportCommand extends Command
 {

src/Command/GenerateUrlHashesCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NoResultException;
@@ -8,10 +8,10 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\UrlHasher;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Entity\User;
+use Wallabag\Helper\UrlHasher;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\UserRepository;
 
 class GenerateUrlHashesCommand extends Command
 {

src/Command/Import/ImportCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command\Import;
+namespace Wallabag\Command\Import;
 
 use Doctrine\DBAL\Driver\Middleware;
 use Doctrine\DBAL\Logging\Middleware as LoggingMiddleware;
@@ -13,19 +13,19 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Import\ChromeImport;
-use Wallabag\CoreBundle\Import\DeliciousImport;
-use Wallabag\CoreBundle\Import\ElcuratorImport;
-use Wallabag\CoreBundle\Import\FirefoxImport;
-use Wallabag\CoreBundle\Import\InstapaperImport;
-use Wallabag\CoreBundle\Import\PinboardImport;
-use Wallabag\CoreBundle\Import\PocketHtmlImport;
-use Wallabag\CoreBundle\Import\ReadabilityImport;
-use Wallabag\CoreBundle\Import\ShaarliImport;
-use Wallabag\CoreBundle\Import\WallabagV1Import;
-use Wallabag\CoreBundle\Import\WallabagV2Import;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Entity\User;
+use Wallabag\Import\ChromeImport;
+use Wallabag\Import\DeliciousImport;
+use Wallabag\Import\ElcuratorImport;
+use Wallabag\Import\FirefoxImport;
+use Wallabag\Import\InstapaperImport;
+use Wallabag\Import\PinboardImport;
+use Wallabag\Import\PocketHtmlImport;
+use Wallabag\Import\ReadabilityImport;
+use Wallabag\Import\ShaarliImport;
+use Wallabag\Import\WallabagV1Import;
+use Wallabag\Import\WallabagV2Import;
+use Wallabag\Repository\UserRepository;
 
 class ImportCommand extends Command
 {

src/Command/Import/RedisWorkerCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command\Import;
+namespace Wallabag\Command\Import;
 
 use Simpleue\Worker\QueueWorker;
 use Symfony\Component\Config\Definition\Exception\Exception;

src/Command/InstallCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Exception\DriverException;
@@ -20,9 +20,9 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
-use Wallabag\CoreBundle\Entity\InternalSetting;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\IgnoreOriginInstanceRule;
+use Wallabag\Entity\InternalSetting;
+use Wallabag\Entity\User;
 
 class InstallCommand extends Command
 {
@@ -299,8 +299,8 @@ class InstallCommand extends Command
         $this->io->section('Step 4 of 4: Config setup.');
 
         // cleanup before insert new stuff
-        $this->entityManager->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\InternalSetting')->execute();
-        $this->entityManager->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule')->execute();
+        $this->entityManager->createQuery('DELETE FROM Wallabag\Entity\InternalSetting')->execute();
+        $this->entityManager->createQuery('DELETE FROM Wallabag\Entity\IgnoreOriginInstanceRule')->execute();
 
         foreach ($this->defaultSettings as $setting) {
             $newSetting = new InternalSetting();

src/Command/ListUserCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Repository\UserRepository;
 
 class ListUserCommand extends Command
 {

src/Command/ReloadEntryCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NoResultException;
@@ -11,10 +11,10 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Wallabag\CoreBundle\Event\EntrySavedEvent;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Event\EntrySavedEvent;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\UserRepository;
 
 class ReloadEntryCommand extends Command
 {

src/Command/ShowUserCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\NoResultException;
 use Symfony\Component\Console\Command\Command;
@@ -8,8 +8,8 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Entity\User;
+use Wallabag\Repository\UserRepository;
 
 class ShowUserCommand extends Command
 {

src/Command/TagAllCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NoResultException;
@@ -9,9 +9,9 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\RuleBasedTagger;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Entity\User;
+use Wallabag\Helper\RuleBasedTagger;
+use Wallabag\Repository\UserRepository;
 
 class TagAllCommand extends Command
 {

src/Command/UpdatePicturesPathCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Command\Command;
@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Repository\EntryRepository;
 
 class UpdatePicturesPathCommand extends Command
 {

src/Consumer/AMQPEntryConsumer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Consumer;
+namespace Wallabag\Consumer;
 
 use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface;
 use PhpAmqpLib\Message\AMQPMessage;

src/Consumer/AbstractConsumer.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Consumer;
+namespace Wallabag\Consumer;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Event\EntrySavedEvent;
-use Wallabag\CoreBundle\Import\AbstractImport;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
+use Wallabag\Event\EntrySavedEvent;
+use Wallabag\Import\AbstractImport;
+use Wallabag\Repository\UserRepository;
 
 abstract class AbstractConsumer
 {

src/Consumer/RabbitMQConsumerTotalProxy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Consumer;
+namespace Wallabag\Consumer;
 
 use OldSound\RabbitMqBundle\RabbitMq\Consumer;
 

src/Consumer/RedisEntryConsumer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Consumer;
+namespace Wallabag\Consumer;
 
 use Simpleue\Job\Job;
 

src/Controller/AbstractController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BaseAbstractController;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
 
 abstract class AbstractController extends BaseAbstractController
 {

src/Controller/AnnotationController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\RestBundle\Controller\AbstractFOSRestController;
@@ -10,12 +10,12 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Entity\Annotation;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Form\Type\EditAnnotationType;
-use Wallabag\CoreBundle\Form\Type\NewAnnotationType;
-use Wallabag\CoreBundle\Repository\AnnotationRepository;
+use Wallabag\Entity\Annotation;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
+use Wallabag\Form\Type\EditAnnotationType;
+use Wallabag\Form\Type\NewAnnotationType;
+use Wallabag\Repository\AnnotationRepository;
 
 class AnnotationController extends AbstractFOSRestController
 {

src/Controller/Api/AnnotationRestController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Nelmio\ApiDocBundle\Annotation\Operation;
 use OpenApi\Annotations as OA;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Entity\Annotation;
-use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\Entity\Annotation;
+use Wallabag\Entity\Entry;
 
 class AnnotationRestController extends WallabagRestController
 {
@@ -42,7 +42,7 @@ class AnnotationRestController extends WallabagRestController
     {
         $this->validateAuthentication();
 
-        return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::getAnnotationsAction', [
+        return $this->forward('Wallabag\Controller\AnnotationController::getAnnotationsAction', [
             'entry' => $entry,
         ]);
     }
@@ -108,7 +108,7 @@ class AnnotationRestController extends WallabagRestController
     {
         $this->validateAuthentication();
 
-        return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::postAnnotationAction', [
+        return $this->forward('Wallabag\Controller\AnnotationController::postAnnotationAction', [
             'request' => $request,
             'entry' => $entry,
         ]);
@@ -144,7 +144,7 @@ class AnnotationRestController extends WallabagRestController
     {
         $this->validateAuthentication();
 
-        return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::putAnnotationAction', [
+        return $this->forward('Wallabag\Controller\AnnotationController::putAnnotationAction', [
             'annotation' => $annotation,
             'request' => $request,
         ]);
@@ -180,7 +180,7 @@ class AnnotationRestController extends WallabagRestController
     {
         $this->validateAuthentication();
 
-        return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::deleteAnnotationAction', [
+        return $this->forward('Wallabag\Controller\AnnotationController::deleteAnnotationAction', [
             'annotation' => $annotation,
         ]);
     }

src/Controller/Api/ConfigRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\SerializerInterface;

src/Controller/Api/DeveloperController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -8,10 +8,10 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Entity\Api\Client;
-use Wallabag\CoreBundle\Form\Type\Api\ClientType;
-use Wallabag\CoreBundle\Repository\Api\ClientRepository;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Entity\Api\Client;
+use Wallabag\Form\Type\Api\ClientType;
+use Wallabag\Repository\Api\ClientRepository;
 
 class DeveloperController extends AbstractController
 {

src/Controller/Api/EntryRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Hateoas\Configuration\Route as HateoasRoute;
 use Hateoas\Representation\Factory\PagerfantaFactory;
@@ -15,16 +15,16 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Event\EntryDeletedEvent;
-use Wallabag\CoreBundle\Event\EntrySavedEvent;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\EntriesExport;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Helper\UrlHasher;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\TagRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
+use Wallabag\Event\EntryDeletedEvent;
+use Wallabag\Event\EntrySavedEvent;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\EntriesExport;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Helper\UrlHasher;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\TagRepository;
 
 class EntryRestController extends WallabagRestController
 {

src/Controller/Api/SearchRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Hateoas\Configuration\Route as HateoasRoute;
 use Hateoas\Representation\Factory\PagerfantaFactory;
@@ -11,7 +11,7 @@ use Pagerfanta\Pagerfanta;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Repository\EntryRepository;
 
 class SearchRestController extends WallabagRestController
 {

src/Controller/Api/TagRestController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Nelmio\ApiDocBundle\Annotation\Operation;
 use OpenApi\Annotations as OA;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\TagRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\TagRepository;
 
 class TagRestController extends WallabagRestController
 {

src/Controller/Api/TaggingRuleRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\SerializerBuilder;

src/Controller/Api/UserRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
@@ -15,9 +15,9 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Entity\Api\Client;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Form\Type\NewUserType;
+use Wallabag\Entity\Api\Client;
+use Wallabag\Entity\User;
+use Wallabag\Form\Type\NewUserType;
 
 class UserRestController extends WallabagRestController
 {

src/Controller/Api/WallabagRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
@@ -16,8 +16,8 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Entity\Api\ApplicationInfo;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\Api\ApplicationInfo;
+use Wallabag\Entity\User;
 
 class WallabagRestController extends AbstractFOSRestController
 {

src/Controller/ConfigController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\DBAL\Platforms\SqlitePlatform;
@@ -20,27 +20,27 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Validator\Constraints\Locale as LocaleConstraint;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Wallabag\CoreBundle\Entity\Config as ConfigEntity;
-use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
-use Wallabag\CoreBundle\Entity\RuleInterface;
-use Wallabag\CoreBundle\Entity\TaggingRule;
-use Wallabag\CoreBundle\Event\ConfigUpdatedEvent;
-use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
-use Wallabag\CoreBundle\Form\Type\ConfigType;
-use Wallabag\CoreBundle\Form\Type\FeedType;
-use Wallabag\CoreBundle\Form\Type\IgnoreOriginUserRuleType;
-use Wallabag\CoreBundle\Form\Type\TaggingRuleImportType;
-use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
-use Wallabag\CoreBundle\Form\Type\UserInformationType;
-use Wallabag\CoreBundle\Helper\Redirect;
-use Wallabag\CoreBundle\Repository\AnnotationRepository;
-use Wallabag\CoreBundle\Repository\ConfigRepository;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\IgnoreOriginUserRuleRepository;
-use Wallabag\CoreBundle\Repository\TaggingRuleRepository;
-use Wallabag\CoreBundle\Repository\TagRepository;
-use Wallabag\CoreBundle\Repository\UserRepository;
-use Wallabag\CoreBundle\Tools\Utils;
+use Wallabag\Entity\Config as ConfigEntity;
+use Wallabag\Entity\IgnoreOriginUserRule;
+use Wallabag\Entity\RuleInterface;
+use Wallabag\Entity\TaggingRule;
+use Wallabag\Event\ConfigUpdatedEvent;
+use Wallabag\Form\Type\ChangePasswordType;
+use Wallabag\Form\Type\ConfigType;
+use Wallabag\Form\Type\FeedType;
+use Wallabag\Form\Type\IgnoreOriginUserRuleType;
+use Wallabag\Form\Type\TaggingRuleImportType;
+use Wallabag\Form\Type\TaggingRuleType;
+use Wallabag\Form\Type\UserInformationType;
+use Wallabag\Helper\Redirect;
+use Wallabag\Repository\AnnotationRepository;
+use Wallabag\Repository\ConfigRepository;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\IgnoreOriginUserRuleRepository;
+use Wallabag\Repository\TaggingRuleRepository;
+use Wallabag\Repository\TagRepository;
+use Wallabag\Repository\UserRepository;
+use Wallabag\Tools\Utils;
 
 class ConfigController extends AbstractController
 {

src/Controller/EntryController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
@@ -15,19 +15,19 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Event\EntryDeletedEvent;
-use Wallabag\CoreBundle\Event\EntrySavedEvent;
-use Wallabag\CoreBundle\Form\Type\EditEntryType;
-use Wallabag\CoreBundle\Form\Type\EntryFilterType;
-use Wallabag\CoreBundle\Form\Type\NewEntryType;
-use Wallabag\CoreBundle\Form\Type\SearchEntryType;
-use Wallabag\CoreBundle\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\PreparePagerForEntries;
-use Wallabag\CoreBundle\Helper\Redirect;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\TagRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
+use Wallabag\Event\EntryDeletedEvent;
+use Wallabag\Event\EntrySavedEvent;
+use Wallabag\Form\Type\EditEntryType;
+use Wallabag\Form\Type\EntryFilterType;
+use Wallabag\Form\Type\NewEntryType;
+use Wallabag\Form\Type\SearchEntryType;
+use Wallabag\Helper\ContentProxy;
+use Wallabag\Helper\PreparePagerForEntries;
+use Wallabag\Helper\Redirect;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\TagRepository;
 
 class EntryController extends AbstractController
 {

src/Controller/ExportController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Helper\EntriesExport;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\TagRepository;
+use Wallabag\Helper\EntriesExport;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\TagRepository;
 
 /**
  * The try/catch can be removed once all formats will be implemented.

src/Controller/FeedController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Pagerfanta\Adapter\ArrayAdapter;
 use Pagerfanta\Doctrine\ORM\QueryAdapter as DoctrineORMAdapter;
@@ -12,10 +12,10 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\PreparePagerForEntries;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Entity\Tag;
+use Wallabag\Entity\User;
+use Wallabag\Helper\PreparePagerForEntries;
+use Wallabag\Repository\EntryRepository;
 
 class FeedController extends AbstractController
 {
@@ -31,7 +31,7 @@ class FeedController extends AbstractController
      *
      * @Route("/feed/{username}/{token}/unread/{page}", name="unread_feed", defaults={"page"=1, "_format"="xml"})
      *
-     * @ParamConverter("user", class="Wallabag\CoreBundle\Entity\User", converter="username_feed_token_converter")
+     * @ParamConverter("user", class="Wallabag\Entity\User", converter="username_feed_token_converter")
      *
      * @return Response
      */
@@ -45,7 +45,7 @@ class FeedController extends AbstractController
      *
      * @Route("/feed/{username}/{token}/archive/{page}", name="archive_feed", defaults={"page"=1, "_format"="xml"})
      *
-     * @ParamConverter("user", class="Wallabag\CoreBundle\Entity\User", converter="username_feed_token_converter")
+     * @ParamConverter("user", class="Wallabag\Entity\User", converter="username_feed_token_converter")
      *
      * @return Response
      */
@@ -59,7 +59,7 @@ class FeedController extends AbstractController
      *
      * @Route("/feed/{username}/{token}/starred/{page}", name="starred_feed", defaults={"page"=1, "_format"="xml"})
      *
-     * @ParamConverter("user", class="Wallabag\CoreBundle\Entity\User", converter="username_feed_token_converter")
+     * @ParamConverter("user", class="Wallabag\Entity\User", converter="username_feed_token_converter")
      *
      * @return Response
      */
@@ -73,7 +73,7 @@ class FeedController extends AbstractController
      *
      * @Route("/feed/{username}/{token}/all/{page}", name="all_feed", defaults={"page"=1, "_format"="xml"})
      *
-     * @ParamConverter("user", class="Wallabag\CoreBundle\Entity\User", converter="username_feed_token_converter")
+     * @ParamConverter("user", class="Wallabag\Entity\User", converter="username_feed_token_converter")
      *
      * @return Response
      */
@@ -87,7 +87,7 @@ class FeedController extends AbstractController
      *
      * @Route("/feed/{username}/{token}/tags/{slug}/{page}", name="tag_feed", defaults={"page"=1, "_format"="xml"})
      *
-     * @ParamConverter("user", class="Wallabag\CoreBundle\Entity\User", converter="username_feed_token_converter")
+     * @ParamConverter("user", class="Wallabag\Entity\User", converter="username_feed_token_converter")
      * @ParamConverter("tag", options={"mapping": {"slug": "slug"}})
      *
      * @return Response

src/Controller/IgnoreOriginInstanceRuleController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\Form;
@@ -10,9 +10,9 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
-use Wallabag\CoreBundle\Form\Type\IgnoreOriginInstanceRuleType;
-use Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository;
+use Wallabag\Entity\IgnoreOriginInstanceRule;
+use Wallabag\Form\Type\IgnoreOriginInstanceRuleType;
+use Wallabag\Repository\IgnoreOriginInstanceRuleRepository;
 
 /**
  * IgnoreOriginInstanceRuleController controller.

src/Controller/Import/BrowserController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\ImportInterface;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\ImportInterface;
 
 abstract class BrowserController extends AbstractController
 {

src/Controller/Import/ChromeController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\ChromeImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\ChromeImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class ChromeController extends BrowserController
 {

src/Controller/Import/DeliciousController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\DeliciousImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\DeliciousImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class DeliciousController extends AbstractController
 {

src/Controller/Import/ElcuratorController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\ElcuratorImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\ElcuratorImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class ElcuratorController extends WallabagController
 {

src/Controller/Import/FirefoxController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\FirefoxImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\FirefoxImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class FirefoxController extends BrowserController
 {

src/Controller/Import/HtmlController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\ImportInterface;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\ImportInterface;
 
 abstract class HtmlController extends AbstractController
 {

src/Controller/Import/ImportController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Predis\Client;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Wallabag\CoreBundle\Consumer\RabbitMQConsumerTotalProxy;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Import\ImportChain;
+use Wallabag\Consumer\RabbitMQConsumerTotalProxy;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Import\ImportChain;
 
 class ImportController extends AbstractController
 {

src/Controller/Import/InstapaperController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\InstapaperImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\InstapaperImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class InstapaperController extends AbstractController
 {

src/Controller/Import/PinboardController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\PinboardImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\PinboardImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class PinboardController extends AbstractController
 {

src/Controller/Import/PocketController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@@ -10,9 +10,9 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Import\PocketImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Import\PocketImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class PocketController extends AbstractController
 {

src/Controller/Import/PocketHtmlController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\PocketHtmlImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\PocketHtmlImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class PocketHtmlController extends HtmlController
 {

src/Controller/Import/ReadabilityController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\ReadabilityImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\ReadabilityImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class ReadabilityController extends AbstractController
 {

src/Controller/Import/ShaarliController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\ShaarliImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\ShaarliImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class ShaarliController extends HtmlController
 {

src/Controller/Import/WallabagController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\ImportInterface;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\ImportInterface;
 
 /**
  * Define Wallabag import for v1 and v2, since there are very similar.

src/Controller/Import/WallabagV1Controller.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\WallabagV1Import;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\WallabagV1Import;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class WallabagV1Controller extends WallabagController
 {

src/Controller/Import/WallabagV2Controller.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\WallabagV2Import;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\WallabagV2Import;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class WallabagV2Controller extends WallabagController
 {

src/Controller/SiteCredentialController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
@@ -11,11 +11,11 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Entity\SiteCredential;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Form\Type\SiteCredentialType;
-use Wallabag\CoreBundle\Helper\CryptoProxy;
-use Wallabag\CoreBundle\Repository\SiteCredentialRepository;
+use Wallabag\Entity\SiteCredential;
+use Wallabag\Entity\User;
+use Wallabag\Form\Type\SiteCredentialType;
+use Wallabag\Helper\CryptoProxy;
+use Wallabag\Repository\SiteCredentialRepository;
 
 /**
  * SiteCredential controller.

src/Controller/StaticController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Symfony\Component\Routing\Annotation\Route;
 

src/Controller/TagController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
@@ -11,15 +11,15 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Form\Type\NewTagType;
-use Wallabag\CoreBundle\Form\Type\RenameTagType;
-use Wallabag\CoreBundle\Helper\PreparePagerForEntries;
-use Wallabag\CoreBundle\Helper\Redirect;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\TagRepository;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
+use Wallabag\Form\Type\NewTagType;
+use Wallabag\Form\Type\RenameTagType;
+use Wallabag\Helper\PreparePagerForEntries;
+use Wallabag\Helper\Redirect;
+use Wallabag\Helper\TagsAssigner;
+use Wallabag\Repository\EntryRepository;
+use Wallabag\Repository\TagRepository;
 
 class TagController extends AbstractController
 {

src/Controller/UserController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Event\UserEvent;
@@ -17,11 +17,11 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Form\Type\NewUserType;
-use Wallabag\CoreBundle\Form\Type\SearchUserType;
-use Wallabag\CoreBundle\Form\Type\UserType;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Entity\User;
+use Wallabag\Form\Type\NewUserType;
+use Wallabag\Form\Type\SearchUserType;
+use Wallabag\Form\Type\UserType;
+use Wallabag\Repository\UserRepository;
 
 /**
  * User controller.

src/DataFixtures/AnnotationFixtures.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\Annotation;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\Annotation;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
 
 class AnnotationFixtures extends Fixture implements DependentFixtureInterface
 {

src/DataFixtures/ConfigFixtures.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\Config;
+use Wallabag\Entity\User;
 
 class ConfigFixtures extends Fixture implements DependentFixtureInterface
 {

src/DataFixtures/EntryFixtures.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
+use Wallabag\Entity\User;
 
 class EntryFixtures extends Fixture implements DependentFixtureInterface
 {

src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
+use Wallabag\Entity\IgnoreOriginInstanceRule;
 
 class IgnoreOriginInstanceRuleFixtures extends Fixture implements ContainerAwareInterface
 {

src/DataFixtures/IgnoreOriginUserRuleFixtures.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\IgnoreOriginUserRule;
+use Wallabag\Entity\User;
 
 class IgnoreOriginUserRuleFixtures extends Fixture implements DependentFixtureInterface
 {

src/DataFixtures/InternalSettingFixtures.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Wallabag\CoreBundle\Entity\InternalSetting;
+use Wallabag\Entity\InternalSetting;
 
 class InternalSettingFixtures extends Fixture implements ContainerAwareInterface
 {

src/DataFixtures/SiteCredentialFixtures.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Wallabag\CoreBundle\Entity\SiteCredential;
-use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\Helper\CryptoProxy;
+use Wallabag\Entity\SiteCredential;
+use Wallabag\Entity\User;
+use Wallabag\Helper\CryptoProxy;
 
 class SiteCredentialFixtures extends Fixture implements DependentFixtureInterface, ContainerAwareInterface
 {

src/DataFixtures/TagFixtures.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\Tag;
+use Wallabag\Entity\Tag;
 
 class TagFixtures extends Fixture
 {

src/DataFixtures/TaggingRuleFixtures.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\TaggingRule;
+use Wallabag\Entity\Config;
+use Wallabag\Entity\TaggingRule;
 
 class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
 {

src/DataFixtures/UserFixtures.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
 
 class UserFixtures extends Fixture
 {

src/Doctrine/JsonArrayType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Doctrine;
+namespace Wallabag\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\JsonType;

src/Doctrine/WallabagMigration.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Doctrine;
+namespace Wallabag\Doctrine;
 
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\Schema;

src/Entity/Annotation.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation\Exclude;
@@ -9,13 +9,13 @@ use JMS\Serializer\Annotation\Groups;
 use JMS\Serializer\Annotation\SerializedName;
 use JMS\Serializer\Annotation\VirtualProperty;
 use Symfony\Component\Validator\Constraints as Assert;
-use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
+use Wallabag\Helper\EntityTimestampsTrait;
 
 /**
  * Annotation.
  *
  * @ORM\Table(name="annotation")
- * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\AnnotationRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\Repository\AnnotationRepository")
  * @ORM\HasLifecycleCallbacks()
  * @ExclusionPolicy("none")
  */
@@ -80,14 +80,14 @@ class Annotation
     /**
      * @Exclude
      *
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\User")
      */
     private $user;
 
     /**
      * @Exclude
      *
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Entry", inversedBy="annotations")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\Entry", inversedBy="annotations")
      * @ORM\JoinColumn(name="entry_id", referencedColumnName="id", onDelete="cascade")
      */
     private $entry;

src/Entity/Api/AccessToken.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity\Api;
+namespace Wallabag\Entity\Api;
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken;
@@ -35,13 +35,13 @@ class AccessToken extends BaseAccessToken
     protected $id;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Api\Client", inversedBy="accessTokens")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\Api\Client", inversedBy="accessTokens")
      * @ORM\JoinColumn(nullable=false)
      */
     protected $client;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\User")
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")
      */
     protected $user;

src/Entity/Api/ApplicationInfo.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity\Api;
+namespace Wallabag\Entity\Api;
 
 use OpenApi\Annotations as OA;
 

src/Entity/Api/AuthCode.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity\Api;
+namespace Wallabag\Entity\Api;
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\OAuthServerBundle\Entity\AuthCode as BaseAuthCode;
@@ -35,13 +35,13 @@ class AuthCode extends BaseAuthCode
     protected $id;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Api\Client")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\Api\Client")
      * @ORM\JoinColumn(nullable=false)
      */
     protected $client;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\User")
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")
      */
     protected $user;

src/Entity/Api/Client.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity\Api;
+namespace Wallabag\Entity\Api;
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\OAuthServerBundle\Entity\Client as BaseClient;
@@ -8,11 +8,11 @@ use JMS\Serializer\Annotation\Groups;
 use JMS\Serializer\Annotation\SerializedName;
 use JMS\Serializer\Annotation\VirtualProperty;
 use OpenApi\Annotations as OA;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
 
 /**
  * @ORM\Table("oauth2_clients")
- * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\Api\ClientRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\Repository\Api\ClientRepository")
  */
 class Client extends BaseClient
 {
@@ -39,12 +39,12 @@ class Client extends BaseClient
     protected $name;
 
     /**
-     * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Api\RefreshToken", mappedBy="client", cascade={"remove"})
+     * @ORM\OneToMany(targetEntity="Wallabag\Entity\Api\RefreshToken", mappedBy="client", cascade={"remove"})
      */
     protected $refreshTokens;
 
     /**
-     * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Api\AccessToken", mappedBy="client", cascade={"remove"})
+     * @ORM\OneToMany(targetEntity="Wallabag\Entity\Api\AccessToken", mappedBy="client", cascade={"remove"})
      */
     protected $accessTokens;
 
@@ -63,7 +63,7 @@ class Client extends BaseClient
     protected $secret;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="clients")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\User", inversedBy="clients")
      */
     private $user;
 

src/Entity/Api/RefreshToken.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity\Api;
+namespace Wallabag\Entity\Api;
 
 use Doctrine\ORM\Mapping as ORM;
 use FOS\OAuthServerBundle\Entity\RefreshToken as BaseRefreshToken;
@@ -35,13 +35,13 @@ class RefreshToken extends BaseRefreshToken
     protected $id;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Api\Client", inversedBy="refreshTokens")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\Api\Client", inversedBy="refreshTokens")
      * @ORM\JoinColumn(nullable=false)
      */
     protected $client;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\User")
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id", onDelete="CASCADE")
      */
     protected $user;

src/Entity/Config.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
@@ -10,7 +10,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 /**
  * Config.
  *
- * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\ConfigRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\Repository\ConfigRepository")
  * @ORM\Table(
  *     name="`config`",
  *     indexes={
@@ -169,14 +169,14 @@ class Config
     private $customCSS;
 
     /**
-     * @ORM\OneToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="config")
+     * @ORM\OneToOne(targetEntity="Wallabag\Entity\User", inversedBy="config")
      */
     private $user;
 
     /**
      * @var ArrayCollection<TaggingRule>
      *
-     * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\TaggingRule", mappedBy="config", cascade={"remove"})
+     * @ORM\OneToMany(targetEntity="Wallabag\Entity\TaggingRule", mappedBy="config", cascade={"remove"})
      * @ORM\OrderBy({"id" = "ASC"})
      */
     private $taggingRules;
@@ -184,7 +184,7 @@ class Config
     /**
      * @var ArrayCollection<IgnoreOriginUserRule>
      *
-     * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\IgnoreOriginUserRule", mappedBy="config", cascade={"remove"})
+     * @ORM\OneToMany(targetEntity="Wallabag\Entity\IgnoreOriginUserRule", mappedBy="config", cascade={"remove"})
      * @ORM\OrderBy({"id" = "ASC"})
      */
     private $ignoreOriginRules;

src/Entity/Entry.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
@@ -11,14 +11,14 @@ use JMS\Serializer\Annotation\SerializedName;
 use JMS\Serializer\Annotation\VirtualProperty;
 use JMS\Serializer\Annotation\XmlRoot;
 use Symfony\Component\Validator\Constraints as Assert;
-use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
-use Wallabag\CoreBundle\Helper\UrlHasher;
+use Wallabag\Helper\EntityTimestampsTrait;
+use Wallabag\Helper\UrlHasher;
 
 /**
  * Entry.
  *
  * @XmlRoot("entry")
- * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\Repository\EntryRepository")
  * @ORM\Table(
  *     name="`entry`",
  *     options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"},
@@ -204,7 +204,7 @@ class Entry
     private $starredAt;
 
     /**
-     * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Annotation", mappedBy="entry", cascade={"persist", "remove"})
+     * @ORM\OneToMany(targetEntity="Wallabag\Entity\Annotation", mappedBy="entry", cascade={"persist", "remove"})
      * @ORM\JoinTable
      *
      * @Groups({"entries_for_user", "export_all"})
@@ -288,14 +288,14 @@ class Entry
     /**
      * @Exclude
      *
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="entries")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\User", inversedBy="entries")
      *
      * @Groups({"export_all"})
      */
     private $user;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Wallabag\CoreBundle\Entity\Tag", inversedBy="entries", cascade={"persist"})
+     * @ORM\ManyToMany(targetEntity="Wallabag\Entity\Tag", inversedBy="entries", cascade={"persist"})
      * @ORM\JoinTable(
      *  name="entry_tag",
      *  joinColumns={

src/Entity/IgnoreOriginInstanceRule.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Bridge\RulerZ\Validator\Constraints as RulerZAssert;
@@ -9,7 +9,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 /**
  * Ignore Origin rule.
  *
- * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\Repository\IgnoreOriginInstanceRuleRepository")
  * @ORM\Table(name="`ignore_origin_instance_rule`")
  */
 class IgnoreOriginInstanceRule implements IgnoreOriginRuleInterface, RuleInterface

src/Entity/IgnoreOriginRuleInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 interface IgnoreOriginRuleInterface
 {

src/Entity/IgnoreOriginUserRule.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Bridge\RulerZ\Validator\Constraints as RulerZAssert;
@@ -9,7 +9,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 /**
  * Ignore Origin rule.
  *
- * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\IgnoreOriginUserRuleRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\Repository\IgnoreOriginUserRuleRepository")
  * @ORM\Table(name="`ignore_origin_user_rule`")
  */
 class IgnoreOriginUserRule implements IgnoreOriginRuleInterface, RuleInterface
@@ -37,7 +37,7 @@ class IgnoreOriginUserRule implements IgnoreOriginRuleInterface, RuleInterface
     private $rule;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Config", inversedBy="ignoreOriginRules")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\Config", inversedBy="ignoreOriginRules")
      */
     private $config;
 

src/Entity/InternalSetting.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 use Craue\ConfigBundle\Entity\BaseSetting;
 use Doctrine\ORM\Mapping as ORM;

src/Entity/RuleInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 interface RuleInterface
 {

src/Entity/SiteCredential.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
-use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
+use Wallabag\Helper\EntityTimestampsTrait;
 
 /**
  * SiteCredential.
  *
- * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\SiteCredentialRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\Repository\SiteCredentialRepository")
  * @ORM\Table(name="`site_credential`")
  * @ORM\HasLifecycleCallbacks()
  */
@@ -66,7 +66,7 @@ class SiteCredential
     private $updatedAt;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\User", inversedBy="siteCredentials")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\User", inversedBy="siteCredentials")
      */
     private $user;
 

src/Entity/Tag.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
@@ -20,7 +20,7 @@ use JMS\Serializer\Annotation\XmlRoot;
  *         @ORM\Index(name="tag_label", columns={"label"}, options={"lengths"={255}}),
  *     }
  * )
- * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\TagRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\Repository\TagRepository")
  * @ExclusionPolicy("all")
  */
 class Tag

src/Entity/TaggingRule.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation\Exclude;
@@ -13,7 +13,7 @@ use Symfony\Component\Validator\Constraints as Assert;
  * Tagging rule.
  *
  * @XmlRoot("tagging_rule")
- * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\TaggingRuleRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\Repository\TaggingRuleRepository")
  * @ORM\Table(name="`tagging_rule`")
  * @ORM\Entity
  */
@@ -56,7 +56,7 @@ class TaggingRule implements RuleInterface
     /**
      * @Exclude
      *
-     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Config", inversedBy="taggingRules")
+     * @ORM\ManyToOne(targetEntity="Wallabag\Entity\Config", inversedBy="taggingRules")
      */
     private $config;
 

src/Entity/User.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Entity;
+namespace Wallabag\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
@@ -14,14 +14,14 @@ use Scheb\TwoFactorBundle\Model\BackupCodeInterface;
 use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface as EmailTwoFactorInterface;
 use Scheb\TwoFactorBundle\Model\Google\TwoFactorInterface as GoogleTwoFactorInterface;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Wallabag\CoreBundle\Entity\Api\Client;
-use Wallabag\CoreBundle\Helper\EntityTimestampsTrait;
+use Wallabag\Entity\Api\Client;
+use Wallabag\Helper\EntityTimestampsTrait;
 
 /**
  * User.
  *
  * @XmlRoot("user")
- * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\UserRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\Repository\UserRepository")
  * @ORM\Table(name="`user`")
  * @ORM\HasLifecycleCallbacks()
  *
@@ -122,26 +122,26 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
     protected $updatedAt;
 
     /**
-     * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Entry", mappedBy="user", cascade={"remove"})
+     * @ORM\OneToMany(targetEntity="Wallabag\Entity\Entry", mappedBy="user", cascade={"remove"})
      */
     protected $entries;
 
     /**
-     * @ORM\OneToOne(targetEntity="Wallabag\CoreBundle\Entity\Config", mappedBy="user", cascade={"remove"})
+     * @ORM\OneToOne(targetEntity="Wallabag\Entity\Config", mappedBy="user", cascade={"remove"})
      */
     protected $config;
 
     /**
-     * @var ArrayCollection&iterable<\Wallabag\CoreBundle\Entity\SiteCredential>
+     * @var ArrayCollection&iterable<\Wallabag\Entity\SiteCredential>
      *
-     * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\SiteCredential", mappedBy="user", cascade={"remove"})
+     * @ORM\OneToMany(targetEntity="Wallabag\Entity\SiteCredential", mappedBy="user", cascade={"remove"})
      */
     protected $siteCredentials;
 
     /**
-     * @var ArrayCollection&iterable<\Wallabag\CoreBundle\Entity\Api\Client>
+     * @var ArrayCollection&iterable<\Wallabag\Entity\Api\Client>
      *
-     * @ORM\OneToMany(targetEntity="Wallabag\CoreBundle\Entity\Api\Client", mappedBy="user", cascade={"remove"})
+     * @ORM\OneToMany(targetEntity="Wallabag\Entity\Api\Client", mappedBy="user", cascade={"remove"})
      */
     protected $clients;
 

src/Event/ConfigUpdatedEvent.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event;
+namespace Wallabag\Event;
 
 use Symfony\Contracts\EventDispatcher\Event;
-use Wallabag\CoreBundle\Entity\Config;
+use Wallabag\Entity\Config;
 
 /**
  * This event is fired as soon as user configuration is updated.

src/Event/EntryDeletedEvent.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event;
+namespace Wallabag\Event;
 
 use Symfony\Contracts\EventDispatcher\Event;
-use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\Entity\Entry;
 
 /**
  * This event is fired as soon as an entry is deleted.

src/Event/EntrySavedEvent.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event;
+namespace Wallabag\Event;
 
 use Symfony\Contracts\EventDispatcher\Event;
-use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\Entity\Entry;
 
 /**
  * This event is fired as soon as an entry was saved.

src/Event/Listener/AuthenticationFailureListener.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event\Listener;
+namespace Wallabag\Event\Listener;
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

src/Event/Listener/CreateConfigListener.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event\Listener;
+namespace Wallabag\Event\Listener;
 
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Event\UserEvent;
 use FOS\UserBundle\FOSUserEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Wallabag\CoreBundle\Entity\Config;
+use Wallabag\Entity\Config;
 
 /**
  * This listener will create the associated configuration when a user register.

src/Event/Listener/LocaleListener.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event\Listener;
+namespace Wallabag\Event\Listener;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;

src/Event/Listener/PasswordResettingListener.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event\Listener;
+namespace Wallabag\Event\Listener;
 
 use FOS\UserBundle\Event\FormEvent;
 use FOS\UserBundle\FOSUserEvents;

src/Event/Listener/RegistrationListener.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event\Listener;
+namespace Wallabag\Event\Listener;
 
 use FOS\UserBundle\Event\GetResponseUserEvent;
 use FOS\UserBundle\FOSUserEvents;

src/Event/Listener/UserLocaleListener.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event\Listener;
+namespace Wallabag\Event\Listener;
 
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
 
 /**
  * Stores the locale of the user in the session after the login.

src/Event/Subscriber/CustomDoctrineORMSubscriber.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event\Subscriber;
+namespace Wallabag\Event\Subscriber;
 
 use Spiriit\Bundle\FormFilterBundle\Event\GetFilterConditionEvent;
 use Spiriit\Bundle\FormFilterBundle\Event\Subscriber\DoctrineORMSubscriber;

src/Event/Subscriber/DownloadImagesSubscriber.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event\Subscriber;
+namespace Wallabag\Event\Subscriber;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Event\EntryDeletedEvent;
-use Wallabag\CoreBundle\Event\EntrySavedEvent;
-use Wallabag\CoreBundle\Helper\DownloadImages;
+use Wallabag\Entity\Entry;
+use Wallabag\Event\EntryDeletedEvent;
+use Wallabag\Event\EntrySavedEvent;
+use Wallabag\Helper\DownloadImages;
 
 class DownloadImagesSubscriber implements EventSubscriberInterface
 {

src/Event/Subscriber/GenerateCustomCSSSubscriber.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event\Subscriber;
+namespace Wallabag\Event\Subscriber;
 
 use Doctrine\ORM\EntityManagerInterface;
 use ScssPhp\ScssPhp\Compiler;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Wallabag\CoreBundle\Event\ConfigUpdatedEvent;
+use Wallabag\Event\ConfigUpdatedEvent;
 
 class GenerateCustomCSSSubscriber implements EventSubscriberInterface
 {

src/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event\Subscriber;
+namespace Wallabag\Event\Subscriber;
 
 use Doctrine\Common\EventSubscriber;
 use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\Persistence\ManagerRegistry;
-use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\Entity\Entry;
 
 /**
  * SQLite doesn't care about cascading remove, so we need to manually remove associated stuf for an Entry.

src/Event/Subscriber/TablePrefixSubscriber.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Event\Subscriber;
+namespace Wallabag\Event\Subscriber;
 
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;

src/ExpressionLanguage/AuthenticatorProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\ExpressionLanguage;
+namespace Wallabag\ExpressionLanguage;
 
 use GuzzleHttp\ClientInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionFunction;

src/Form/DataTransformer/StringToListTransformer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Form\DataTransformer;
+namespace Wallabag\Form\DataTransformer;
 
 use Symfony\Component\Form\DataTransformerInterface;
 

src/Form/Type/Api/ClientType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Form\Type\Api;
+namespace Wallabag\Form\Type\Api;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\CallbackTransformer;
@@ -9,7 +9,7 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\UrlType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Wallabag\CoreBundle\Entity\Api\Client;
+use Wallabag\Entity\Api\Client;
 
 class ClientType extends AbstractType
 {

src/Form/Type/ChangePasswordType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Form\Type;
+namespace Wallabag\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;

src/Form/Type/ConfigType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Form\Type;
+namespace Wallabag\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -10,7 +10,7 @@ use Symfony\Component\Form\Extension\Core\Type\RangeType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Wallabag\CoreBundle\Entity\Config;
+use Wallabag\Entity\Config;
 
 class ConfigType extends AbstractType
 {