diff --git a/Resources/config/services.yaml b/Resources/config/services.yaml
index c7e960e..cf385e4 100644
--- a/Resources/config/services.yaml
+++ b/Resources/config/services.yaml
@@ -4,7 +4,7 @@ services:
         autoconfigure: true
 
     KimaiPlugin\KimaiHeatmapBundle\:
-        resource: '../../{Controller,Service,Widget,EventSubscriber}/'
+        resource: '../../src/{Controller,Service,Widget,EventSubscriber}/'
 
     KimaiPlugin\KimaiHeatmapBundle\KimaiHeatmapBundle:
         tags: ['App\Plugin\PluginInterface']
diff --git a/composer.json b/composer.json
index 1b93d7b..277041d 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "license": "MIT",
     "autoload": {
         "psr-4": {
-            "KimaiPlugin\\KimaiHeatmapBundle\\": ""
+            "KimaiPlugin\\KimaiHeatmapBundle\\": "src/"
         }
     },
     "extra": {
diff --git a/Controller/HeatmapController.php b/src/Controller/HeatmapController.php
similarity index 100%
rename from Controller/HeatmapController.php
rename to src/Controller/HeatmapController.php
diff --git a/DependencyInjection/KimaiHeatmapExtension.php b/src/DependencyInjection/KimaiHeatmapExtension.php
similarity index 100%
rename from DependencyInjection/KimaiHeatmapExtension.php
rename to src/DependencyInjection/KimaiHeatmapExtension.php
diff --git a/EventSubscriber/DashboardSubscriber.php b/src/EventSubscriber/DashboardSubscriber.php
similarity index 100%
rename from EventSubscriber/DashboardSubscriber.php
rename to src/EventSubscriber/DashboardSubscriber.php
diff --git a/KimaiHeatmapBundle.php b/src/KimaiHeatmapBundle.php
similarity index 100%
rename from KimaiHeatmapBundle.php
rename to src/KimaiHeatmapBundle.php
diff --git a/Service/HeatmapService.php b/src/Service/HeatmapService.php
similarity index 100%
rename from Service/HeatmapService.php
rename to src/Service/HeatmapService.php
diff --git a/Widget/HeatmapWidget.php b/src/Widget/HeatmapWidget.php
similarity index 100%
rename from Widget/HeatmapWidget.php
rename to src/Widget/HeatmapWidget.php