diff --git a/bin/mage b/bin/mage
index 728e3aa..986bafb 100755
--- a/bin/mage
+++ b/bin/mage
@@ -18,6 +18,8 @@ define('MAGALLANES_DIRECTORY', $baseDir);
 
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
     require_once __DIR__ . '/../vendor/autoload.php';
+} else if (file_exists(__DIR__ . '/../../../autoload.php')) {
+    require_once __DIR__ . '/../../../autoload.php';
 } else {
     require_once $baseDir . '/Mage/Autoload.php';
     $loader = new \Mage\Autoload();
diff --git a/composer.json b/composer.json
index 4018174..f921960 100644
--- a/composer.json
+++ b/composer.json
@@ -11,8 +11,8 @@
     "autoload": {
         "psr-4": {
             "Mage\\": "./Mage",
-            "Task\\": ".mage/tasks",
-            "Command\\": ".mage/commands"
+            "Task\\": [".mage/tasks", "../../../.mage/tasks"],
+            "Command\\": [".mage/tasks", "../../../.mage/commands"]
         }
     },
     "bin": [