diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml
index a073187e..37fc63d4 100644
--- a/app/config/sculpin_kernel.yml
+++ b/app/config/sculpin_kernel.yml
@@ -12,9 +12,9 @@ sculpin_content_types:
     permalink: /presentations/:basename/
 
 services:
-  Modules\Experience\TwigExtension\ExperienceTwigExtension:
+  App\Experience\TwigExtension\ExperienceTwigExtension:
     tags:
       - {name: twig.extension}
-  Modules\Presentations\TwigExtension\PresentationTwigExtension:
+  App\Presentations\TwigExtension\PresentationTwigExtension:
     tags:
       - {name: twig.extension}
diff --git a/composer.json b/composer.json
index 5397a438..83f1ea95 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,13 @@
     },
     "autoload": {
         "psr-4": {
-            "Modules\\": "modules/" }
+            "App\\": "src/"
+        }
+   },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
    },
     "require-dev": {
         "phpunit/phpunit": "^11.1"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e23be814..5d785540 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" colors="true" stopOnFailure="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.1/phpunit.xsd" cacheDirectory=".phpunit.cache">
   <testsuites>
-    <testsuite name="Modules">
-      <directory suffix="Test.php">modules</directory>
+    <testsuite name="App">
+      <directory suffix="Test.php">tests</directory>
     </testsuite>
   </testsuites>
 </phpunit>
diff --git a/modules/Experience/TwigExtension/ExperienceTwigExtension.php b/src/Experience/TwigExtension/ExperienceTwigExtension.php
similarity index 87%
rename from modules/Experience/TwigExtension/ExperienceTwigExtension.php
rename to src/Experience/TwigExtension/ExperienceTwigExtension.php
index 378e0729..56886e56 100644
--- a/modules/Experience/TwigExtension/ExperienceTwigExtension.php
+++ b/src/Experience/TwigExtension/ExperienceTwigExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Experience\TwigExtension;
+namespace App\Experience\TwigExtension;
 
 use Sculpin\Contrib\ProxySourceCollection\ProxySourceItem;
 use Twig\Extension\AbstractExtension;
@@ -19,7 +19,7 @@ class ExperienceTwigExtension extends AbstractExtension
 
     public function getName(): string
     {
-        return 'modules.experience';
+        return 'experience';
     }
 
     public function getYearsOfExperience(): int
diff --git a/modules/Presentations/TwigExtension/PresentationTwigExtension.php b/src/Presentations/TwigExtension/PresentationTwigExtension.php
similarity index 91%
rename from modules/Presentations/TwigExtension/PresentationTwigExtension.php
rename to src/Presentations/TwigExtension/PresentationTwigExtension.php
index de4d6617..24e66599 100644
--- a/modules/Presentations/TwigExtension/PresentationTwigExtension.php
+++ b/src/Presentations/TwigExtension/PresentationTwigExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Presentations\TwigExtension;
+namespace App\Presentations\TwigExtension;
 
 use Sculpin\Contrib\ProxySourceCollection\ProxySourceItem;
 use Twig\Extension\AbstractExtension;
@@ -17,7 +17,7 @@ class PresentationTwigExtension extends AbstractExtension
 
     public function getName(): string
     {
-        return 'modules.presentations';
+        return 'presentations';
     }
 
     public function getPresentationCount(array $presentations): int
diff --git a/modules/Presentations/Tests/TwigExtension/PresentationTwigExtensionTest.php b/tests/TwigExtension/PresentationTwigExtensionTest.php
similarity index 97%
rename from modules/Presentations/Tests/TwigExtension/PresentationTwigExtensionTest.php
rename to tests/TwigExtension/PresentationTwigExtensionTest.php
index 29df7894..e0f33993 100644
--- a/modules/Presentations/Tests/TwigExtension/PresentationTwigExtensionTest.php
+++ b/tests/TwigExtension/PresentationTwigExtensionTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Modules\Presentations\Tests\TwigExtension;
+namespace Tests\Presentations\Tests\TwigExtension;
 
+use App\Presentations\TwigExtension\PresentationTwigExtension;
 use Dflydev\DotAccessConfiguration\Configuration;
-use Modules\Presentations\TwigExtension\PresentationTwigExtension;
 use PHPUnit\Framework\TestCase;
 use Sculpin\Contrib\ProxySourceCollection\ProxySourceItem;