diff --git a/Classes/Sitegeist/MagicWand/Command/AbstractCommandController.php b/Classes/Command/AbstractCommandController.php
similarity index 100%
rename from Classes/Sitegeist/MagicWand/Command/AbstractCommandController.php
rename to Classes/Command/AbstractCommandController.php
diff --git a/Classes/Sitegeist/MagicWand/Command/CloneCommandController.php b/Classes/Command/CloneCommandController.php
similarity index 100%
rename from Classes/Sitegeist/MagicWand/Command/CloneCommandController.php
rename to Classes/Command/CloneCommandController.php
diff --git a/Classes/Sitegeist/MagicWand/Command/StashCommandController.php b/Classes/Command/StashCommandController.php
similarity index 100%
rename from Classes/Sitegeist/MagicWand/Command/StashCommandController.php
rename to Classes/Command/StashCommandController.php
diff --git a/Classes/Sitegeist/MagicWand/DBAL/SimpleDBAL.php b/Classes/DBAL/SimpleDBAL.php
similarity index 100%
rename from Classes/Sitegeist/MagicWand/DBAL/SimpleDBAL.php
rename to Classes/DBAL/SimpleDBAL.php
diff --git a/composer.json b/composer.json
index 1628ea2..23979aa 100644
--- a/composer.json
+++ b/composer.json
@@ -19,8 +19,8 @@
         "neos/flow": "^5.0 || dev-master"
     },
     "autoload": {
-        "psr-0": {
-            "Sitegeist\\MagicWand": "Classes"
+        "psr-4": {
+            "Sitegeist\\MagicWand\\": "Classes"
         }
     },
     "extra": {