diff --git a/extensions/composer/yii/composer/Installer.php b/extensions/composer/Installer.php
similarity index 100%
rename from extensions/composer/yii/composer/Installer.php
rename to extensions/composer/Installer.php
diff --git a/extensions/composer/yii/composer/Plugin.php b/extensions/composer/Plugin.php
similarity index 100%
rename from extensions/composer/yii/composer/Plugin.php
rename to extensions/composer/Plugin.php
diff --git a/extensions/composer/composer.json b/extensions/composer/composer.json
index 74295a0923..ff0785c081 100644
--- a/extensions/composer/composer.json
+++ b/extensions/composer/composer.json
@@ -21,6 +21,7 @@
 	"autoload": {
 		"psr-0": { "yii\\composer\\": "" }
 	},
+	"target-dir": "yii/composer",
 	"extra": {
 		"class": "yii\\composer\\Plugin"
 	},
diff --git a/extensions/smarty/yii/smarty/ViewRenderer.php b/extensions/smarty/ViewRenderer.php
similarity index 100%
rename from extensions/smarty/yii/smarty/ViewRenderer.php
rename to extensions/smarty/ViewRenderer.php
diff --git a/extensions/smarty/composer.json b/extensions/smarty/composer.json
index 90a154f8c8..566187a316 100644
--- a/extensions/smarty/composer.json
+++ b/extensions/smarty/composer.json
@@ -24,5 +24,6 @@
 	},
 	"autoload": {
 		"psr-0": { "yii\\smarty\\": "" }
-	}
+	},
+	"target-dir": "yii/smarty"
 }
diff --git a/extensions/twig/yii/twig/ViewRenderer.php b/extensions/twig/ViewRenderer.php
similarity index 100%
rename from extensions/twig/yii/twig/ViewRenderer.php
rename to extensions/twig/ViewRenderer.php
diff --git a/extensions/twig/composer.json b/extensions/twig/composer.json
index f67cbbd91c..c57c65df3d 100644
--- a/extensions/twig/composer.json
+++ b/extensions/twig/composer.json
@@ -24,5 +24,6 @@
 	},
 	"autoload": {
 		"psr-0": { "yii\\twig\\": "" }
-	}
+	},
+	"target-dir": "yii/twig"
 }