diff --git a/app/SculpinKernel.php b/app/SculpinKernel.php
index 36416ff0..025e686f 100644
--- a/app/SculpinKernel.php
+++ b/app/SculpinKernel.php
@@ -1,15 +1,11 @@
 <?php
 
-use App\FormatTalks\FormatTalksBundle;
-use App\FormatTalks\SculpinFormatTalksBundle;
+use FormatTalksBundle\SculpinFormatTalksBundle;
 use Opdavies\Sculpin\Bundle\ContentGeneratorBundle\SculpinContentGeneratorBundle;
 use Opdavies\Sculpin\Bundle\GistEmbedBundle\SculpinGistEmbedBundle;
 use Opdavies\Sculpin\Bundle\TwigMarkdownBundle\SculpinTwigMarkdownBundle;
 use Sculpin\Bundle\SculpinBundle\HttpKernel\AbstractKernel;
 
-/**
- * Class SculpinKernel
- */
 class SculpinKernel extends AbstractKernel
 {
     /**
diff --git a/composer.json b/composer.json
index 181d6a9e..f1b90d03 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\FormatTalks\\": "src/format-talks-bundle/src"
+            "FormatTalksBundle\\": "src/FormatTalksBundle"
         }
     },
     "extra": {
diff --git a/src/format-talks-bundle/src/DependencyInjection/SculpinFormatTalksExtension.php b/src/FormatTalksBundle/DependencyInjection/SculpinFormatTalksExtension.php
similarity index 85%
rename from src/format-talks-bundle/src/DependencyInjection/SculpinFormatTalksExtension.php
rename to src/FormatTalksBundle/DependencyInjection/SculpinFormatTalksExtension.php
index 68e24467..a992f0f3 100644
--- a/src/format-talks-bundle/src/DependencyInjection/SculpinFormatTalksExtension.php
+++ b/src/FormatTalksBundle/DependencyInjection/SculpinFormatTalksExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\FormatTalks\DependencyInjection;
+namespace FormatTalksBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -14,7 +14,7 @@ class SculpinFormatTalksExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../../Resources/config'));
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yml');
     }
 }
diff --git a/src/FormatTalksBundle/Resources/config/services.yml b/src/FormatTalksBundle/Resources/config/services.yml
new file mode 100644
index 00000000..9d07c21f
--- /dev/null
+++ b/src/FormatTalksBundle/Resources/config/services.yml
@@ -0,0 +1,5 @@
+services:
+    twig.format_talks:
+        class: 'FormatTalksBundle\Twig\FormatTalksExtension'
+        tags:
+            - { name: twig.extension }
diff --git a/src/format-talks-bundle/src/SculpinFormatTalksBundle.php b/src/FormatTalksBundle/SculpinFormatTalksBundle.php
similarity index 78%
rename from src/format-talks-bundle/src/SculpinFormatTalksBundle.php
rename to src/FormatTalksBundle/SculpinFormatTalksBundle.php
index 73f29cb7..c732264c 100644
--- a/src/format-talks-bundle/src/SculpinFormatTalksBundle.php
+++ b/src/FormatTalksBundle/SculpinFormatTalksBundle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\FormatTalks;
+namespace FormatTalksBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
diff --git a/src/format-talks-bundle/src/Twig/FormatTalksExtension.php b/src/FormatTalksBundle/Twig/FormatTalksExtension.php
similarity index 84%
rename from src/format-talks-bundle/src/Twig/FormatTalksExtension.php
rename to src/FormatTalksBundle/Twig/FormatTalksExtension.php
index 41c43921..a524707f 100644
--- a/src/format-talks-bundle/src/Twig/FormatTalksExtension.php
+++ b/src/FormatTalksBundle/Twig/FormatTalksExtension.php
@@ -1,11 +1,8 @@
 <?php
 
-namespace App\FormatTalks\Twig;
+namespace FormatTalksBundle\Twig;
 
-use Twig_Extension;
-use Twig_SimpleFilter;
-
-class FormatTalksExtension extends Twig_Extension
+class FormatTalksExtension extends \Twig_Extension
 {
     /**
      * {@inheritdoc}
@@ -13,7 +10,7 @@ class FormatTalksExtension extends Twig_Extension
     public function getFilters()
     {
         return [
-            new Twig_SimpleFilter('format_talks', [$this, 'formatTalks']),
+            new \Twig_SimpleFilter('format_talks', [$this, 'formatTalks']),
         ];
     }
 
diff --git a/src/format-talks-bundle/composer.json b/src/FormatTalksBundle/composer.json
similarity index 100%
rename from src/format-talks-bundle/composer.json
rename to src/FormatTalksBundle/composer.json
diff --git a/src/format-talks-bundle/Resources/config/services.yml b/src/format-talks-bundle/Resources/config/services.yml
deleted file mode 100644
index b332a7a3..00000000
--- a/src/format-talks-bundle/Resources/config/services.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-services:
-    app.twig.format_talks:
-        class: 'App\FormatTalks\Twig\FormatTalksExtension'
-        tags:
-            - { name: twig.extension }