diff --git a/.php_cs.dist b/.php_cs.dist
index f0f8c35f..218c1a41 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -4,7 +4,7 @@ use PhpCsFixer\Config;
 use Symfony\Component\Finder\Finder;
 
 $finder = new Finder();
-$finder->files()->in('app/src')->in('app/tests');
+$finder->files()->in(['src', 'tests']);
 
 return Config::create()
     ->setRules([
diff --git a/composer.json b/composer.json
index 57887629..31be5f89 100644
--- a/composer.json
+++ b/composer.json
@@ -55,12 +55,12 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\": "app/src"
+            "App\\": "src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\Tests\\": "app/tests"
+            "App\\Tests\\": "tests"
         }
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
index 505ac39a..866b55f5 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,6 +1,6 @@
 parameters:
   level: 7
   paths:
-    - app/src
+    - src
 includes:
   - vendor/phpstan/phpstan-deprecation-rules/rules.neon
diff --git a/app/src/Asset/TwigExtension/EncoreExtension.php b/src/Asset/TwigExtension/EncoreExtension.php
similarity index 100%
rename from app/src/Asset/TwigExtension/EncoreExtension.php
rename to src/Asset/TwigExtension/EncoreExtension.php
diff --git a/app/src/Talk/TwigExtension/TalksExtension.php b/src/Talk/TwigExtension/TalksExtension.php
similarity index 100%
rename from app/src/Talk/TwigExtension/TalksExtension.php
rename to src/Talk/TwigExtension/TalksExtension.php
diff --git a/app/tests/Talk/TwigExtension/RetrievingEventsTest.php b/tests/Talk/TwigExtension/RetrievingEventsTest.php
similarity index 100%
rename from app/tests/Talk/TwigExtension/RetrievingEventsTest.php
rename to tests/Talk/TwigExtension/RetrievingEventsTest.php
diff --git a/app/tests/Talk/TwigExtension/RetrievingTalksTest.php b/tests/Talk/TwigExtension/RetrievingTalksTest.php
similarity index 100%
rename from app/tests/Talk/TwigExtension/RetrievingTalksTest.php
rename to tests/Talk/TwigExtension/RetrievingTalksTest.php