diff --git a/composer.json b/composer.json
index c048716..6c1ca76 100644
--- a/composer.json
+++ b/composer.json
@@ -7,11 +7,15 @@
         {
             "name": "Kinn Coelho Julião",
             "email": "kinncj@php.net"
+        },
+        {
+            "name": "Henrique Moody",
+            "email": "henriquemoody@gmail.com"
         }
     ],
     "autoload": {
-        "psr-0": {
-            "PHPFluent\\EventManager": "src/"
+        "psr-4": {
+            "PHPFluent\\EventManager\\": "src/PHPFluent/EventManager"
         }
     },
     "require-dev": {
@@ -19,4 +23,4 @@
         "phpunit/phpunit": "~4.1",
         "squizlabs/php_codesniffer": "~1.5"
     }
-}
\ No newline at end of file
+}