diff --git a/composer.json b/composer.json
index 90be3b2..4018174 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,9 @@
     },
     "autoload": {
         "psr-4": {
-            "Mage\\": "./Mage"
+            "Mage\\": "./Mage",
+            "Task\\": ".mage/tasks",
+            "Command\\": ".mage/commands"
         }
     },
     "bin": [