diff --git a/app/AppKernel.php b/app/AppKernel.php
index 5d159df8c..b0a66dadd 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -17,7 +17,7 @@ class AppKernel extends Kernel
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new AppBundle\AppBundle(),
-            new WallabagBundle\WallabagBundle(),
+            new Wallabag\CoreBundle\WallabagCoreBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {
diff --git a/app/config/routing.yml b/app/config/routing.yml
index d0ece8e30..b3c5291a8 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,7 +1,7 @@
 app:
-    resource: @WallabagBundle/Controller/
+    resource: @WallabagCoreBundle/Controller/
     type:     annotation
 
 homepage:
     pattern:   /
-    defaults:  { _controller: WallabagBundle:Entry:showUnread }
\ No newline at end of file
+    defaults:  { _controller: CoreBundle:Entry:showUnread }
\ No newline at end of file
diff --git a/src/WallabagBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
similarity index 90%
rename from src/WallabagBundle/Controller/EntryController.php
rename to src/Wallabag/CoreBundle/Controller/EntryController.php
index dc1876fac..2ebb416c6 100644
--- a/src/WallabagBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace WallabagBundle\Controller;
+namespace Wallabag\CoreBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
-use WallabagBundle\Repository;
-use WallabagBundle\Entity\Entries;
+use Wallabag\CoreBundle\Repository;
+use Wallabag\CoreBundle\Entity\Entries;
 use Wallabag\Wallabag\Tools;
 use Wallabag\Wallabag\Url;
 
@@ -47,7 +47,7 @@ class EntryController extends Controller
             return $this->redirect($this->generateUrl('homepage'));
         }
 
-        return $this->render('WallabagBundle:Entry:new.html.twig', array(
+        return $this->render('WallabagCoreBundle:Entry:new.html.twig', array(
             'form' => $form->createView(),
         ));
     }
@@ -60,11 +60,11 @@ class EntryController extends Controller
      */
     public function showUnreadAction()
     {
-        $repository = $this->getDoctrine()->getRepository('WallabagBundle:Entries');
+        $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entries');
         $entries = $repository->findUnreadByUser(1, 0);
 
         return $this->render(
-            'WallabagBundle:Entry:entries.html.twig',
+            'WallabagCoreBundle:Entry:entries.html.twig',
             array('entries' => $entries)
         );
     }
@@ -77,11 +77,11 @@ class EntryController extends Controller
      */
     public function showArchiveAction()
     {
-        $repository = $this->getDoctrine()->getRepository('WallabagBundle:Entries');
+        $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entries');
         $entries = $repository->findArchiveByUser(1, 0);
 
         return $this->render(
-            'WallabagBundle:Entry:entries.html.twig',
+            'WallabagCoreBundle:Entry:entries.html.twig',
             array('entries' => $entries)
         );
     }
@@ -94,11 +94,11 @@ class EntryController extends Controller
      */
     public function showStarredAction()
     {
-        $repository = $this->getDoctrine()->getRepository('WallabagBundle:Entries');
+        $repository = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entries');
         $entries = $repository->findStarredByUser(1, 0);
 
         return $this->render(
-            'WallabagBundle:Entry:entries.html.twig',
+            'WallabagCoreBundle:Entry:entries.html.twig',
             array('entries' => $entries)
         );
     }
@@ -113,7 +113,7 @@ class EntryController extends Controller
     public function viewAction(Entries $entry)
     {
         return $this->render(
-            'WallabagBundle:Entry:entry.html.twig',
+            'WallabagCoreBundle:Entry:entry.html.twig',
             array('entry' => $entry)
         );
     }
diff --git a/src/WallabagBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php
similarity index 77%
rename from src/WallabagBundle/Controller/StaticController.php
rename to src/Wallabag/CoreBundle/Controller/StaticController.php
index aee2bb7ea..0fd19d652 100644
--- a/src/WallabagBundle/Controller/StaticController.php
+++ b/src/Wallabag/CoreBundle/Controller/StaticController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WallabagBundle\Controller;
+namespace Wallabag\CoreBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -13,7 +13,7 @@ class StaticController extends Controller
     public function aboutAction()
     {
         return $this->render(
-            'WallabagBundle:Static:about.html.twig',
+            'WallabagCoreBundle:Static:about.html.twig',
             array()
         );
     }
diff --git a/src/WallabagBundle/DependencyInjection/WallabagExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
similarity index 79%
rename from src/WallabagBundle/DependencyInjection/WallabagExtension.php
rename to src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
index cfdb21fc8..7cc4165ef 100644
--- a/src/WallabagBundle/DependencyInjection/WallabagExtension.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace WallabagBundle\DependencyInjection;
+namespace Wallabag\CoreBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Config\FileLocator;
 
-class WallabagExtension extends Extension
+class WallabagCoreExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container)
     {
@@ -17,6 +17,6 @@ class WallabagExtension extends Extension
 
     public function getAlias()
     {
-        return 'wallabag';
+        return 'wallabag_core';
     }
 }
diff --git a/src/WallabagBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
similarity index 97%
rename from src/WallabagBundle/Entity/Config.php
rename to src/Wallabag/CoreBundle/Entity/Config.php
index 8b692cefd..d60b2df04 100644
--- a/src/WallabagBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/src/WallabagBundle/Entity/Config.php~ b/src/Wallabag/CoreBundle/Entity/Config.php~
similarity index 100%
rename from src/WallabagBundle/Entity/Config.php~
rename to src/Wallabag/CoreBundle/Entity/Config.php~
diff --git a/src/WallabagBundle/Entity/Entries.php b/src/Wallabag/CoreBundle/Entity/Entries.php
similarity index 96%
rename from src/WallabagBundle/Entity/Entries.php
rename to src/Wallabag/CoreBundle/Entity/Entries.php
index 5849a2161..712ff1262 100644
--- a/src/WallabagBundle/Entity/Entries.php
+++ b/src/Wallabag/CoreBundle/Entity/Entries.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
@@ -8,7 +8,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 /**
  * Entries
  *
- * @ORM\Entity(repositoryClass="WallabagBundle\Repository\EntriesRepository")
+ * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntriesRepository")
  * @ORM\Table(name="entries")
  */
 class Entries
diff --git a/src/WallabagBundle/Entity/Entries.php~ b/src/Wallabag/CoreBundle/Entity/Entries.php~
similarity index 100%
rename from src/WallabagBundle/Entity/Entries.php~
rename to src/Wallabag/CoreBundle/Entity/Entries.php~
diff --git a/src/WallabagBundle/Entity/Entry.php~ b/src/Wallabag/CoreBundle/Entity/Entry.php~
similarity index 100%
rename from src/WallabagBundle/Entity/Entry.php~
rename to src/Wallabag/CoreBundle/Entity/Entry.php~
diff --git a/src/WallabagBundle/Entity/Tags.php b/src/Wallabag/CoreBundle/Entity/Tags.php
similarity index 95%
rename from src/WallabagBundle/Entity/Tags.php
rename to src/Wallabag/CoreBundle/Entity/Tags.php
index c0c78ee51..6fe16a535 100644
--- a/src/WallabagBundle/Entity/Tags.php
+++ b/src/Wallabag/CoreBundle/Entity/Tags.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/src/WallabagBundle/Entity/Tags.php~ b/src/Wallabag/CoreBundle/Entity/Tags.php~
similarity index 100%
rename from src/WallabagBundle/Entity/Tags.php~
rename to src/Wallabag/CoreBundle/Entity/Tags.php~
diff --git a/src/WallabagBundle/Entity/TagsEntries.php b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
similarity index 97%
rename from src/WallabagBundle/Entity/TagsEntries.php
rename to src/Wallabag/CoreBundle/Entity/TagsEntries.php
index 448c54fac..ad01cf575 100644
--- a/src/WallabagBundle/Entity/TagsEntries.php
+++ b/src/Wallabag/CoreBundle/Entity/TagsEntries.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/src/WallabagBundle/Entity/TagsEntries.php~ b/src/Wallabag/CoreBundle/Entity/TagsEntries.php~
similarity index 100%
rename from src/WallabagBundle/Entity/TagsEntries.php~
rename to src/Wallabag/CoreBundle/Entity/TagsEntries.php~
diff --git a/src/WallabagBundle/Entity/Users.php b/src/Wallabag/CoreBundle/Entity/Users.php
similarity index 98%
rename from src/WallabagBundle/Entity/Users.php
rename to src/Wallabag/CoreBundle/Entity/Users.php
index a48f2240f..3db4a3fd9 100644
--- a/src/WallabagBundle/Entity/Users.php
+++ b/src/Wallabag/CoreBundle/Entity/Users.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/src/WallabagBundle/Entity/Users.php~ b/src/Wallabag/CoreBundle/Entity/Users.php~
similarity index 100%
rename from src/WallabagBundle/Entity/Users.php~
rename to src/Wallabag/CoreBundle/Entity/Users.php~
diff --git a/src/WallabagBundle/Entity/UsersConfig.php b/src/Wallabag/CoreBundle/Entity/UsersConfig.php
similarity index 97%
rename from src/WallabagBundle/Entity/UsersConfig.php
rename to src/Wallabag/CoreBundle/Entity/UsersConfig.php
index 8af283cc4..26fb44ee4 100644
--- a/src/WallabagBundle/Entity/UsersConfig.php
+++ b/src/Wallabag/CoreBundle/Entity/UsersConfig.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WallabagBundle\Entity;
+namespace Wallabag\CoreBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/src/WallabagBundle/Entity/UsersConfig.php~ b/src/Wallabag/CoreBundle/Entity/UsersConfig.php~
similarity index 100%
rename from src/WallabagBundle/Entity/UsersConfig.php~
rename to src/Wallabag/CoreBundle/Entity/UsersConfig.php~
diff --git a/src/WallabagBundle/Repository/EntriesRepository.php b/src/Wallabag/CoreBundle/Repository/EntriesRepository.php
similarity index 97%
rename from src/WallabagBundle/Repository/EntriesRepository.php
rename to src/Wallabag/CoreBundle/Repository/EntriesRepository.php
index 3eb1733d1..5a71b9efe 100644
--- a/src/WallabagBundle/Repository/EntriesRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntriesRepository.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WallabagBundle\Repository;
+namespace Wallabag\CoreBundle\Repository;
 
 use Doctrine\ORM\Query;
 use Doctrine\ORM\EntityRepository;
diff --git a/src/Wallabag/CoreBundle/Resources/config/routing.yml b/src/Wallabag/CoreBundle/Resources/config/routing.yml
new file mode 100644
index 000000000..327d49d8b
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/config/routing.yml
@@ -0,0 +1,3 @@
+_wllbg:
+    resource: "@WallabagCoreBundle/Controller/EntryController.php"
+    type:     annotation
\ No newline at end of file
diff --git a/src/WallabagBundle/Resources/config/services.xml b/src/Wallabag/CoreBundle/Resources/config/services.xml
similarity index 75%
rename from src/WallabagBundle/Resources/config/services.xml
rename to src/Wallabag/CoreBundle/Resources/config/services.xml
index 02d82643c..02308e6aa 100644
--- a/src/WallabagBundle/Resources/config/services.xml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.xml
@@ -5,8 +5,13 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="wallabag.twig.extension.wallabag_extension" class="WallabagBundle\Twig\Extension\WallabagExtension">
+        <service id="wallabag_core.twig.wallabag" class="Wallabag\CoreBundle\Twig\Extension\WallabagExtension">
             <tag name="twig.extension" />
         </service>
     </services>
+
+
+
 </container>
+
+
diff --git a/src/WallabagBundle/Resources/views/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
similarity index 96%
rename from src/WallabagBundle/Resources/views/Entry/entries.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
index de343aa22..2f8423d78 100644
--- a/src/WallabagBundle/Resources/views/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig
@@ -1,9 +1,9 @@
-{% extends "WallabagBundle::layout.html.twig" %}
+{% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title "Unread" %}
 
 {% block menu %}
-    {% include "WallabagBundle::_menu.html.twig" %}
+    {% include "WallabagCoreBundle::_menu.html.twig" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/WallabagBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
similarity index 93%
rename from src/WallabagBundle/Resources/views/Entry/entry.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
index 8c08b2ef0..78dfa7c0a 100644
--- a/src/WallabagBundle/Resources/views/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig
@@ -1,9 +1,9 @@
-{% extends "WallabagBundle::layout.html.twig" %}
+{% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %}
 
 {% block menu %}
-    {% include "WallabagBundle::_menu.html.twig" %}
+    {% include "WallabagCoreBundle::_menu.html.twig" %}
 {% endblock %}
 
 {% block content %}
@@ -21,9 +21,9 @@
             {#  {% if flattr %}{% if flattr.status == flattrable %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans %}flattr{% endtrans %}"><span>{% trans %}flattr{% endtrans %}</span></a></li>{% elseif flattr.status == flattred %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans %}flattr{% endtrans %}><span>{% trans %}flattr{% endtrans %}</span> ({{ flattr.numFlattrs }})</a></li>{% endif %}{% endif %} #}
             {% if carrot %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans %}carrot{% endtrans %}"><span>Carrot</span></a></li>{% endif %}
             {% if show_printlink %}<li><a title="{% trans %}Print{% endtrans %}" class="tool icon icon-print" href="javascript: window.print();"><span>{% trans %}Print{% endtrans %}</span></a></li>{% endif %}
-            {% if export_epub %}<li><a href="./?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %}
-            {% if export_mobi %}<li><a href="./?mobi&amp;method=id&amp;value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
-            {% if export_pdf %}<li><a href="./?pdf&amp;method=id&amp;value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %}
+            {% if export_epub %}<li><a href="?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %}
+            {% if export_mobi %}<li><a href="?mobi&amp;method=id&amp;value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
+            {% if export_pdf %}<li><a href="?pdf&amp;method=id&amp;value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %}
             <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}" class="tool bad-display icon icon-delete"><span>{% trans %}Does this article appear wrong?{% endtrans %}</span></a></li>
         </ul>
     </div>
diff --git a/src/WallabagBundle/Resources/views/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
similarity index 59%
rename from src/WallabagBundle/Resources/views/Entry/new.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
index 78da791f8..df6926a0f 100644
--- a/src/WallabagBundle/Resources/views/Entry/new.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
@@ -1,9 +1,9 @@
-{% extends "WallabagBundle::layout.html.twig" %}
+{% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %}
 
 {% block menu %}
-    {% include "WallabagBundle::_menu.html.twig" %}
+    {% include "WallabagCoreBundle::_menu.html.twig" %}
 {% endblock %}
 
 {% block content %}
diff --git a/src/WallabagBundle/Resources/views/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
similarity index 95%
rename from src/WallabagBundle/Resources/views/Static/about.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
index 752526e11..0585eccab 100755
--- a/src/WallabagBundle/Resources/views/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
@@ -1,8 +1,8 @@
-{% extends "WallabagBundle::layout.html.twig" %}
+{% extends "WallabagCoreBundle::layout.html.twig" %}
 
 {% block title %}{% trans %}About{% endtrans %}{% endblock %}
 {% block menu %}
-{% include "WallabagBundle::_menu.html.twig" %}
+{% include "WallabagCoreBundle::_menu.html.twig" %}
 {% endblock %}
 {% block content %}
     <h2>{% trans %}About wallabag{% endtrans %}</h2>
diff --git a/src/WallabagBundle/Resources/views/_bookmarklet.html.twig b/src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
similarity index 100%
rename from src/WallabagBundle/Resources/views/_bookmarklet.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig
diff --git a/src/WallabagBundle/Resources/views/_footer.html.twig b/src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
similarity index 100%
rename from src/WallabagBundle/Resources/views/_footer.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/_footer.html.twig
diff --git a/src/WallabagBundle/Resources/views/_head.html.twig b/src/Wallabag/CoreBundle/Resources/views/_head.html.twig
similarity index 100%
rename from src/WallabagBundle/Resources/views/_head.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/_head.html.twig
diff --git a/src/WallabagBundle/Resources/views/_menu.html.twig b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
similarity index 66%
rename from src/WallabagBundle/Resources/views/_menu.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
index 419a676b9..d4560e84b 100644
--- a/src/WallabagBundle/Resources/views/_menu.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/_menu.html.twig
@@ -3,13 +3,13 @@
                 <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
                 <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
                 <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
-                <li><a href="./?view=tags">{% trans %}tags{% endtrans %}</a></li>
+                <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
                 <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li>
                 <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
-                    {% include "WallabagBundle::_search_form.html.twig" %}
+                    {% include "WallabagCoreBundle::_search_form.html.twig" %}
                 </li>
-                <li><a href="./?view=config">{% trans %}config{% endtrans %}</a></li>
+                <li><a href="?view=config">{% trans %}config{% endtrans %}</a></li>
                 <li><a href={{ path('about') }}>{% trans %}about{% endtrans %}</a></li>
-                <li><a class="icon icon-power" href="./?logout" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
+                <li><a class="icon icon-power" href="?logout" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
             </ul>
 
diff --git a/src/WallabagBundle/Resources/views/_messages.html.twig b/src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
similarity index 100%
rename from src/WallabagBundle/Resources/views/_messages.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/_messages.html.twig
diff --git a/src/WallabagBundle/Resources/views/_save_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/_save_form.html.twig
similarity index 100%
rename from src/WallabagBundle/Resources/views/_save_form.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/_save_form.html.twig
diff --git a/src/WallabagBundle/Resources/views/_search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig
similarity index 100%
rename from src/WallabagBundle/Resources/views/_search_form.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig
diff --git a/src/WallabagBundle/Resources/views/_top.html.twig b/src/Wallabag/CoreBundle/Resources/views/_top.html.twig
similarity index 100%
rename from src/WallabagBundle/Resources/views/_top.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/_top.html.twig
diff --git a/src/WallabagBundle/Resources/views/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
similarity index 80%
rename from src/WallabagBundle/Resources/views/layout.html.twig
rename to src/Wallabag/CoreBundle/Resources/views/layout.html.twig
index 34d9b1b0c..83830a4ae 100644
--- a/src/WallabagBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
@@ -11,11 +11,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=10">
     <![endif]-->
     <title>{% block title %}{% endblock %} - wallabag</title>
-    {% include "WallabagBundle::_head.html.twig" %}
-    {% include "WallabagBundle::_bookmarklet.html.twig" %}
+    {% include "WallabagCoreBundle::_head.html.twig" %}
+    {% include "WallabagCoreBundle::_bookmarklet.html.twig" %}
 </head>
 <body>
-{% include "WallabagBundle::_top.html.twig" %}
+{% include "WallabagCoreBundle::_top.html.twig" %}
 <div id="main">
     {% block menu %}{% endblock %}
     {% block precontent %}{% endblock %}
@@ -28,6 +28,6 @@
         {% block content %}{% endblock %}
     </div>
 </div>
-{% include "WallabagBundle::_footer.html.twig" %}
+{% include "WallabagCoreBundle::_footer.html.twig" %}
 </body>
 </html>
\ No newline at end of file
diff --git a/src/WallabagBundle/Tests/Controller/DefaultControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/DefaultControllerTest.php
similarity index 89%
rename from src/WallabagBundle/Tests/Controller/DefaultControllerTest.php
rename to src/Wallabag/CoreBundle/Tests/Controller/DefaultControllerTest.php
index 64b389bbe..af20f31f1 100644
--- a/src/WallabagBundle/Tests/Controller/DefaultControllerTest.php
+++ b/src/Wallabag/CoreBundle/Tests/Controller/DefaultControllerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WallabagBundle\Tests\Controller;
+namespace Wallabag\CoreBundle\Tests\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
diff --git a/src/WallabagBundle/Twig/Extension/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/Extension/WallabagExtension.php
similarity index 94%
rename from src/WallabagBundle/Twig/Extension/WallabagExtension.php
rename to src/Wallabag/CoreBundle/Twig/Extension/WallabagExtension.php
index 741fb1910..0b004a307 100644
--- a/src/WallabagBundle/Twig/Extension/WallabagExtension.php
+++ b/src/Wallabag/CoreBundle/Twig/Extension/WallabagExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WallabagBundle\Twig\Extension;
+namespace Wallabag\CoreBundle\Twig\Extension;
 
 class WallabagExtension extends \Twig_Extension
 {
diff --git a/src/Wallabag/CoreBundle/WallabagCoreBundle.php b/src/Wallabag/CoreBundle/WallabagCoreBundle.php
new file mode 100644
index 000000000..f5899e39c
--- /dev/null
+++ b/src/Wallabag/CoreBundle/WallabagCoreBundle.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Wallabag\CoreBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class WallabagCoreBundle extends Bundle
+{
+}
diff --git a/src/Wallabag/Wallabag/Database.php b/src/Wallabag/Wallabag/Database.php
index 47fa99aa8..290731088 100755
--- a/src/Wallabag/Wallabag/Database.php
+++ b/src/Wallabag/Wallabag/Database.php
@@ -11,7 +11,7 @@
 namespace Wallabag\Wallabag;
 
 use \PDO;
-use WallabagBundle\Entity;
+use CoreBundle\Entity;
 
 class Database {
 
diff --git a/src/WallabagBundle/Resources/config/routing.yml b/src/WallabagBundle/Resources/config/routing.yml
deleted file mode 100644
index ad79b1f08..000000000
--- a/src/WallabagBundle/Resources/config/routing.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_wllbg:
-    resource: "@WallabagBundle/Controller/EntryController.php"
-    type:     annotation
diff --git a/src/WallabagBundle/WallabagBundle.php b/src/WallabagBundle/WallabagBundle.php
deleted file mode 100644
index ddfb13f95..000000000
--- a/src/WallabagBundle/WallabagBundle.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace WallabagBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class WallabagBundle extends Bundle
-{
-}