diff --git a/app/AppKernel.php b/app/AppKernel.php
index 286cfb699..ede8fec03 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -35,9 +35,6 @@ class AppKernel extends Kernel
             new Http\HttplugBundle\HttplugBundle(),
             new Sentry\SentryBundle\SentryBundle(),
             new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
-
-            // wallabag bundles
-            new Wallabag\CoreBundle\WallabagCoreBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
diff --git a/app/config/config.yml b/app/config/config.yml
index 2a2869c3a..3db473e98 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -68,6 +68,13 @@ doctrine:
         entity_managers:
             default:
                 auto_mapping: true
+                mappings:
+                    Wallabag:
+                        type: annotation
+                        is_bundle: false
+                        dir: '%kernel.project_dir%/src/Entity'
+                        prefix: 'Wallabag\CoreBundle\Entity'
+                        alias: Wallabag
 
 stof_doctrine_extensions:
     default_locale: "%locale%"
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 3cfaef516..fc5a501b1 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,5 +1,5 @@
 app:
-    resource: "@WallabagCoreBundle/Controller/"
+    resource: ../../src/Controller/
     type: annotation
 
 doc-api:
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
deleted file mode 100644
index 939e9459c..000000000
--- a/src/DependencyInjection/Configuration.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\DependencyInjection;
-
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-
-class Configuration implements ConfigurationInterface
-{
-    public function getConfigTreeBuilder()
-    {
-        return new TreeBuilder('wallabag_core');
-    }
-}
diff --git a/src/DependencyInjection/WallabagCoreExtension.php b/src/DependencyInjection/WallabagCoreExtension.php
deleted file mode 100644
index a328eb922..000000000
--- a/src/DependencyInjection/WallabagCoreExtension.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-
-class WallabagCoreExtension extends Extension
-{
-    public function load(array $configs, ContainerBuilder $container)
-    {
-    }
-
-    public function getAlias()
-    {
-        return 'wallabag_core';
-    }
-}
diff --git a/src/WallabagCoreBundle.php b/src/WallabagCoreBundle.php
deleted file mode 100644
index f5899e39c..000000000
--- a/src/WallabagCoreBundle.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class WallabagCoreBundle extends Bundle
-{
-}