diff --git a/composer.json b/composer.json
index 229f258..0a16c43 100644
--- a/composer.json
+++ b/composer.json
@@ -26,12 +26,8 @@
 		"doctrine/orm" : "~2.2,>=2.2.3"
 	},
 	"autoload" : {
-		"psr-0" : {
-			"riccardonar\\Doctrine" : "src"
+		"psr-4" : {
+			"riccardonar\\Doctrine\\" : "src/"
 		}
-	},
-	"config" : {
-		"bin-dir" : "bin",
-		"vendor-dir" : "src/vendor"
 	}
-}
\ No newline at end of file
+}