diff --git a/composer.json b/composer.json
index f3834fb..f4b9ce8 100644
--- a/composer.json
+++ b/composer.json
@@ -24,8 +24,11 @@
         "phing/phing": "2.*"
     },
     "autoload": {
-        "psr-4": {
-            "Esendex\\": "src/"
+        "psr-0": {
+            "Esendex": "src/"
         }
+    },
+    "config": {
+        "optimize-autoloader": true
     }
 }
diff --git a/src/autoload.php b/src/Esendex/AutoLoad.php
similarity index 100%
rename from src/autoload.php
rename to src/Esendex/AutoLoad.php