diff --git a/app/SculpinKernel.php b/app/SculpinKernel.php
index 93b4fdcb..4bf606bb 100644
--- a/app/SculpinKernel.php
+++ b/app/SculpinKernel.php
@@ -1,12 +1,10 @@
 <?php
 
-use FormatTalksBundle\SculpinFormatTalksBundle;
+use App\Talks\SculpinTalksBundle;
 use Opdavies\Sculpin\Bundle\ContentGeneratorBundle\SculpinContentGeneratorBundle;
 use Opdavies\Sculpin\Bundle\GistEmbedBundle\SculpinGistEmbedBundle;
 use Opdavies\Sculpin\Bundle\TwigMarkdownBundle\SculpinTwigMarkdownBundle;
 use Sculpin\Bundle\SculpinBundle\HttpKernel\AbstractKernel;
-use TalksBundle\SculpinTalksBundle;
-use WebsiteBundle\SculpinWebsiteBundle;
 
 class SculpinKernel extends AbstractKernel
 {
diff --git a/composer.json b/composer.json
index cfeded48..daad412e 100644
--- a/composer.json
+++ b/composer.json
@@ -38,12 +38,12 @@
     },
     "autoload": {
         "psr-4": {
-            "TalksBundle\\": "src/TalksBundle"
+            "App\\Talks\\": "src/Talks/src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests"
+            "App\\Tests\\Talks\\": "src/Talks/tests"
         }
     },
     "extra": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index fc4f4f44..0cde5455 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -6,8 +6,8 @@
          convertWarningsToExceptions="true"
          stopOnFailure="true">
     <testsuites>
-        <testsuite name="Bundles">
-            <directory suffix="Test.php">tests</directory>
+        <testsuite name="Talks">
+            <directory suffix="Test.php">src/Talks/tests</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/src/TalksBundle/composer.json b/src/Talks/composer.json
similarity index 100%
rename from src/TalksBundle/composer.json
rename to src/Talks/composer.json
diff --git a/src/TalksBundle/DependencyInjection/SculpinTalksExtension.php b/src/Talks/src/DependencyInjection/SculpinTalksExtension.php
similarity index 92%
rename from src/TalksBundle/DependencyInjection/SculpinTalksExtension.php
rename to src/Talks/src/DependencyInjection/SculpinTalksExtension.php
index 39d2bb8d..edc61641 100644
--- a/src/TalksBundle/DependencyInjection/SculpinTalksExtension.php
+++ b/src/Talks/src/DependencyInjection/SculpinTalksExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace TalksBundle\DependencyInjection;
+namespace App\Talks\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
diff --git a/src/TalksBundle/Resources/config/services.yml b/src/Talks/src/Resources/config/services.yml
similarity index 59%
rename from src/TalksBundle/Resources/config/services.yml
rename to src/Talks/src/Resources/config/services.yml
index 426e5f86..5d5154d6 100644
--- a/src/TalksBundle/Resources/config/services.yml
+++ b/src/Talks/src/Resources/config/services.yml
@@ -1,5 +1,5 @@
 services:
     twig.format_talks:
-        class: 'TalksBundle\TwigExtension\TalksExtension'
+        class: 'App\Talks\TwigExtension\TalksExtension'
         tags:
             - { name: twig.extension }
diff --git a/src/TalksBundle/SculpinTalksBundle.php b/src/Talks/src/SculpinTalksBundle.php
similarity index 81%
rename from src/TalksBundle/SculpinTalksBundle.php
rename to src/Talks/src/SculpinTalksBundle.php
index 16eb8f32..0f77d69d 100644
--- a/src/TalksBundle/SculpinTalksBundle.php
+++ b/src/Talks/src/SculpinTalksBundle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace TalksBundle;
+namespace App\Talks;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
diff --git a/src/TalksBundle/TwigExtension/TalksExtension.php b/src/Talks/src/TwigExtension/TalksExtension.php
similarity index 98%
rename from src/TalksBundle/TwigExtension/TalksExtension.php
rename to src/Talks/src/TwigExtension/TalksExtension.php
index 18e67e91..4564ad9b 100644
--- a/src/TalksBundle/TwigExtension/TalksExtension.php
+++ b/src/Talks/src/TwigExtension/TalksExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace TalksBundle\TwigExtension;
+namespace App\Talks\TwigExtension;
 
 use Illuminate\Support\Collection;
 use Sculpin\Contrib\ProxySourceCollection\ProxySourceCollection;
diff --git a/tests/TalksBundle/TwigExtension/TalksExtensionTest.php b/src/Talks/tests/TwigExtension/TalksExtensionTest.php
similarity index 97%
rename from tests/TalksBundle/TwigExtension/TalksExtensionTest.php
rename to src/Talks/tests/TwigExtension/TalksExtensionTest.php
index 90d1c276..3cef463e 100644
--- a/tests/TalksBundle/TwigExtension/TalksExtensionTest.php
+++ b/src/Talks/tests/TwigExtension/TalksExtensionTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\FormatTalksBundle\TwigExtension;
+namespace App\Tests\Talks\TwigExtension;
 
 use DateTime;
-use TalksBundle\TwigExtension\TalksExtension;
+use App\Talks\TwigExtension\TalksExtension;
 use Illuminate\Support\Collection;
 use PHPUnit\Framework\TestCase;