diff --git a/composer.json b/composer.json
index 41529cc..be0b7de 100644
--- a/composer.json
+++ b/composer.json
@@ -96,6 +96,9 @@
 		"twig/twig": "required by yii2-twig extension"
 	},
 	"autoload": {
+		"psr-4": {
+			"yii\\faker\\": "extensions/faker/"
+		},
 		"psr-0": {
 			"yii\\apidoc\\": "extensions/",
 			"yii\\authclient\\": "extensions/",
@@ -103,7 +106,6 @@
 			"yii\\codeception\\": "extensions/",
 			"yii\\debug\\": "extensions/",
 			"yii\\elasticsearch\\": "extensions/",
-			"yii\\faker\\": "extensions/",
 			"yii\\gii\\": "extensions/",
 			"yii\\imagine\\" : "extensions/",
 			"yii\\jui\\": "extensions/",
diff --git a/extensions/yii/faker/CHANGELOG.md b/extensions/faker/CHANGELOG.md
similarity index 100%
rename from extensions/yii/faker/CHANGELOG.md
rename to extensions/faker/CHANGELOG.md
diff --git a/extensions/yii/faker/FixtureController.php b/extensions/faker/FixtureController.php
similarity index 100%
rename from extensions/yii/faker/FixtureController.php
rename to extensions/faker/FixtureController.php
diff --git a/extensions/yii/faker/LICENSE.md b/extensions/faker/LICENSE.md
similarity index 100%
rename from extensions/yii/faker/LICENSE.md
rename to extensions/faker/LICENSE.md
diff --git a/extensions/yii/faker/README.md b/extensions/faker/README.md
similarity index 100%
rename from extensions/yii/faker/README.md
rename to extensions/faker/README.md
diff --git a/extensions/yii/faker/composer.json b/extensions/faker/composer.json
similarity index 89%
rename from extensions/yii/faker/composer.json
rename to extensions/faker/composer.json
index 526aa1d..5af5319 100644
--- a/extensions/yii/faker/composer.json
+++ b/extensions/faker/composer.json
@@ -21,7 +21,6 @@
 		"fzaninotto/faker": "*"
 	},
 	"autoload": {
-		"psr-0": { "yii\\faker\\": "" }
-	},
-	"target-dir": "yii/faker"
-}
\ No newline at end of file
+		"psr-4": { "yii\\faker\\": "" }
+	}
+}