diff --git a/Classes/DigiComp/Menu/MenuService/ServiceInterface.php b/Classes/MenuService/ServiceInterface.php
similarity index 100%
rename from Classes/DigiComp/Menu/MenuService/ServiceInterface.php
rename to Classes/MenuService/ServiceInterface.php
diff --git a/Classes/DigiComp/Menu/MenuService/SettingsService.php b/Classes/MenuService/SettingsService.php
similarity index 100%
rename from Classes/DigiComp/Menu/MenuService/SettingsService.php
rename to Classes/MenuService/SettingsService.php
diff --git a/Classes/DigiComp/Menu/Package.php b/Classes/Package.php
similarity index 100%
rename from Classes/DigiComp/Menu/Package.php
rename to Classes/Package.php
diff --git a/Classes/DigiComp/Menu/ViewHelpers/MenuViewHelper.php b/Classes/ViewHelpers/MenuViewHelper.php
similarity index 100%
rename from Classes/DigiComp/Menu/ViewHelpers/MenuViewHelper.php
rename to Classes/ViewHelpers/MenuViewHelper.php
diff --git a/composer.json b/composer.json
index 2930300..afad4be 100644
--- a/composer.json
+++ b/composer.json
@@ -9,8 +9,8 @@
         "phpunit/phpunit": "3.7.*"
     },
     "autoload":{
-        "psr-0":{
-            "DigiComp\\Menu":"Classes"
+        "psr-4":{
+            "DigiComp\\Menu\\":"Classes"
         }
     },
     "extra": {