diff --git a/composer.json b/composer.json
index 8f1e4ec..a1687dc 100644
--- a/composer.json
+++ b/composer.json
@@ -25,12 +25,9 @@
 		"php" : ">=5.3.0"
 	},
 	"autoload" : {
-		"psr-0" : {
-			"Webpatser\\Countries" : "src/"
-		},
-		"classmap" : [
-			"src/commands"
-		]
+		"psr-4" : {
+			"Webpatser\\Countries\\" :["src/Webpatser/Countries", "src/commands"]
+		}
 	},
 	"minimum-stability" : "dev",
 	"support" : {