diff --git a/.gitignore b/.gitignore index b5b395ca2..0f2969783 100644 --- a/.gitignore +++ b/.gitignore @@ -49,8 +49,6 @@ data/db/wallabag*.sqlite node_modules/ bin app/Resources/build/ -!/src/Wallabag/CoreBundle/Resources/public -/src/Wallabag/CoreBundle/Resources/public/* package-lock.json # Test-generated files diff --git a/app/config/services.yml b/app/config/services.yml index 7a47cb073..b063a1a1f 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -33,13 +33,13 @@ services: $fonts: '%wallabag_core.fonts%' Wallabag\CoreBundle\: - resource: '../../src/Wallabag/CoreBundle/*' - exclude: ['../../src/Wallabag/CoreBundle/{Consumer,Controller,Entity,ExpressionLanguage,DataFixtures,Redis}', '../../src/Wallabag/CoreBundle/Event/*Event.php'] + resource: '../../src/*' + exclude: ['../../src/{Consumer,Controller,Entity,ExpressionLanguage,DataFixtures,Redis}', '../../src/Event/*Event.php'] # 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\CoreBundle\Controller\: - resource: '../../src/Wallabag/CoreBundle/Controller/' + resource: '../../src/Controller/' tags: ['controller.service_arguments'] # inject alias service into controllers diff --git a/app/config/services_test.yml b/app/config/services_test.yml index 749207ce8..d34ae4642 100644 --- a/app/config/services_test.yml +++ b/app/config/services_test.yml @@ -23,6 +23,6 @@ services: # fixtures Wallabag\CoreBundle\DataFixtures\: - resource: '../../src/Wallabag/CoreBundle/DataFixtures/*' + resource: '../../src/DataFixtures/*' tags: ['doctrine.fixture.orm'] autowire: true diff --git a/composer.json b/composer.json index 795b19b1c..dab745dc2 100644 --- a/composer.json +++ b/composer.json @@ -191,7 +191,7 @@ "prefer-stable": true, "autoload": { "psr-4": { - "Wallabag\\": "src/Wallabag/" + "Wallabag\\CoreBundle\\": "src/" }, "classmap": [ "app/AppKernel.php", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 9ebbc1c5f..57b935b4e 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -3,72 +3,72 @@ parameters: - message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:postAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/AnnotationController.php + path: src/Controller/AnnotationController.php - message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:putAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/AnnotationController.php + path: src/Controller/AnnotationController.php - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Entity\\\\RuleInterface\\:\\:getConfig\\(\\)\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/ConfigController.php + path: src/Controller/ConfigController.php - message: "#^Method FOS\\\\UserBundle\\\\Model\\\\UserManagerInterface\\:\\:updateUser\\(\\) invoked with 2 parameters, 1 required\\.$#" count: 6 - path: src/Wallabag/CoreBundle/Controller/ConfigController.php + path: src/Controller/ConfigController.php - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/Import/BrowserController.php + path: src/Controller/Import/BrowserController.php - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/Import/BrowserController.php + path: src/Controller/Import/BrowserController.php - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/Import/HtmlController.php + path: src/Controller/Import/HtmlController.php - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/Import/HtmlController.php + path: src/Controller/Import/HtmlController.php - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/Import/WallabagController.php + path: src/Controller/Import/WallabagController.php - message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Controller/Import/WallabagController.php + path: src/Controller/Import/WallabagController.php - message: "#^Call to an undefined method Spiriit\\\\Bundle\\\\FormFilterBundle\\\\Filter\\\\Query\\\\QueryInterface\\:\\:getExpressionBuilder\\(\\)\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php + path: src/Event/Subscriber/CustomDoctrineORMSubscriber.php - message: "#^Call to an undefined method Spiriit\\\\Bundle\\\\FormFilterBundle\\\\Filter\\\\Query\\\\QueryInterface\\:\\:getExpr\\(\\)\\.$#" count: 10 - path: src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php + path: src/Form/Type/EntryFilterType.php - message: "#^Call to an undefined method Scheb\\\\TwoFactorBundle\\\\Model\\\\Email\\\\TwoFactorInterface\\:\\:getName\\(\\)\\.$#" count: 2 - path: src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php + path: src/Mailer/AuthCodeMailer.php - message: "#^PHPDoc type Symfony\\\\Component\\\\Mailer\\\\MailerInterface of property Wallabag\\\\CoreBundle\\\\Mailer\\\\UserMailer\\:\\:\\$mailer is not covariant with PHPDoc type Swift_Mailer of overridden property FOS\\\\UserBundle\\\\Mailer\\\\TwigSwiftMailer\\:\\:\\$mailer\\.$#" count: 1 - path: src/Wallabag/CoreBundle/Mailer/UserMailer.php + path: src/Mailer/UserMailer.php - message: "#^Call to an undefined method DOMNode\\:\\:getAttribute\\(\\)\\.$#" diff --git a/src/Wallabag/CoreBundle/Command/CleanDownloadedImagesCommand.php b/src/Command/CleanDownloadedImagesCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/CleanDownloadedImagesCommand.php rename to src/Command/CleanDownloadedImagesCommand.php diff --git a/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php b/src/Command/CleanDuplicatesCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php rename to src/Command/CleanDuplicatesCommand.php diff --git a/src/Wallabag/CoreBundle/Command/ExportCommand.php b/src/Command/ExportCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/ExportCommand.php rename to src/Command/ExportCommand.php diff --git a/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php b/src/Command/GenerateUrlHashesCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php rename to src/Command/GenerateUrlHashesCommand.php diff --git a/src/Wallabag/CoreBundle/Command/Import/ImportCommand.php b/src/Command/Import/ImportCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/Import/ImportCommand.php rename to src/Command/Import/ImportCommand.php diff --git a/src/Wallabag/CoreBundle/Command/Import/RedisWorkerCommand.php b/src/Command/Import/RedisWorkerCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/Import/RedisWorkerCommand.php rename to src/Command/Import/RedisWorkerCommand.php diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Command/InstallCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/InstallCommand.php rename to src/Command/InstallCommand.php diff --git a/src/Wallabag/CoreBundle/Command/ListUserCommand.php b/src/Command/ListUserCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/ListUserCommand.php rename to src/Command/ListUserCommand.php diff --git a/src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php b/src/Command/ReloadEntryCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php rename to src/Command/ReloadEntryCommand.php diff --git a/src/Wallabag/CoreBundle/Command/ShowUserCommand.php b/src/Command/ShowUserCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/ShowUserCommand.php rename to src/Command/ShowUserCommand.php diff --git a/src/Wallabag/CoreBundle/Command/TagAllCommand.php b/src/Command/TagAllCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/TagAllCommand.php rename to src/Command/TagAllCommand.php diff --git a/src/Wallabag/CoreBundle/Command/UpdatePicturesPathCommand.php b/src/Command/UpdatePicturesPathCommand.php similarity index 100% rename from src/Wallabag/CoreBundle/Command/UpdatePicturesPathCommand.php rename to src/Command/UpdatePicturesPathCommand.php diff --git a/src/Wallabag/CoreBundle/Consumer/AMQPEntryConsumer.php b/src/Consumer/AMQPEntryConsumer.php similarity index 100% rename from src/Wallabag/CoreBundle/Consumer/AMQPEntryConsumer.php rename to src/Consumer/AMQPEntryConsumer.php diff --git a/src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php b/src/Consumer/AbstractConsumer.php similarity index 100% rename from src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php rename to src/Consumer/AbstractConsumer.php diff --git a/src/Wallabag/CoreBundle/Consumer/RabbitMQConsumerTotalProxy.php b/src/Consumer/RabbitMQConsumerTotalProxy.php similarity index 100% rename from src/Wallabag/CoreBundle/Consumer/RabbitMQConsumerTotalProxy.php rename to src/Consumer/RabbitMQConsumerTotalProxy.php diff --git a/src/Wallabag/CoreBundle/Consumer/RedisEntryConsumer.php b/src/Consumer/RedisEntryConsumer.php similarity index 100% rename from src/Wallabag/CoreBundle/Consumer/RedisEntryConsumer.php rename to src/Consumer/RedisEntryConsumer.php diff --git a/src/Wallabag/CoreBundle/Controller/AbstractController.php b/src/Controller/AbstractController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/AbstractController.php rename to src/Controller/AbstractController.php diff --git a/src/Wallabag/CoreBundle/Controller/AnnotationController.php b/src/Controller/AnnotationController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/AnnotationController.php rename to src/Controller/AnnotationController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/AnnotationRestController.php b/src/Controller/Api/AnnotationRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/AnnotationRestController.php rename to src/Controller/Api/AnnotationRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/ConfigRestController.php b/src/Controller/Api/ConfigRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/ConfigRestController.php rename to src/Controller/Api/ConfigRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php b/src/Controller/Api/DeveloperController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/DeveloperController.php rename to src/Controller/Api/DeveloperController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/EntryRestController.php b/src/Controller/Api/EntryRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/EntryRestController.php rename to src/Controller/Api/EntryRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/SearchRestController.php b/src/Controller/Api/SearchRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/SearchRestController.php rename to src/Controller/Api/SearchRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/TagRestController.php b/src/Controller/Api/TagRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/TagRestController.php rename to src/Controller/Api/TagRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestController.php b/src/Controller/Api/TaggingRuleRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/TaggingRuleRestController.php rename to src/Controller/Api/TaggingRuleRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/UserRestController.php b/src/Controller/Api/UserRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/UserRestController.php rename to src/Controller/Api/UserRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/Api/WallabagRestController.php b/src/Controller/Api/WallabagRestController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Api/WallabagRestController.php rename to src/Controller/Api/WallabagRestController.php diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Controller/ConfigController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/ConfigController.php rename to src/Controller/ConfigController.php diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Controller/EntryController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/EntryController.php rename to src/Controller/EntryController.php diff --git a/src/Wallabag/CoreBundle/Controller/ExportController.php b/src/Controller/ExportController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/ExportController.php rename to src/Controller/ExportController.php diff --git a/src/Wallabag/CoreBundle/Controller/FeedController.php b/src/Controller/FeedController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/FeedController.php rename to src/Controller/FeedController.php diff --git a/src/Wallabag/CoreBundle/Controller/IgnoreOriginInstanceRuleController.php b/src/Controller/IgnoreOriginInstanceRuleController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/IgnoreOriginInstanceRuleController.php rename to src/Controller/IgnoreOriginInstanceRuleController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/BrowserController.php b/src/Controller/Import/BrowserController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/BrowserController.php rename to src/Controller/Import/BrowserController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/ChromeController.php b/src/Controller/Import/ChromeController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/ChromeController.php rename to src/Controller/Import/ChromeController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php b/src/Controller/Import/DeliciousController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php rename to src/Controller/Import/DeliciousController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php b/src/Controller/Import/ElcuratorController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php rename to src/Controller/Import/ElcuratorController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php b/src/Controller/Import/FirefoxController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php rename to src/Controller/Import/FirefoxController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/HtmlController.php b/src/Controller/Import/HtmlController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/HtmlController.php rename to src/Controller/Import/HtmlController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/ImportController.php b/src/Controller/Import/ImportController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/ImportController.php rename to src/Controller/Import/ImportController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php b/src/Controller/Import/InstapaperController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php rename to src/Controller/Import/InstapaperController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php b/src/Controller/Import/PinboardController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/PinboardController.php rename to src/Controller/Import/PinboardController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/PocketController.php b/src/Controller/Import/PocketController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/PocketController.php rename to src/Controller/Import/PocketController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php b/src/Controller/Import/PocketHtmlController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php rename to src/Controller/Import/PocketHtmlController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php b/src/Controller/Import/ReadabilityController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php rename to src/Controller/Import/ReadabilityController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php b/src/Controller/Import/ShaarliController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php rename to src/Controller/Import/ShaarliController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/WallabagController.php b/src/Controller/Import/WallabagController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/WallabagController.php rename to src/Controller/Import/WallabagController.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php b/src/Controller/Import/WallabagV1Controller.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php rename to src/Controller/Import/WallabagV1Controller.php diff --git a/src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php b/src/Controller/Import/WallabagV2Controller.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php rename to src/Controller/Import/WallabagV2Controller.php diff --git a/src/Wallabag/CoreBundle/Controller/SiteCredentialController.php b/src/Controller/SiteCredentialController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/SiteCredentialController.php rename to src/Controller/SiteCredentialController.php diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Controller/StaticController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/StaticController.php rename to src/Controller/StaticController.php diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Controller/TagController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/TagController.php rename to src/Controller/TagController.php diff --git a/src/Wallabag/CoreBundle/Controller/UserController.php b/src/Controller/UserController.php similarity index 100% rename from src/Wallabag/CoreBundle/Controller/UserController.php rename to src/Controller/UserController.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/AnnotationFixtures.php b/src/DataFixtures/AnnotationFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/AnnotationFixtures.php rename to src/DataFixtures/AnnotationFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php b/src/DataFixtures/ConfigFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php rename to src/DataFixtures/ConfigFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php b/src/DataFixtures/EntryFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php rename to src/DataFixtures/EntryFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginInstanceRuleFixtures.php b/src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginInstanceRuleFixtures.php rename to src/DataFixtures/IgnoreOriginInstanceRuleFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php b/src/DataFixtures/IgnoreOriginUserRuleFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php rename to src/DataFixtures/IgnoreOriginUserRuleFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php b/src/DataFixtures/InternalSettingFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php rename to src/DataFixtures/InternalSettingFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php b/src/DataFixtures/SiteCredentialFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php rename to src/DataFixtures/SiteCredentialFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php b/src/DataFixtures/TagFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/TagFixtures.php rename to src/DataFixtures/TagFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/TaggingRuleFixtures.php b/src/DataFixtures/TaggingRuleFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/TaggingRuleFixtures.php rename to src/DataFixtures/TaggingRuleFixtures.php diff --git a/src/Wallabag/CoreBundle/DataFixtures/UserFixtures.php b/src/DataFixtures/UserFixtures.php similarity index 100% rename from src/Wallabag/CoreBundle/DataFixtures/UserFixtures.php rename to src/DataFixtures/UserFixtures.php diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php similarity index 100% rename from src/Wallabag/CoreBundle/DependencyInjection/Configuration.php rename to src/DependencyInjection/Configuration.php diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/DependencyInjection/WallabagCoreExtension.php similarity index 100% rename from src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php rename to src/DependencyInjection/WallabagCoreExtension.php diff --git a/src/Wallabag/CoreBundle/Doctrine/JsonArrayType.php b/src/Doctrine/JsonArrayType.php similarity index 100% rename from src/Wallabag/CoreBundle/Doctrine/JsonArrayType.php rename to src/Doctrine/JsonArrayType.php diff --git a/src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php b/src/Doctrine/WallabagMigration.php similarity index 100% rename from src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php rename to src/Doctrine/WallabagMigration.php diff --git a/src/Wallabag/CoreBundle/Entity/Annotation.php b/src/Entity/Annotation.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Annotation.php rename to src/Entity/Annotation.php diff --git a/src/Wallabag/CoreBundle/Entity/Api/AccessToken.php b/src/Entity/Api/AccessToken.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Api/AccessToken.php rename to src/Entity/Api/AccessToken.php diff --git a/src/Wallabag/CoreBundle/Entity/Api/ApplicationInfo.php b/src/Entity/Api/ApplicationInfo.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Api/ApplicationInfo.php rename to src/Entity/Api/ApplicationInfo.php diff --git a/src/Wallabag/CoreBundle/Entity/Api/AuthCode.php b/src/Entity/Api/AuthCode.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Api/AuthCode.php rename to src/Entity/Api/AuthCode.php diff --git a/src/Wallabag/CoreBundle/Entity/Api/Client.php b/src/Entity/Api/Client.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Api/Client.php rename to src/Entity/Api/Client.php diff --git a/src/Wallabag/CoreBundle/Entity/Api/RefreshToken.php b/src/Entity/Api/RefreshToken.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Api/RefreshToken.php rename to src/Entity/Api/RefreshToken.php diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Entity/Config.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Config.php rename to src/Entity/Config.php diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Entity/Entry.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Entry.php rename to src/Entity/Entry.php diff --git a/src/Wallabag/CoreBundle/Entity/IgnoreOriginInstanceRule.php b/src/Entity/IgnoreOriginInstanceRule.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/IgnoreOriginInstanceRule.php rename to src/Entity/IgnoreOriginInstanceRule.php diff --git a/src/Wallabag/CoreBundle/Entity/IgnoreOriginRuleInterface.php b/src/Entity/IgnoreOriginRuleInterface.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/IgnoreOriginRuleInterface.php rename to src/Entity/IgnoreOriginRuleInterface.php diff --git a/src/Wallabag/CoreBundle/Entity/IgnoreOriginUserRule.php b/src/Entity/IgnoreOriginUserRule.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/IgnoreOriginUserRule.php rename to src/Entity/IgnoreOriginUserRule.php diff --git a/src/Wallabag/CoreBundle/Entity/InternalSetting.php b/src/Entity/InternalSetting.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/InternalSetting.php rename to src/Entity/InternalSetting.php diff --git a/src/Wallabag/CoreBundle/Entity/RuleInterface.php b/src/Entity/RuleInterface.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/RuleInterface.php rename to src/Entity/RuleInterface.php diff --git a/src/Wallabag/CoreBundle/Entity/SiteCredential.php b/src/Entity/SiteCredential.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/SiteCredential.php rename to src/Entity/SiteCredential.php diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Entity/Tag.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/Tag.php rename to src/Entity/Tag.php diff --git a/src/Wallabag/CoreBundle/Entity/TaggingRule.php b/src/Entity/TaggingRule.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/TaggingRule.php rename to src/Entity/TaggingRule.php diff --git a/src/Wallabag/CoreBundle/Entity/User.php b/src/Entity/User.php similarity index 100% rename from src/Wallabag/CoreBundle/Entity/User.php rename to src/Entity/User.php diff --git a/src/Wallabag/CoreBundle/Event/ConfigUpdatedEvent.php b/src/Event/ConfigUpdatedEvent.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/ConfigUpdatedEvent.php rename to src/Event/ConfigUpdatedEvent.php diff --git a/src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php b/src/Event/EntryDeletedEvent.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php rename to src/Event/EntryDeletedEvent.php diff --git a/src/Wallabag/CoreBundle/Event/EntrySavedEvent.php b/src/Event/EntrySavedEvent.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/EntrySavedEvent.php rename to src/Event/EntrySavedEvent.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListener.php b/src/Event/Listener/AuthenticationFailureListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/AuthenticationFailureListener.php rename to src/Event/Listener/AuthenticationFailureListener.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/CreateConfigListener.php b/src/Event/Listener/CreateConfigListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/CreateConfigListener.php rename to src/Event/Listener/CreateConfigListener.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/LocaleListener.php b/src/Event/Listener/LocaleListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/LocaleListener.php rename to src/Event/Listener/LocaleListener.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/PasswordResettingListener.php b/src/Event/Listener/PasswordResettingListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/PasswordResettingListener.php rename to src/Event/Listener/PasswordResettingListener.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/RegistrationListener.php b/src/Event/Listener/RegistrationListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/RegistrationListener.php rename to src/Event/Listener/RegistrationListener.php diff --git a/src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php b/src/Event/Listener/UserLocaleListener.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php rename to src/Event/Listener/UserLocaleListener.php diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php b/src/Event/Subscriber/CustomDoctrineORMSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php rename to src/Event/Subscriber/CustomDoctrineORMSubscriber.php diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Event/Subscriber/DownloadImagesSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php rename to src/Event/Subscriber/DownloadImagesSubscriber.php diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/GenerateCustomCSSSubscriber.php b/src/Event/Subscriber/GenerateCustomCSSSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Subscriber/GenerateCustomCSSSubscriber.php rename to src/Event/Subscriber/GenerateCustomCSSSubscriber.php diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php b/src/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php rename to src/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriber.php b/src/Event/Subscriber/TablePrefixSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Event/Subscriber/TablePrefixSubscriber.php rename to src/Event/Subscriber/TablePrefixSubscriber.php diff --git a/src/Wallabag/CoreBundle/ExpressionLanguage/AuthenticatorProvider.php b/src/ExpressionLanguage/AuthenticatorProvider.php similarity index 100% rename from src/Wallabag/CoreBundle/ExpressionLanguage/AuthenticatorProvider.php rename to src/ExpressionLanguage/AuthenticatorProvider.php diff --git a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php b/src/Form/DataTransformer/StringToListTransformer.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php rename to src/Form/DataTransformer/StringToListTransformer.php diff --git a/src/Wallabag/CoreBundle/Form/Type/Api/ClientType.php b/src/Form/Type/Api/ClientType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/Api/ClientType.php rename to src/Form/Type/Api/ClientType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php b/src/Form/Type/ChangePasswordType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/ChangePasswordType.php rename to src/Form/Type/ChangePasswordType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Form/Type/ConfigType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/ConfigType.php rename to src/Form/Type/ConfigType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/EditAnnotationType.php b/src/Form/Type/EditAnnotationType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/EditAnnotationType.php rename to src/Form/Type/EditAnnotationType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Form/Type/EditEntryType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/EditEntryType.php rename to src/Form/Type/EditEntryType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Form/Type/EntryFilterType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php rename to src/Form/Type/EntryFilterType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/FeedType.php b/src/Form/Type/FeedType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/FeedType.php rename to src/Form/Type/FeedType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/IgnoreOriginInstanceRuleType.php b/src/Form/Type/IgnoreOriginInstanceRuleType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/IgnoreOriginInstanceRuleType.php rename to src/Form/Type/IgnoreOriginInstanceRuleType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/IgnoreOriginUserRuleType.php b/src/Form/Type/IgnoreOriginUserRuleType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/IgnoreOriginUserRuleType.php rename to src/Form/Type/IgnoreOriginUserRuleType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/NewAnnotationType.php b/src/Form/Type/NewAnnotationType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/NewAnnotationType.php rename to src/Form/Type/NewAnnotationType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/NewEntryType.php b/src/Form/Type/NewEntryType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/NewEntryType.php rename to src/Form/Type/NewEntryType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/NewTagType.php b/src/Form/Type/NewTagType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/NewTagType.php rename to src/Form/Type/NewTagType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Form/Type/NewUserType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/NewUserType.php rename to src/Form/Type/NewUserType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/RangeType.php b/src/Form/Type/RangeType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/RangeType.php rename to src/Form/Type/RangeType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/RenameTagType.php b/src/Form/Type/RenameTagType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/RenameTagType.php rename to src/Form/Type/RenameTagType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/SearchEntryType.php b/src/Form/Type/SearchEntryType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/SearchEntryType.php rename to src/Form/Type/SearchEntryType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/SearchUserType.php b/src/Form/Type/SearchUserType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/SearchUserType.php rename to src/Form/Type/SearchUserType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/SiteCredentialType.php b/src/Form/Type/SiteCredentialType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/SiteCredentialType.php rename to src/Form/Type/SiteCredentialType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/TaggingRuleImportType.php b/src/Form/Type/TaggingRuleImportType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/TaggingRuleImportType.php rename to src/Form/Type/TaggingRuleImportType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php b/src/Form/Type/TaggingRuleType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/TaggingRuleType.php rename to src/Form/Type/TaggingRuleType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/UploadImportType.php b/src/Form/Type/UploadImportType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/UploadImportType.php rename to src/Form/Type/UploadImportType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Form/Type/UserInformationType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/UserInformationType.php rename to src/Form/Type/UserInformationType.php diff --git a/src/Wallabag/CoreBundle/Form/Type/UserType.php b/src/Form/Type/UserType.php similarity index 100% rename from src/Wallabag/CoreBundle/Form/Type/UserType.php rename to src/Form/Type/UserType.php diff --git a/src/Wallabag/CoreBundle/Guzzle/AuthenticatorSubscriber.php b/src/Guzzle/AuthenticatorSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Guzzle/AuthenticatorSubscriber.php rename to src/Guzzle/AuthenticatorSubscriber.php diff --git a/src/Wallabag/CoreBundle/Guzzle/FixupMondeDiplomatiqueUriSubscriber.php b/src/Guzzle/FixupMondeDiplomatiqueUriSubscriber.php similarity index 100% rename from src/Wallabag/CoreBundle/Guzzle/FixupMondeDiplomatiqueUriSubscriber.php rename to src/Guzzle/FixupMondeDiplomatiqueUriSubscriber.php diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Helper/ContentProxy.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/ContentProxy.php rename to src/Helper/ContentProxy.php diff --git a/src/Wallabag/CoreBundle/Helper/CryptoProxy.php b/src/Helper/CryptoProxy.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/CryptoProxy.php rename to src/Helper/CryptoProxy.php diff --git a/src/Wallabag/CoreBundle/Helper/DownloadImages.php b/src/Helper/DownloadImages.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/DownloadImages.php rename to src/Helper/DownloadImages.php diff --git a/src/Wallabag/CoreBundle/Helper/EntityTimestampsTrait.php b/src/Helper/EntityTimestampsTrait.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/EntityTimestampsTrait.php rename to src/Helper/EntityTimestampsTrait.php diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Helper/EntriesExport.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/EntriesExport.php rename to src/Helper/EntriesExport.php diff --git a/src/Wallabag/CoreBundle/Helper/FileCookieJar.php b/src/Helper/FileCookieJar.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/FileCookieJar.php rename to src/Helper/FileCookieJar.php diff --git a/src/Wallabag/CoreBundle/Helper/HttpClientFactory.php b/src/Helper/HttpClientFactory.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/HttpClientFactory.php rename to src/Helper/HttpClientFactory.php diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Helper/PreparePagerForEntries.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php rename to src/Helper/PreparePagerForEntries.php diff --git a/src/Wallabag/CoreBundle/Helper/Redirect.php b/src/Helper/Redirect.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/Redirect.php rename to src/Helper/Redirect.php diff --git a/src/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessor.php b/src/Helper/RuleBasedIgnoreOriginProcessor.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessor.php rename to src/Helper/RuleBasedIgnoreOriginProcessor.php diff --git a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php b/src/Helper/RuleBasedTagger.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php rename to src/Helper/RuleBasedTagger.php diff --git a/src/Wallabag/CoreBundle/Helper/TagsAssigner.php b/src/Helper/TagsAssigner.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/TagsAssigner.php rename to src/Helper/TagsAssigner.php diff --git a/src/Wallabag/CoreBundle/Helper/UrlHasher.php b/src/Helper/UrlHasher.php similarity index 100% rename from src/Wallabag/CoreBundle/Helper/UrlHasher.php rename to src/Helper/UrlHasher.php diff --git a/src/Wallabag/CoreBundle/Import/AbstractImport.php b/src/Import/AbstractImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/AbstractImport.php rename to src/Import/AbstractImport.php diff --git a/src/Wallabag/CoreBundle/Import/BrowserImport.php b/src/Import/BrowserImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/BrowserImport.php rename to src/Import/BrowserImport.php diff --git a/src/Wallabag/CoreBundle/Import/ChromeImport.php b/src/Import/ChromeImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ChromeImport.php rename to src/Import/ChromeImport.php diff --git a/src/Wallabag/CoreBundle/Import/DeliciousImport.php b/src/Import/DeliciousImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/DeliciousImport.php rename to src/Import/DeliciousImport.php diff --git a/src/Wallabag/CoreBundle/Import/ElcuratorImport.php b/src/Import/ElcuratorImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ElcuratorImport.php rename to src/Import/ElcuratorImport.php diff --git a/src/Wallabag/CoreBundle/Import/FirefoxImport.php b/src/Import/FirefoxImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/FirefoxImport.php rename to src/Import/FirefoxImport.php diff --git a/src/Wallabag/CoreBundle/Import/HtmlImport.php b/src/Import/HtmlImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/HtmlImport.php rename to src/Import/HtmlImport.php diff --git a/src/Wallabag/CoreBundle/Import/ImportChain.php b/src/Import/ImportChain.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ImportChain.php rename to src/Import/ImportChain.php diff --git a/src/Wallabag/CoreBundle/Import/ImportCompilerPass.php b/src/Import/ImportCompilerPass.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ImportCompilerPass.php rename to src/Import/ImportCompilerPass.php diff --git a/src/Wallabag/CoreBundle/Import/ImportInterface.php b/src/Import/ImportInterface.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ImportInterface.php rename to src/Import/ImportInterface.php diff --git a/src/Wallabag/CoreBundle/Import/InstapaperImport.php b/src/Import/InstapaperImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/InstapaperImport.php rename to src/Import/InstapaperImport.php diff --git a/src/Wallabag/CoreBundle/Import/PinboardImport.php b/src/Import/PinboardImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/PinboardImport.php rename to src/Import/PinboardImport.php diff --git a/src/Wallabag/CoreBundle/Import/PocketHtmlImport.php b/src/Import/PocketHtmlImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/PocketHtmlImport.php rename to src/Import/PocketHtmlImport.php diff --git a/src/Wallabag/CoreBundle/Import/PocketImport.php b/src/Import/PocketImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/PocketImport.php rename to src/Import/PocketImport.php diff --git a/src/Wallabag/CoreBundle/Import/ReadabilityImport.php b/src/Import/ReadabilityImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ReadabilityImport.php rename to src/Import/ReadabilityImport.php diff --git a/src/Wallabag/CoreBundle/Import/ShaarliImport.php b/src/Import/ShaarliImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/ShaarliImport.php rename to src/Import/ShaarliImport.php diff --git a/src/Wallabag/CoreBundle/Import/WallabagImport.php b/src/Import/WallabagImport.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/WallabagImport.php rename to src/Import/WallabagImport.php diff --git a/src/Wallabag/CoreBundle/Import/WallabagV1Import.php b/src/Import/WallabagV1Import.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/WallabagV1Import.php rename to src/Import/WallabagV1Import.php diff --git a/src/Wallabag/CoreBundle/Import/WallabagV2Import.php b/src/Import/WallabagV2Import.php similarity index 100% rename from src/Wallabag/CoreBundle/Import/WallabagV2Import.php rename to src/Import/WallabagV2Import.php diff --git a/src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php b/src/Mailer/AuthCodeMailer.php similarity index 100% rename from src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php rename to src/Mailer/AuthCodeMailer.php diff --git a/src/Wallabag/CoreBundle/Mailer/UserMailer.php b/src/Mailer/UserMailer.php similarity index 100% rename from src/Wallabag/CoreBundle/Mailer/UserMailer.php rename to src/Mailer/UserMailer.php diff --git a/src/Wallabag/CoreBundle/Operator/Doctrine/Matches.php b/src/Operator/Doctrine/Matches.php similarity index 100% rename from src/Wallabag/CoreBundle/Operator/Doctrine/Matches.php rename to src/Operator/Doctrine/Matches.php diff --git a/src/Wallabag/CoreBundle/Operator/Doctrine/NotMatches.php b/src/Operator/Doctrine/NotMatches.php similarity index 100% rename from src/Wallabag/CoreBundle/Operator/Doctrine/NotMatches.php rename to src/Operator/Doctrine/NotMatches.php diff --git a/src/Wallabag/CoreBundle/Operator/PHP/Matches.php b/src/Operator/PHP/Matches.php similarity index 100% rename from src/Wallabag/CoreBundle/Operator/PHP/Matches.php rename to src/Operator/PHP/Matches.php diff --git a/src/Wallabag/CoreBundle/Operator/PHP/NotMatches.php b/src/Operator/PHP/NotMatches.php similarity index 100% rename from src/Wallabag/CoreBundle/Operator/PHP/NotMatches.php rename to src/Operator/PHP/NotMatches.php diff --git a/src/Wallabag/CoreBundle/Operator/PHP/PatternMatches.php b/src/Operator/PHP/PatternMatches.php similarity index 100% rename from src/Wallabag/CoreBundle/Operator/PHP/PatternMatches.php rename to src/Operator/PHP/PatternMatches.php diff --git a/src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php b/src/ParamConverter/UsernameFeedTokenConverter.php similarity index 100% rename from src/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverter.php rename to src/ParamConverter/UsernameFeedTokenConverter.php diff --git a/src/Wallabag/CoreBundle/Redis/Producer.php b/src/Redis/Producer.php similarity index 100% rename from src/Wallabag/CoreBundle/Redis/Producer.php rename to src/Redis/Producer.php diff --git a/src/Wallabag/CoreBundle/Repository/AnnotationRepository.php b/src/Repository/AnnotationRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/AnnotationRepository.php rename to src/Repository/AnnotationRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php b/src/Repository/Api/ClientRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/Api/ClientRepository.php rename to src/Repository/Api/ClientRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/ConfigRepository.php b/src/Repository/ConfigRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/ConfigRepository.php rename to src/Repository/ConfigRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Repository/EntryRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/EntryRepository.php rename to src/Repository/EntryRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/IgnoreOriginInstanceRuleRepository.php b/src/Repository/IgnoreOriginInstanceRuleRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/IgnoreOriginInstanceRuleRepository.php rename to src/Repository/IgnoreOriginInstanceRuleRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/IgnoreOriginUserRuleRepository.php b/src/Repository/IgnoreOriginUserRuleRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/IgnoreOriginUserRuleRepository.php rename to src/Repository/IgnoreOriginUserRuleRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php b/src/Repository/SiteCredentialRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php rename to src/Repository/SiteCredentialRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Repository/TagRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/TagRepository.php rename to src/Repository/TagRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/TaggingRuleRepository.php b/src/Repository/TaggingRuleRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/TaggingRuleRepository.php rename to src/Repository/TaggingRuleRepository.php diff --git a/src/Wallabag/CoreBundle/Repository/UserRepository.php b/src/Repository/UserRepository.php similarity index 100% rename from src/Wallabag/CoreBundle/Repository/UserRepository.php rename to src/Repository/UserRepository.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/ArraySiteConfigBuilder.php b/src/SiteConfig/ArraySiteConfigBuilder.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/ArraySiteConfigBuilder.php rename to src/SiteConfig/ArraySiteConfigBuilder.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/Authenticator/Authenticator.php b/src/SiteConfig/Authenticator/Authenticator.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/Authenticator/Authenticator.php rename to src/SiteConfig/Authenticator/Authenticator.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/Authenticator/Factory.php b/src/SiteConfig/Authenticator/Factory.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/Authenticator/Factory.php rename to src/SiteConfig/Authenticator/Factory.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/Authenticator/LoginFormAuthenticator.php b/src/SiteConfig/Authenticator/LoginFormAuthenticator.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/Authenticator/LoginFormAuthenticator.php rename to src/SiteConfig/Authenticator/LoginFormAuthenticator.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilder.php b/src/SiteConfig/GrabySiteConfigBuilder.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilder.php rename to src/SiteConfig/GrabySiteConfigBuilder.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/SiteConfig.php b/src/SiteConfig/SiteConfig.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/SiteConfig.php rename to src/SiteConfig/SiteConfig.php diff --git a/src/Wallabag/CoreBundle/SiteConfig/SiteConfigBuilder.php b/src/SiteConfig/SiteConfigBuilder.php similarity index 100% rename from src/Wallabag/CoreBundle/SiteConfig/SiteConfigBuilder.php rename to src/SiteConfig/SiteConfigBuilder.php diff --git a/src/Wallabag/CoreBundle/Tools/Utils.php b/src/Tools/Utils.php similarity index 100% rename from src/Wallabag/CoreBundle/Tools/Utils.php rename to src/Tools/Utils.php diff --git a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php b/src/Twig/WallabagExtension.php similarity index 100% rename from src/Wallabag/CoreBundle/Twig/WallabagExtension.php rename to src/Twig/WallabagExtension.php diff --git a/src/Wallabag/CoreBundle/WallabagCoreBundle.php b/src/WallabagCoreBundle.php similarity index 100% rename from src/Wallabag/CoreBundle/WallabagCoreBundle.php rename to src/WallabagCoreBundle.php