diff --git a/composer.json b/composer.json
index be0b7de..368c817 100644
--- a/composer.json
+++ b/composer.json
@@ -97,7 +97,8 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"yii\\faker\\": "extensions/faker/"
+			"yii\\faker\\": "extensions/faker/",
+			"yii\\twig\\": "extensions/twig/"
 		},
 		"psr-0": {
 			"yii\\apidoc\\": "extensions/",
@@ -114,7 +115,6 @@
 			"yii\\smarty\\": "extensions/",
 			"yii\\swiftmailer\\": "extensions/",
 			"yii\\sphinx\\": "extensions/",
-			"yii\\twig\\": "extensions/",
 			"yii\\": "framework/"
 		}
 	}
diff --git a/extensions/yii/twig/CHANGELOG.md b/extensions/twig/CHANGELOG.md
similarity index 100%
rename from extensions/yii/twig/CHANGELOG.md
rename to extensions/twig/CHANGELOG.md
diff --git a/extensions/yii/twig/LICENSE.md b/extensions/twig/LICENSE.md
similarity index 100%
rename from extensions/yii/twig/LICENSE.md
rename to extensions/twig/LICENSE.md
diff --git a/extensions/yii/twig/README.md b/extensions/twig/README.md
similarity index 100%
rename from extensions/yii/twig/README.md
rename to extensions/twig/README.md
diff --git a/extensions/yii/twig/TwigSimpleFileLoader.php b/extensions/twig/TwigSimpleFileLoader.php
similarity index 100%
rename from extensions/yii/twig/TwigSimpleFileLoader.php
rename to extensions/twig/TwigSimpleFileLoader.php
diff --git a/extensions/yii/twig/ViewRenderer.php b/extensions/twig/ViewRenderer.php
similarity index 100%
rename from extensions/yii/twig/ViewRenderer.php
rename to extensions/twig/ViewRenderer.php
diff --git a/extensions/yii/twig/ViewRendererStaticClassProxy.php b/extensions/twig/ViewRendererStaticClassProxy.php
similarity index 100%
rename from extensions/yii/twig/ViewRendererStaticClassProxy.php
rename to extensions/twig/ViewRendererStaticClassProxy.php
diff --git a/extensions/yii/twig/composer.json b/extensions/twig/composer.json
similarity index 90%
rename from extensions/yii/twig/composer.json
rename to extensions/twig/composer.json
index 1e7f49e..1638058 100644
--- a/extensions/yii/twig/composer.json
+++ b/extensions/twig/composer.json
@@ -22,7 +22,6 @@
 		"twig/twig": "*"
 	},
 	"autoload": {
-		"psr-0": { "yii\\twig\\": "" }
-	},
-	"target-dir": "yii/twig"
+		"psr-4": { "yii\\twig\\": "" }
+	}
 }