diff --git a/composer.json b/composer.json
index 95d72a1..8babb23 100644
--- a/composer.json
+++ b/composer.json
@@ -97,6 +97,7 @@
 	},
 	"autoload": {
 		"psr-4": {
+			"yii\\": "framework/",
 			"yii\\apidoc\\": "extensions/apidoc/",
 			"yii\\authclient\\": "extensions/authclient/",
 			"yii\\bootstrap\\": "extensions/bootstrap/",
@@ -113,9 +114,6 @@
 			"yii\\swiftmailer\\": "extensions/swiftmailer/",
 			"yii\\sphinx\\": "extensions/sphinx/",
 			"yii\\twig\\": "extensions/twig/"
-		},
-		"psr-0": {
-			"yii\\": "framework/"
 		}
 	}
 }
diff --git a/framework/yii/.gitignore b/framework/.gitignore
similarity index 100%
rename from framework/yii/.gitignore
rename to framework/.gitignore
diff --git a/framework/yii/.htaccess b/framework/.htaccess
similarity index 100%
rename from framework/yii/.htaccess
rename to framework/.htaccess
diff --git a/framework/yii/BaseYii.php b/framework/BaseYii.php
similarity index 100%
rename from framework/yii/BaseYii.php
rename to framework/BaseYii.php
diff --git a/framework/yii/Yii.php b/framework/Yii.php
similarity index 100%
rename from framework/yii/Yii.php
rename to framework/Yii.php
diff --git a/framework/yii/assets/jquery.maskedinput.js b/framework/assets/jquery.maskedinput.js
similarity index 100%
rename from framework/yii/assets/jquery.maskedinput.js
rename to framework/assets/jquery.maskedinput.js
diff --git a/framework/yii/assets/punycode/LICENSE-GPL.txt b/framework/assets/punycode/LICENSE-GPL.txt
similarity index 100%
rename from framework/yii/assets/punycode/LICENSE-GPL.txt
rename to framework/assets/punycode/LICENSE-GPL.txt
diff --git a/framework/yii/assets/punycode/LICENSE-MIT.txt b/framework/assets/punycode/LICENSE-MIT.txt
similarity index 100%
rename from framework/yii/assets/punycode/LICENSE-MIT.txt
rename to framework/assets/punycode/LICENSE-MIT.txt
diff --git a/framework/yii/assets/punycode/punycode.js b/framework/assets/punycode/punycode.js
similarity index 100%
rename from framework/yii/assets/punycode/punycode.js
rename to framework/assets/punycode/punycode.js
diff --git a/framework/yii/assets/punycode/punycode.min.js b/framework/assets/punycode/punycode.min.js
similarity index 100%
rename from framework/yii/assets/punycode/punycode.min.js
rename to framework/assets/punycode/punycode.min.js
diff --git a/framework/yii/assets/yii.activeForm.js b/framework/assets/yii.activeForm.js
similarity index 100%
rename from framework/yii/assets/yii.activeForm.js
rename to framework/assets/yii.activeForm.js
diff --git a/framework/yii/assets/yii.captcha.js b/framework/assets/yii.captcha.js
similarity index 100%
rename from framework/yii/assets/yii.captcha.js
rename to framework/assets/yii.captcha.js
diff --git a/framework/yii/assets/yii.gridView.js b/framework/assets/yii.gridView.js
similarity index 100%
rename from framework/yii/assets/yii.gridView.js
rename to framework/assets/yii.gridView.js
diff --git a/framework/yii/assets/yii.js b/framework/assets/yii.js
similarity index 100%
rename from framework/yii/assets/yii.js
rename to framework/assets/yii.js
diff --git a/framework/yii/assets/yii.validation.js b/framework/assets/yii.validation.js
similarity index 100%
rename from framework/yii/assets/yii.validation.js
rename to framework/assets/yii.validation.js
diff --git a/framework/yii/base/Action.php b/framework/base/Action.php
similarity index 100%
rename from framework/yii/base/Action.php
rename to framework/base/Action.php
diff --git a/framework/yii/base/ActionEvent.php b/framework/base/ActionEvent.php
similarity index 100%
rename from framework/yii/base/ActionEvent.php
rename to framework/base/ActionEvent.php
diff --git a/framework/yii/base/ActionFilter.php b/framework/base/ActionFilter.php
similarity index 100%
rename from framework/yii/base/ActionFilter.php
rename to framework/base/ActionFilter.php
diff --git a/framework/yii/base/Application.php b/framework/base/Application.php
similarity index 100%
rename from framework/yii/base/Application.php
rename to framework/base/Application.php
diff --git a/framework/yii/base/Arrayable.php b/framework/base/Arrayable.php
similarity index 100%
rename from framework/yii/base/Arrayable.php
rename to framework/base/Arrayable.php
diff --git a/framework/yii/base/Behavior.php b/framework/base/Behavior.php
similarity index 100%
rename from framework/yii/base/Behavior.php
rename to framework/base/Behavior.php
diff --git a/framework/yii/base/Component.php b/framework/base/Component.php
similarity index 100%
rename from framework/yii/base/Component.php
rename to framework/base/Component.php
diff --git a/framework/yii/base/Controller.php b/framework/base/Controller.php
similarity index 100%
rename from framework/yii/base/Controller.php
rename to framework/base/Controller.php
diff --git a/framework/yii/base/ErrorException.php b/framework/base/ErrorException.php
similarity index 100%
rename from framework/yii/base/ErrorException.php
rename to framework/base/ErrorException.php
diff --git a/framework/yii/base/ErrorHandler.php b/framework/base/ErrorHandler.php
similarity index 100%
rename from framework/yii/base/ErrorHandler.php
rename to framework/base/ErrorHandler.php
diff --git a/framework/yii/base/Event.php b/framework/base/Event.php
similarity index 100%
rename from framework/yii/base/Event.php
rename to framework/base/Event.php
diff --git a/framework/yii/base/Exception.php b/framework/base/Exception.php
similarity index 100%
rename from framework/yii/base/Exception.php
rename to framework/base/Exception.php
diff --git a/framework/yii/base/Extension.php b/framework/base/Extension.php
similarity index 100%
rename from framework/yii/base/Extension.php
rename to framework/base/Extension.php
diff --git a/framework/yii/base/Formatter.php b/framework/base/Formatter.php
similarity index 100%
rename from framework/yii/base/Formatter.php
rename to framework/base/Formatter.php
diff --git a/framework/yii/base/InlineAction.php b/framework/base/InlineAction.php
similarity index 100%
rename from framework/yii/base/InlineAction.php
rename to framework/base/InlineAction.php
diff --git a/framework/yii/base/InvalidCallException.php b/framework/base/InvalidCallException.php
similarity index 100%
rename from framework/yii/base/InvalidCallException.php
rename to framework/base/InvalidCallException.php
diff --git a/framework/yii/base/InvalidConfigException.php b/framework/base/InvalidConfigException.php
similarity index 100%
rename from framework/yii/base/InvalidConfigException.php
rename to framework/base/InvalidConfigException.php
diff --git a/framework/yii/base/InvalidParamException.php b/framework/base/InvalidParamException.php
similarity index 100%
rename from framework/yii/base/InvalidParamException.php
rename to framework/base/InvalidParamException.php
diff --git a/framework/yii/base/InvalidRouteException.php b/framework/base/InvalidRouteException.php
similarity index 100%
rename from framework/yii/base/InvalidRouteException.php
rename to framework/base/InvalidRouteException.php
diff --git a/framework/yii/base/MailEvent.php b/framework/base/MailEvent.php
similarity index 100%
rename from framework/yii/base/MailEvent.php
rename to framework/base/MailEvent.php
diff --git a/framework/yii/base/Model.php b/framework/base/Model.php
similarity index 100%
rename from framework/yii/base/Model.php
rename to framework/base/Model.php
diff --git a/framework/yii/base/ModelEvent.php b/framework/base/ModelEvent.php
similarity index 100%
rename from framework/yii/base/ModelEvent.php
rename to framework/base/ModelEvent.php
diff --git a/framework/yii/base/Module.php b/framework/base/Module.php
similarity index 100%
rename from framework/yii/base/Module.php
rename to framework/base/Module.php
diff --git a/framework/yii/base/NotSupportedException.php b/framework/base/NotSupportedException.php
similarity index 100%
rename from framework/yii/base/NotSupportedException.php
rename to framework/base/NotSupportedException.php
diff --git a/framework/yii/base/Object.php b/framework/base/Object.php
similarity index 100%
rename from framework/yii/base/Object.php
rename to framework/base/Object.php
diff --git a/framework/yii/base/Request.php b/framework/base/Request.php
similarity index 100%
rename from framework/yii/base/Request.php
rename to framework/base/Request.php
diff --git a/framework/yii/base/Response.php b/framework/base/Response.php
similarity index 100%
rename from framework/yii/base/Response.php
rename to framework/base/Response.php
diff --git a/framework/yii/base/Theme.php b/framework/base/Theme.php
similarity index 100%
rename from framework/yii/base/Theme.php
rename to framework/base/Theme.php
diff --git a/framework/yii/base/UnknownClassException.php b/framework/base/UnknownClassException.php
similarity index 100%
rename from framework/yii/base/UnknownClassException.php
rename to framework/base/UnknownClassException.php
diff --git a/framework/yii/base/UnknownMethodException.php b/framework/base/UnknownMethodException.php
similarity index 100%
rename from framework/yii/base/UnknownMethodException.php
rename to framework/base/UnknownMethodException.php
diff --git a/framework/yii/base/UnknownPropertyException.php b/framework/base/UnknownPropertyException.php
similarity index 100%
rename from framework/yii/base/UnknownPropertyException.php
rename to framework/base/UnknownPropertyException.php
diff --git a/framework/yii/base/UserException.php b/framework/base/UserException.php
similarity index 100%
rename from framework/yii/base/UserException.php
rename to framework/base/UserException.php
diff --git a/framework/yii/base/View.php b/framework/base/View.php
similarity index 100%
rename from framework/yii/base/View.php
rename to framework/base/View.php
diff --git a/framework/yii/base/ViewContextInterface.php b/framework/base/ViewContextInterface.php
similarity index 100%
rename from framework/yii/base/ViewContextInterface.php
rename to framework/base/ViewContextInterface.php
diff --git a/framework/yii/base/ViewEvent.php b/framework/base/ViewEvent.php
similarity index 100%
rename from framework/yii/base/ViewEvent.php
rename to framework/base/ViewEvent.php
diff --git a/framework/yii/base/ViewRenderer.php b/framework/base/ViewRenderer.php
similarity index 100%
rename from framework/yii/base/ViewRenderer.php
rename to framework/base/ViewRenderer.php
diff --git a/framework/yii/base/Widget.php b/framework/base/Widget.php
similarity index 100%
rename from framework/yii/base/Widget.php
rename to framework/base/Widget.php
diff --git a/framework/yii/behaviors/AutoTimestamp.php b/framework/behaviors/AutoTimestamp.php
similarity index 100%
rename from framework/yii/behaviors/AutoTimestamp.php
rename to framework/behaviors/AutoTimestamp.php
diff --git a/framework/yii/caching/ApcCache.php b/framework/caching/ApcCache.php
similarity index 100%
rename from framework/yii/caching/ApcCache.php
rename to framework/caching/ApcCache.php
diff --git a/framework/yii/caching/Cache.php b/framework/caching/Cache.php
similarity index 100%
rename from framework/yii/caching/Cache.php
rename to framework/caching/Cache.php
diff --git a/framework/yii/caching/ChainedDependency.php b/framework/caching/ChainedDependency.php
similarity index 100%
rename from framework/yii/caching/ChainedDependency.php
rename to framework/caching/ChainedDependency.php
diff --git a/framework/yii/caching/DbCache.php b/framework/caching/DbCache.php
similarity index 100%
rename from framework/yii/caching/DbCache.php
rename to framework/caching/DbCache.php
diff --git a/framework/yii/caching/DbDependency.php b/framework/caching/DbDependency.php
similarity index 100%
rename from framework/yii/caching/DbDependency.php
rename to framework/caching/DbDependency.php
diff --git a/framework/yii/caching/Dependency.php b/framework/caching/Dependency.php
similarity index 100%
rename from framework/yii/caching/Dependency.php
rename to framework/caching/Dependency.php
diff --git a/framework/yii/caching/DummyCache.php b/framework/caching/DummyCache.php
similarity index 100%
rename from framework/yii/caching/DummyCache.php
rename to framework/caching/DummyCache.php
diff --git a/framework/yii/caching/ExpressionDependency.php b/framework/caching/ExpressionDependency.php
similarity index 100%
rename from framework/yii/caching/ExpressionDependency.php
rename to framework/caching/ExpressionDependency.php
diff --git a/framework/yii/caching/FileCache.php b/framework/caching/FileCache.php
similarity index 100%
rename from framework/yii/caching/FileCache.php
rename to framework/caching/FileCache.php
diff --git a/framework/yii/caching/FileDependency.php b/framework/caching/FileDependency.php
similarity index 100%
rename from framework/yii/caching/FileDependency.php
rename to framework/caching/FileDependency.php
diff --git a/framework/yii/caching/GroupDependency.php b/framework/caching/GroupDependency.php
similarity index 100%
rename from framework/yii/caching/GroupDependency.php
rename to framework/caching/GroupDependency.php
diff --git a/framework/yii/caching/MemCache.php b/framework/caching/MemCache.php
similarity index 100%
rename from framework/yii/caching/MemCache.php
rename to framework/caching/MemCache.php
diff --git a/framework/yii/caching/MemCacheServer.php b/framework/caching/MemCacheServer.php
similarity index 100%
rename from framework/yii/caching/MemCacheServer.php
rename to framework/caching/MemCacheServer.php
diff --git a/framework/yii/caching/WinCache.php b/framework/caching/WinCache.php
similarity index 100%
rename from framework/yii/caching/WinCache.php
rename to framework/caching/WinCache.php
diff --git a/framework/yii/caching/XCache.php b/framework/caching/XCache.php
similarity index 100%
rename from framework/yii/caching/XCache.php
rename to framework/caching/XCache.php
diff --git a/framework/yii/caching/ZendDataCache.php b/framework/caching/ZendDataCache.php
similarity index 100%
rename from framework/yii/caching/ZendDataCache.php
rename to framework/caching/ZendDataCache.php
diff --git a/framework/yii/captcha/Captcha.php b/framework/captcha/Captcha.php
similarity index 100%
rename from framework/yii/captcha/Captcha.php
rename to framework/captcha/Captcha.php
diff --git a/framework/yii/captcha/CaptchaAction.php b/framework/captcha/CaptchaAction.php
similarity index 100%
rename from framework/yii/captcha/CaptchaAction.php
rename to framework/captcha/CaptchaAction.php
diff --git a/framework/yii/captcha/CaptchaAsset.php b/framework/captcha/CaptchaAsset.php
similarity index 100%
rename from framework/yii/captcha/CaptchaAsset.php
rename to framework/captcha/CaptchaAsset.php
diff --git a/framework/yii/captcha/CaptchaValidator.php b/framework/captcha/CaptchaValidator.php
similarity index 100%
rename from framework/yii/captcha/CaptchaValidator.php
rename to framework/captcha/CaptchaValidator.php
diff --git a/framework/yii/captcha/SpicyRice.md b/framework/captcha/SpicyRice.md
similarity index 100%
rename from framework/yii/captcha/SpicyRice.md
rename to framework/captcha/SpicyRice.md
diff --git a/framework/yii/captcha/SpicyRice.ttf b/framework/captcha/SpicyRice.ttf
similarity index 100%
rename from framework/yii/captcha/SpicyRice.ttf
rename to framework/captcha/SpicyRice.ttf
diff --git a/framework/yii/classes.php b/framework/classes.php
similarity index 100%
rename from framework/yii/classes.php
rename to framework/classes.php
diff --git a/framework/composer.json b/framework/composer.json
index d3ed7e7..c96726c 100644
--- a/framework/composer.json
+++ b/framework/composer.json
@@ -59,6 +59,6 @@
 		"michelf/php-markdown": "1.3.*"
 	},
 	"autoload": {
-		"psr-0": { "yii\\": "" }
+		"psr-4": { "yii\\": "" }
 	}
 }
diff --git a/framework/yii/console/Application.php b/framework/console/Application.php
similarity index 100%
rename from framework/yii/console/Application.php
rename to framework/console/Application.php
diff --git a/framework/yii/console/Controller.php b/framework/console/Controller.php
similarity index 100%
rename from framework/yii/console/Controller.php
rename to framework/console/Controller.php
diff --git a/framework/yii/console/Exception.php b/framework/console/Exception.php
similarity index 100%
rename from framework/yii/console/Exception.php
rename to framework/console/Exception.php
diff --git a/framework/yii/console/Request.php b/framework/console/Request.php
similarity index 100%
rename from framework/yii/console/Request.php
rename to framework/console/Request.php
diff --git a/framework/yii/console/Response.php b/framework/console/Response.php
similarity index 100%
rename from framework/yii/console/Response.php
rename to framework/console/Response.php
diff --git a/framework/yii/console/controllers/AssetController.php b/framework/console/controllers/AssetController.php
similarity index 100%
rename from framework/yii/console/controllers/AssetController.php
rename to framework/console/controllers/AssetController.php
diff --git a/framework/yii/console/controllers/CacheController.php b/framework/console/controllers/CacheController.php
similarity index 100%
rename from framework/yii/console/controllers/CacheController.php
rename to framework/console/controllers/CacheController.php
diff --git a/framework/yii/console/controllers/FixtureController.php b/framework/console/controllers/FixtureController.php
similarity index 100%
rename from framework/yii/console/controllers/FixtureController.php
rename to framework/console/controllers/FixtureController.php
diff --git a/framework/yii/console/controllers/HelpController.php b/framework/console/controllers/HelpController.php
similarity index 100%
rename from framework/yii/console/controllers/HelpController.php
rename to framework/console/controllers/HelpController.php
diff --git a/framework/yii/console/controllers/MessageController.php b/framework/console/controllers/MessageController.php
similarity index 100%
rename from framework/yii/console/controllers/MessageController.php
rename to framework/console/controllers/MessageController.php
diff --git a/framework/yii/console/controllers/MigrateController.php b/framework/console/controllers/MigrateController.php
similarity index 100%
rename from framework/yii/console/controllers/MigrateController.php
rename to framework/console/controllers/MigrateController.php
diff --git a/framework/yii/console/runtime/.gitignore b/framework/console/runtime/.gitignore
similarity index 100%
rename from framework/yii/console/runtime/.gitignore
rename to framework/console/runtime/.gitignore
diff --git a/framework/yii/data/ActiveDataProvider.php b/framework/data/ActiveDataProvider.php
similarity index 100%
rename from framework/yii/data/ActiveDataProvider.php
rename to framework/data/ActiveDataProvider.php
diff --git a/framework/yii/data/ArrayDataProvider.php b/framework/data/ArrayDataProvider.php
similarity index 100%
rename from framework/yii/data/ArrayDataProvider.php
rename to framework/data/ArrayDataProvider.php
diff --git a/framework/yii/data/BaseDataProvider.php b/framework/data/BaseDataProvider.php
similarity index 100%
rename from framework/yii/data/BaseDataProvider.php
rename to framework/data/BaseDataProvider.php
diff --git a/framework/yii/data/DataProviderInterface.php b/framework/data/DataProviderInterface.php
similarity index 100%
rename from framework/yii/data/DataProviderInterface.php
rename to framework/data/DataProviderInterface.php
diff --git a/framework/yii/data/Pagination.php b/framework/data/Pagination.php
similarity index 100%
rename from framework/yii/data/Pagination.php
rename to framework/data/Pagination.php
diff --git a/framework/yii/data/Sort.php b/framework/data/Sort.php
similarity index 100%
rename from framework/yii/data/Sort.php
rename to framework/data/Sort.php
diff --git a/framework/yii/data/SqlDataProvider.php b/framework/data/SqlDataProvider.php
similarity index 100%
rename from framework/yii/data/SqlDataProvider.php
rename to framework/data/SqlDataProvider.php
diff --git a/framework/yii/db/ActiveQuery.php b/framework/db/ActiveQuery.php
similarity index 100%
rename from framework/yii/db/ActiveQuery.php
rename to framework/db/ActiveQuery.php
diff --git a/framework/yii/db/ActiveQueryInterface.php b/framework/db/ActiveQueryInterface.php
similarity index 100%
rename from framework/yii/db/ActiveQueryInterface.php
rename to framework/db/ActiveQueryInterface.php
diff --git a/framework/yii/db/ActiveQueryTrait.php b/framework/db/ActiveQueryTrait.php
similarity index 100%
rename from framework/yii/db/ActiveQueryTrait.php
rename to framework/db/ActiveQueryTrait.php
diff --git a/framework/yii/db/ActiveRecord.php b/framework/db/ActiveRecord.php
similarity index 100%
rename from framework/yii/db/ActiveRecord.php
rename to framework/db/ActiveRecord.php
diff --git a/framework/yii/db/ActiveRecordInterface.php b/framework/db/ActiveRecordInterface.php
similarity index 100%
rename from framework/yii/db/ActiveRecordInterface.php
rename to framework/db/ActiveRecordInterface.php
diff --git a/framework/yii/db/ActiveRelation.php b/framework/db/ActiveRelation.php
similarity index 100%
rename from framework/yii/db/ActiveRelation.php
rename to framework/db/ActiveRelation.php
diff --git a/framework/yii/db/ActiveRelationInterface.php b/framework/db/ActiveRelationInterface.php
similarity index 100%
rename from framework/yii/db/ActiveRelationInterface.php
rename to framework/db/ActiveRelationInterface.php
diff --git a/framework/yii/db/ActiveRelationTrait.php b/framework/db/ActiveRelationTrait.php
similarity index 100%
rename from framework/yii/db/ActiveRelationTrait.php
rename to framework/db/ActiveRelationTrait.php
diff --git a/framework/yii/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php
similarity index 100%
rename from framework/yii/db/BaseActiveRecord.php
rename to framework/db/BaseActiveRecord.php
diff --git a/framework/yii/db/ColumnSchema.php b/framework/db/ColumnSchema.php
similarity index 100%
rename from framework/yii/db/ColumnSchema.php
rename to framework/db/ColumnSchema.php
diff --git a/framework/yii/db/Command.php b/framework/db/Command.php
similarity index 100%
rename from framework/yii/db/Command.php
rename to framework/db/Command.php
diff --git a/framework/yii/db/Connection.php b/framework/db/Connection.php
similarity index 100%
rename from framework/yii/db/Connection.php
rename to framework/db/Connection.php
diff --git a/framework/yii/db/DataReader.php b/framework/db/DataReader.php
similarity index 100%
rename from framework/yii/db/DataReader.php
rename to framework/db/DataReader.php
diff --git a/framework/yii/db/Exception.php b/framework/db/Exception.php
similarity index 100%
rename from framework/yii/db/Exception.php
rename to framework/db/Exception.php
diff --git a/framework/yii/db/Expression.php b/framework/db/Expression.php
similarity index 100%
rename from framework/yii/db/Expression.php
rename to framework/db/Expression.php
diff --git a/framework/yii/db/Migration.php b/framework/db/Migration.php
similarity index 100%
rename from framework/yii/db/Migration.php
rename to framework/db/Migration.php
diff --git a/framework/yii/db/Query.php b/framework/db/Query.php
similarity index 100%
rename from framework/yii/db/Query.php
rename to framework/db/Query.php
diff --git a/framework/yii/db/QueryBuilder.php b/framework/db/QueryBuilder.php
similarity index 100%
rename from framework/yii/db/QueryBuilder.php
rename to framework/db/QueryBuilder.php
diff --git a/framework/yii/db/QueryInterface.php b/framework/db/QueryInterface.php
similarity index 100%
rename from framework/yii/db/QueryInterface.php
rename to framework/db/QueryInterface.php
diff --git a/framework/yii/db/QueryTrait.php b/framework/db/QueryTrait.php
similarity index 100%
rename from framework/yii/db/QueryTrait.php
rename to framework/db/QueryTrait.php
diff --git a/framework/yii/db/Schema.php b/framework/db/Schema.php
similarity index 100%
rename from framework/yii/db/Schema.php
rename to framework/db/Schema.php
diff --git a/framework/yii/db/StaleObjectException.php b/framework/db/StaleObjectException.php
similarity index 100%
rename from framework/yii/db/StaleObjectException.php
rename to framework/db/StaleObjectException.php
diff --git a/framework/yii/db/TableSchema.php b/framework/db/TableSchema.php
similarity index 100%
rename from framework/yii/db/TableSchema.php
rename to framework/db/TableSchema.php
diff --git a/framework/yii/db/Transaction.php b/framework/db/Transaction.php
similarity index 100%
rename from framework/yii/db/Transaction.php
rename to framework/db/Transaction.php
diff --git a/framework/yii/db/cubrid/QueryBuilder.php b/framework/db/cubrid/QueryBuilder.php
similarity index 100%
rename from framework/yii/db/cubrid/QueryBuilder.php
rename to framework/db/cubrid/QueryBuilder.php
diff --git a/framework/yii/db/cubrid/Schema.php b/framework/db/cubrid/Schema.php
similarity index 100%
rename from framework/yii/db/cubrid/Schema.php
rename to framework/db/cubrid/Schema.php
diff --git a/framework/yii/db/mssql/PDO.php b/framework/db/mssql/PDO.php
similarity index 100%
rename from framework/yii/db/mssql/PDO.php
rename to framework/db/mssql/PDO.php
diff --git a/framework/yii/db/mssql/QueryBuilder.php b/framework/db/mssql/QueryBuilder.php
similarity index 100%
rename from framework/yii/db/mssql/QueryBuilder.php
rename to framework/db/mssql/QueryBuilder.php
diff --git a/framework/yii/db/mssql/Schema.php b/framework/db/mssql/Schema.php
similarity index 100%
rename from framework/yii/db/mssql/Schema.php
rename to framework/db/mssql/Schema.php
diff --git a/framework/yii/db/mssql/SqlsrvPDO.php b/framework/db/mssql/SqlsrvPDO.php
similarity index 100%
rename from framework/yii/db/mssql/SqlsrvPDO.php
rename to framework/db/mssql/SqlsrvPDO.php
diff --git a/framework/yii/db/mssql/TableSchema.php b/framework/db/mssql/TableSchema.php
similarity index 100%
rename from framework/yii/db/mssql/TableSchema.php
rename to framework/db/mssql/TableSchema.php
diff --git a/framework/yii/db/mysql/QueryBuilder.php b/framework/db/mysql/QueryBuilder.php
similarity index 100%
rename from framework/yii/db/mysql/QueryBuilder.php
rename to framework/db/mysql/QueryBuilder.php
diff --git a/framework/yii/db/mysql/Schema.php b/framework/db/mysql/Schema.php
similarity index 100%
rename from framework/yii/db/mysql/Schema.php
rename to framework/db/mysql/Schema.php
diff --git a/framework/yii/db/oci/QueryBuilder.php b/framework/db/oci/QueryBuilder.php
similarity index 100%
rename from framework/yii/db/oci/QueryBuilder.php
rename to framework/db/oci/QueryBuilder.php
diff --git a/framework/yii/db/oci/Schema.php b/framework/db/oci/Schema.php
similarity index 100%
rename from framework/yii/db/oci/Schema.php
rename to framework/db/oci/Schema.php
diff --git a/framework/yii/db/pgsql/QueryBuilder.php b/framework/db/pgsql/QueryBuilder.php
similarity index 100%
rename from framework/yii/db/pgsql/QueryBuilder.php
rename to framework/db/pgsql/QueryBuilder.php
diff --git a/framework/yii/db/pgsql/Schema.php b/framework/db/pgsql/Schema.php
similarity index 100%
rename from framework/yii/db/pgsql/Schema.php
rename to framework/db/pgsql/Schema.php
diff --git a/framework/yii/db/sqlite/QueryBuilder.php b/framework/db/sqlite/QueryBuilder.php
similarity index 100%
rename from framework/yii/db/sqlite/QueryBuilder.php
rename to framework/db/sqlite/QueryBuilder.php
diff --git a/framework/yii/db/sqlite/Schema.php b/framework/db/sqlite/Schema.php
similarity index 100%
rename from framework/yii/db/sqlite/Schema.php
rename to framework/db/sqlite/Schema.php
diff --git a/framework/yii/grid/ActionColumn.php b/framework/grid/ActionColumn.php
similarity index 100%
rename from framework/yii/grid/ActionColumn.php
rename to framework/grid/ActionColumn.php
diff --git a/framework/yii/grid/CheckboxColumn.php b/framework/grid/CheckboxColumn.php
similarity index 100%
rename from framework/yii/grid/CheckboxColumn.php
rename to framework/grid/CheckboxColumn.php
diff --git a/framework/yii/grid/Column.php b/framework/grid/Column.php
similarity index 100%
rename from framework/yii/grid/Column.php
rename to framework/grid/Column.php
diff --git a/framework/yii/grid/DataColumn.php b/framework/grid/DataColumn.php
similarity index 100%
rename from framework/yii/grid/DataColumn.php
rename to framework/grid/DataColumn.php
diff --git a/framework/yii/grid/GridView.php b/framework/grid/GridView.php
similarity index 100%
rename from framework/yii/grid/GridView.php
rename to framework/grid/GridView.php
diff --git a/framework/yii/grid/GridViewAsset.php b/framework/grid/GridViewAsset.php
similarity index 100%
rename from framework/yii/grid/GridViewAsset.php
rename to framework/grid/GridViewAsset.php
diff --git a/framework/yii/grid/SerialColumn.php b/framework/grid/SerialColumn.php
similarity index 100%
rename from framework/yii/grid/SerialColumn.php
rename to framework/grid/SerialColumn.php
diff --git a/framework/yii/helpers/ArrayHelper.php b/framework/helpers/ArrayHelper.php
similarity index 100%
rename from framework/yii/helpers/ArrayHelper.php
rename to framework/helpers/ArrayHelper.php
diff --git a/framework/yii/helpers/BaseArrayHelper.php b/framework/helpers/BaseArrayHelper.php
similarity index 100%
rename from framework/yii/helpers/BaseArrayHelper.php
rename to framework/helpers/BaseArrayHelper.php
diff --git a/framework/yii/helpers/BaseConsole.php b/framework/helpers/BaseConsole.php
similarity index 100%
rename from framework/yii/helpers/BaseConsole.php
rename to framework/helpers/BaseConsole.php
diff --git a/framework/yii/helpers/BaseFileHelper.php b/framework/helpers/BaseFileHelper.php
similarity index 100%
rename from framework/yii/helpers/BaseFileHelper.php
rename to framework/helpers/BaseFileHelper.php
diff --git a/framework/yii/helpers/BaseHtml.php b/framework/helpers/BaseHtml.php
similarity index 100%
rename from framework/yii/helpers/BaseHtml.php
rename to framework/helpers/BaseHtml.php
diff --git a/framework/yii/helpers/BaseHtmlPurifier.php b/framework/helpers/BaseHtmlPurifier.php
similarity index 100%
rename from framework/yii/helpers/BaseHtmlPurifier.php
rename to framework/helpers/BaseHtmlPurifier.php
diff --git a/framework/yii/helpers/BaseInflector.php b/framework/helpers/BaseInflector.php
similarity index 100%
rename from framework/yii/helpers/BaseInflector.php
rename to framework/helpers/BaseInflector.php
diff --git a/framework/yii/helpers/BaseJson.php b/framework/helpers/BaseJson.php
similarity index 100%
rename from framework/yii/helpers/BaseJson.php
rename to framework/helpers/BaseJson.php
diff --git a/framework/yii/helpers/BaseMarkdown.php b/framework/helpers/BaseMarkdown.php
similarity index 100%
rename from framework/yii/helpers/BaseMarkdown.php
rename to framework/helpers/BaseMarkdown.php
diff --git a/framework/yii/helpers/BaseSecurity.php b/framework/helpers/BaseSecurity.php
similarity index 100%
rename from framework/yii/helpers/BaseSecurity.php
rename to framework/helpers/BaseSecurity.php
diff --git a/framework/yii/helpers/BaseStringHelper.php b/framework/helpers/BaseStringHelper.php
similarity index 100%
rename from framework/yii/helpers/BaseStringHelper.php
rename to framework/helpers/BaseStringHelper.php
diff --git a/framework/yii/helpers/BaseVarDumper.php b/framework/helpers/BaseVarDumper.php
similarity index 100%
rename from framework/yii/helpers/BaseVarDumper.php
rename to framework/helpers/BaseVarDumper.php
diff --git a/framework/yii/helpers/Console.php b/framework/helpers/Console.php
similarity index 100%
rename from framework/yii/helpers/Console.php
rename to framework/helpers/Console.php
diff --git a/framework/yii/helpers/FileHelper.php b/framework/helpers/FileHelper.php
similarity index 100%
rename from framework/yii/helpers/FileHelper.php
rename to framework/helpers/FileHelper.php
diff --git a/framework/yii/helpers/Html.php b/framework/helpers/Html.php
similarity index 100%
rename from framework/yii/helpers/Html.php
rename to framework/helpers/Html.php
diff --git a/framework/yii/helpers/HtmlPurifier.php b/framework/helpers/HtmlPurifier.php
similarity index 100%
rename from framework/yii/helpers/HtmlPurifier.php
rename to framework/helpers/HtmlPurifier.php
diff --git a/framework/yii/helpers/Inflector.php b/framework/helpers/Inflector.php
similarity index 100%
rename from framework/yii/helpers/Inflector.php
rename to framework/helpers/Inflector.php
diff --git a/framework/yii/helpers/Json.php b/framework/helpers/Json.php
similarity index 100%
rename from framework/yii/helpers/Json.php
rename to framework/helpers/Json.php
diff --git a/framework/yii/helpers/Markdown.php b/framework/helpers/Markdown.php
similarity index 100%
rename from framework/yii/helpers/Markdown.php
rename to framework/helpers/Markdown.php
diff --git a/framework/yii/helpers/Security.php b/framework/helpers/Security.php
similarity index 100%
rename from framework/yii/helpers/Security.php
rename to framework/helpers/Security.php
diff --git a/framework/yii/helpers/StringHelper.php b/framework/helpers/StringHelper.php
similarity index 100%
rename from framework/yii/helpers/StringHelper.php
rename to framework/helpers/StringHelper.php
diff --git a/framework/yii/helpers/VarDumper.php b/framework/helpers/VarDumper.php
similarity index 100%
rename from framework/yii/helpers/VarDumper.php
rename to framework/helpers/VarDumper.php
diff --git a/framework/yii/helpers/mimeTypes.php b/framework/helpers/mimeTypes.php
similarity index 100%
rename from framework/yii/helpers/mimeTypes.php
rename to framework/helpers/mimeTypes.php
diff --git a/framework/yii/i18n/DbMessageSource.php b/framework/i18n/DbMessageSource.php
similarity index 100%
rename from framework/yii/i18n/DbMessageSource.php
rename to framework/i18n/DbMessageSource.php
diff --git a/framework/yii/i18n/Formatter.php b/framework/i18n/Formatter.php
similarity index 100%
rename from framework/yii/i18n/Formatter.php
rename to framework/i18n/Formatter.php
diff --git a/framework/yii/i18n/GettextFile.php b/framework/i18n/GettextFile.php
similarity index 100%
rename from framework/yii/i18n/GettextFile.php
rename to framework/i18n/GettextFile.php
diff --git a/framework/yii/i18n/GettextMessageSource.php b/framework/i18n/GettextMessageSource.php
similarity index 100%
rename from framework/yii/i18n/GettextMessageSource.php
rename to framework/i18n/GettextMessageSource.php
diff --git a/framework/yii/i18n/GettextMoFile.php b/framework/i18n/GettextMoFile.php
similarity index 100%
rename from framework/yii/i18n/GettextMoFile.php
rename to framework/i18n/GettextMoFile.php
diff --git a/framework/yii/i18n/GettextPoFile.php b/framework/i18n/GettextPoFile.php
similarity index 100%
rename from framework/yii/i18n/GettextPoFile.php
rename to framework/i18n/GettextPoFile.php
diff --git a/framework/yii/i18n/I18N.php b/framework/i18n/I18N.php
similarity index 100%
rename from framework/yii/i18n/I18N.php
rename to framework/i18n/I18N.php
diff --git a/framework/yii/i18n/MessageFormatter.php b/framework/i18n/MessageFormatter.php
similarity index 100%
rename from framework/yii/i18n/MessageFormatter.php
rename to framework/i18n/MessageFormatter.php
diff --git a/framework/yii/i18n/MessageSource.php b/framework/i18n/MessageSource.php
similarity index 100%
rename from framework/yii/i18n/MessageSource.php
rename to framework/i18n/MessageSource.php
diff --git a/framework/yii/i18n/MissingTranslationEvent.php b/framework/i18n/MissingTranslationEvent.php
similarity index 100%
rename from framework/yii/i18n/MissingTranslationEvent.php
rename to framework/i18n/MissingTranslationEvent.php
diff --git a/framework/yii/i18n/PhpMessageSource.php b/framework/i18n/PhpMessageSource.php
similarity index 100%
rename from framework/yii/i18n/PhpMessageSource.php
rename to framework/i18n/PhpMessageSource.php
diff --git a/framework/yii/log/DbTarget.php b/framework/log/DbTarget.php
similarity index 100%
rename from framework/yii/log/DbTarget.php
rename to framework/log/DbTarget.php
diff --git a/framework/yii/log/EmailTarget.php b/framework/log/EmailTarget.php
similarity index 100%
rename from framework/yii/log/EmailTarget.php
rename to framework/log/EmailTarget.php
diff --git a/framework/yii/log/FileTarget.php b/framework/log/FileTarget.php
similarity index 100%
rename from framework/yii/log/FileTarget.php
rename to framework/log/FileTarget.php
diff --git a/framework/yii/log/Logger.php b/framework/log/Logger.php
similarity index 100%
rename from framework/yii/log/Logger.php
rename to framework/log/Logger.php
diff --git a/framework/yii/log/Target.php b/framework/log/Target.php
similarity index 100%
rename from framework/yii/log/Target.php
rename to framework/log/Target.php
diff --git a/framework/yii/mail/BaseMailer.php b/framework/mail/BaseMailer.php
similarity index 100%
rename from framework/yii/mail/BaseMailer.php
rename to framework/mail/BaseMailer.php
diff --git a/framework/yii/mail/BaseMessage.php b/framework/mail/BaseMessage.php
similarity index 100%
rename from framework/yii/mail/BaseMessage.php
rename to framework/mail/BaseMessage.php
diff --git a/framework/yii/mail/MailerInterface.php b/framework/mail/MailerInterface.php
similarity index 100%
rename from framework/yii/mail/MailerInterface.php
rename to framework/mail/MailerInterface.php
diff --git a/framework/yii/mail/MessageInterface.php b/framework/mail/MessageInterface.php
similarity index 100%
rename from framework/yii/mail/MessageInterface.php
rename to framework/mail/MessageInterface.php
diff --git a/framework/yii/messages/config.php b/framework/messages/config.php
similarity index 100%
rename from framework/yii/messages/config.php
rename to framework/messages/config.php
diff --git a/framework/yii/messages/da/yii.php b/framework/messages/da/yii.php
similarity index 100%
rename from framework/yii/messages/da/yii.php
rename to framework/messages/da/yii.php
diff --git a/framework/yii/messages/de/yii.php b/framework/messages/de/yii.php
similarity index 100%
rename from framework/yii/messages/de/yii.php
rename to framework/messages/de/yii.php
diff --git a/framework/yii/messages/es/yii.php b/framework/messages/es/yii.php
similarity index 100%
rename from framework/yii/messages/es/yii.php
rename to framework/messages/es/yii.php
diff --git a/framework/yii/messages/it/yii.php b/framework/messages/it/yii.php
similarity index 100%
rename from framework/yii/messages/it/yii.php
rename to framework/messages/it/yii.php
diff --git a/framework/yii/messages/ja/yii.php b/framework/messages/ja/yii.php
similarity index 100%
rename from framework/yii/messages/ja/yii.php
rename to framework/messages/ja/yii.php
diff --git a/framework/yii/messages/pl/yii.php b/framework/messages/pl/yii.php
similarity index 100%
rename from framework/yii/messages/pl/yii.php
rename to framework/messages/pl/yii.php
diff --git a/framework/yii/messages/pt-BR/yii.php b/framework/messages/pt-BR/yii.php
similarity index 100%
rename from framework/yii/messages/pt-BR/yii.php
rename to framework/messages/pt-BR/yii.php
diff --git a/framework/yii/messages/ro/yii.php b/framework/messages/ro/yii.php
similarity index 100%
rename from framework/yii/messages/ro/yii.php
rename to framework/messages/ro/yii.php
diff --git a/framework/yii/messages/ru/yii.php b/framework/messages/ru/yii.php
similarity index 100%
rename from framework/yii/messages/ru/yii.php
rename to framework/messages/ru/yii.php
diff --git a/framework/yii/messages/zh_cn/yii.php b/framework/messages/zh_cn/yii.php
similarity index 100%
rename from framework/yii/messages/zh_cn/yii.php
rename to framework/messages/zh_cn/yii.php
diff --git a/framework/yii/mutex/DbMutex.php b/framework/mutex/DbMutex.php
similarity index 100%
rename from framework/yii/mutex/DbMutex.php
rename to framework/mutex/DbMutex.php
diff --git a/framework/yii/mutex/FileMutex.php b/framework/mutex/FileMutex.php
similarity index 100%
rename from framework/yii/mutex/FileMutex.php
rename to framework/mutex/FileMutex.php
diff --git a/framework/yii/mutex/Mutex.php b/framework/mutex/Mutex.php
similarity index 100%
rename from framework/yii/mutex/Mutex.php
rename to framework/mutex/Mutex.php
diff --git a/framework/yii/mutex/MysqlMutex.php b/framework/mutex/MysqlMutex.php
similarity index 100%
rename from framework/yii/mutex/MysqlMutex.php
rename to framework/mutex/MysqlMutex.php
diff --git a/framework/yii/rbac/Assignment.php b/framework/rbac/Assignment.php
similarity index 100%
rename from framework/yii/rbac/Assignment.php
rename to framework/rbac/Assignment.php
diff --git a/framework/yii/rbac/DbManager.php b/framework/rbac/DbManager.php
similarity index 100%
rename from framework/yii/rbac/DbManager.php
rename to framework/rbac/DbManager.php
diff --git a/framework/yii/rbac/Item.php b/framework/rbac/Item.php
similarity index 100%
rename from framework/yii/rbac/Item.php
rename to framework/rbac/Item.php
diff --git a/framework/yii/rbac/Manager.php b/framework/rbac/Manager.php
similarity index 100%
rename from framework/yii/rbac/Manager.php
rename to framework/rbac/Manager.php
diff --git a/framework/yii/rbac/PhpManager.php b/framework/rbac/PhpManager.php
similarity index 100%
rename from framework/yii/rbac/PhpManager.php
rename to framework/rbac/PhpManager.php
diff --git a/framework/yii/rbac/schema-mssql.sql b/framework/rbac/schema-mssql.sql
similarity index 100%
rename from framework/yii/rbac/schema-mssql.sql
rename to framework/rbac/schema-mssql.sql
diff --git a/framework/yii/rbac/schema-mysql.sql b/framework/rbac/schema-mysql.sql
similarity index 100%
rename from framework/yii/rbac/schema-mysql.sql
rename to framework/rbac/schema-mysql.sql
diff --git a/framework/yii/rbac/schema-oci.sql b/framework/rbac/schema-oci.sql
similarity index 100%
rename from framework/yii/rbac/schema-oci.sql
rename to framework/rbac/schema-oci.sql
diff --git a/framework/yii/rbac/schema-pgsql.sql b/framework/rbac/schema-pgsql.sql
similarity index 100%
rename from framework/yii/rbac/schema-pgsql.sql
rename to framework/rbac/schema-pgsql.sql
diff --git a/framework/yii/rbac/schema-sqlite.sql b/framework/rbac/schema-sqlite.sql
similarity index 100%
rename from framework/yii/rbac/schema-sqlite.sql
rename to framework/rbac/schema-sqlite.sql
diff --git a/framework/yii/requirements/YiiRequirementChecker.php b/framework/requirements/YiiRequirementChecker.php
similarity index 100%
rename from framework/yii/requirements/YiiRequirementChecker.php
rename to framework/requirements/YiiRequirementChecker.php
diff --git a/framework/yii/requirements/requirements.php b/framework/requirements/requirements.php
similarity index 100%
rename from framework/yii/requirements/requirements.php
rename to framework/requirements/requirements.php
diff --git a/framework/yii/requirements/views/console/index.php b/framework/requirements/views/console/index.php
similarity index 100%
rename from framework/yii/requirements/views/console/index.php
rename to framework/requirements/views/console/index.php
diff --git a/framework/yii/requirements/views/web/css.php b/framework/requirements/views/web/css.php
similarity index 100%
rename from framework/yii/requirements/views/web/css.php
rename to framework/requirements/views/web/css.php
diff --git a/framework/yii/requirements/views/web/index.php b/framework/requirements/views/web/index.php
similarity index 100%
rename from framework/yii/requirements/views/web/index.php
rename to framework/requirements/views/web/index.php
diff --git a/framework/yii/test/DbFixtureManager.php b/framework/test/DbFixtureManager.php
similarity index 100%
rename from framework/yii/test/DbFixtureManager.php
rename to framework/test/DbFixtureManager.php
diff --git a/framework/yii/test/DbTestTrait.php b/framework/test/DbTestTrait.php
similarity index 100%
rename from framework/yii/test/DbTestTrait.php
rename to framework/test/DbTestTrait.php
diff --git a/framework/yii/validators/BooleanValidator.php b/framework/validators/BooleanValidator.php
similarity index 100%
rename from framework/yii/validators/BooleanValidator.php
rename to framework/validators/BooleanValidator.php
diff --git a/framework/yii/validators/CompareValidator.php b/framework/validators/CompareValidator.php
similarity index 100%
rename from framework/yii/validators/CompareValidator.php
rename to framework/validators/CompareValidator.php
diff --git a/framework/yii/validators/DateValidator.php b/framework/validators/DateValidator.php
similarity index 100%
rename from framework/yii/validators/DateValidator.php
rename to framework/validators/DateValidator.php
diff --git a/framework/yii/validators/DefaultValueValidator.php b/framework/validators/DefaultValueValidator.php
similarity index 100%
rename from framework/yii/validators/DefaultValueValidator.php
rename to framework/validators/DefaultValueValidator.php
diff --git a/framework/yii/validators/EmailValidator.php b/framework/validators/EmailValidator.php
similarity index 100%
rename from framework/yii/validators/EmailValidator.php
rename to framework/validators/EmailValidator.php
diff --git a/framework/yii/validators/ExistValidator.php b/framework/validators/ExistValidator.php
similarity index 100%
rename from framework/yii/validators/ExistValidator.php
rename to framework/validators/ExistValidator.php
diff --git a/framework/yii/validators/FileValidator.php b/framework/validators/FileValidator.php
similarity index 100%
rename from framework/yii/validators/FileValidator.php
rename to framework/validators/FileValidator.php
diff --git a/framework/yii/validators/FilterValidator.php b/framework/validators/FilterValidator.php
similarity index 100%
rename from framework/yii/validators/FilterValidator.php
rename to framework/validators/FilterValidator.php
diff --git a/framework/yii/validators/ImageValidator.php b/framework/validators/ImageValidator.php
similarity index 100%
rename from framework/yii/validators/ImageValidator.php
rename to framework/validators/ImageValidator.php
diff --git a/framework/yii/validators/InlineValidator.php b/framework/validators/InlineValidator.php
similarity index 100%
rename from framework/yii/validators/InlineValidator.php
rename to framework/validators/InlineValidator.php
diff --git a/framework/yii/validators/NumberValidator.php b/framework/validators/NumberValidator.php
similarity index 100%
rename from framework/yii/validators/NumberValidator.php
rename to framework/validators/NumberValidator.php
diff --git a/framework/yii/validators/PunycodeAsset.php b/framework/validators/PunycodeAsset.php
similarity index 100%
rename from framework/yii/validators/PunycodeAsset.php
rename to framework/validators/PunycodeAsset.php
diff --git a/framework/yii/validators/RangeValidator.php b/framework/validators/RangeValidator.php
similarity index 100%
rename from framework/yii/validators/RangeValidator.php
rename to framework/validators/RangeValidator.php
diff --git a/framework/yii/validators/RegularExpressionValidator.php b/framework/validators/RegularExpressionValidator.php
similarity index 100%
rename from framework/yii/validators/RegularExpressionValidator.php
rename to framework/validators/RegularExpressionValidator.php
diff --git a/framework/yii/validators/RequiredValidator.php b/framework/validators/RequiredValidator.php
similarity index 100%
rename from framework/yii/validators/RequiredValidator.php
rename to framework/validators/RequiredValidator.php
diff --git a/framework/yii/validators/SafeValidator.php b/framework/validators/SafeValidator.php
similarity index 100%
rename from framework/yii/validators/SafeValidator.php
rename to framework/validators/SafeValidator.php
diff --git a/framework/yii/validators/StringValidator.php b/framework/validators/StringValidator.php
similarity index 100%
rename from framework/yii/validators/StringValidator.php
rename to framework/validators/StringValidator.php
diff --git a/framework/yii/validators/UniqueValidator.php b/framework/validators/UniqueValidator.php
similarity index 100%
rename from framework/yii/validators/UniqueValidator.php
rename to framework/validators/UniqueValidator.php
diff --git a/framework/yii/validators/UrlValidator.php b/framework/validators/UrlValidator.php
similarity index 100%
rename from framework/yii/validators/UrlValidator.php
rename to framework/validators/UrlValidator.php
diff --git a/framework/yii/validators/ValidationAsset.php b/framework/validators/ValidationAsset.php
similarity index 100%
rename from framework/yii/validators/ValidationAsset.php
rename to framework/validators/ValidationAsset.php
diff --git a/framework/yii/validators/Validator.php b/framework/validators/Validator.php
similarity index 100%
rename from framework/yii/validators/Validator.php
rename to framework/validators/Validator.php
diff --git a/framework/yii/views/errorHandler/callStackItem.php b/framework/views/errorHandler/callStackItem.php
similarity index 100%
rename from framework/yii/views/errorHandler/callStackItem.php
rename to framework/views/errorHandler/callStackItem.php
diff --git a/framework/yii/views/errorHandler/error.php b/framework/views/errorHandler/error.php
similarity index 100%
rename from framework/yii/views/errorHandler/error.php
rename to framework/views/errorHandler/error.php
diff --git a/framework/yii/views/errorHandler/exception.php b/framework/views/errorHandler/exception.php
similarity index 100%
rename from framework/yii/views/errorHandler/exception.php
rename to framework/views/errorHandler/exception.php
diff --git a/framework/yii/views/errorHandler/previousException.php b/framework/views/errorHandler/previousException.php
similarity index 100%
rename from framework/yii/views/errorHandler/previousException.php
rename to framework/views/errorHandler/previousException.php
diff --git a/framework/yii/views/messageConfig.php b/framework/views/messageConfig.php
similarity index 100%
rename from framework/yii/views/messageConfig.php
rename to framework/views/messageConfig.php
diff --git a/framework/yii/views/migration.php b/framework/views/migration.php
similarity index 100%
rename from framework/yii/views/migration.php
rename to framework/views/migration.php
diff --git a/framework/yii/web/AccessControl.php b/framework/web/AccessControl.php
similarity index 100%
rename from framework/yii/web/AccessControl.php
rename to framework/web/AccessControl.php
diff --git a/framework/yii/web/AccessDeniedHttpException.php b/framework/web/AccessDeniedHttpException.php
similarity index 100%
rename from framework/yii/web/AccessDeniedHttpException.php
rename to framework/web/AccessDeniedHttpException.php
diff --git a/framework/yii/web/AccessRule.php b/framework/web/AccessRule.php
similarity index 100%
rename from framework/yii/web/AccessRule.php
rename to framework/web/AccessRule.php
diff --git a/framework/yii/web/Application.php b/framework/web/Application.php
similarity index 100%
rename from framework/yii/web/Application.php
rename to framework/web/Application.php
diff --git a/framework/yii/web/AssetBundle.php b/framework/web/AssetBundle.php
similarity index 100%
rename from framework/yii/web/AssetBundle.php
rename to framework/web/AssetBundle.php
diff --git a/framework/yii/web/AssetConverter.php b/framework/web/AssetConverter.php
similarity index 100%
rename from framework/yii/web/AssetConverter.php
rename to framework/web/AssetConverter.php
diff --git a/framework/yii/web/AssetConverterInterface.php b/framework/web/AssetConverterInterface.php
similarity index 100%
rename from framework/yii/web/AssetConverterInterface.php
rename to framework/web/AssetConverterInterface.php
diff --git a/framework/yii/web/AssetManager.php b/framework/web/AssetManager.php
similarity index 100%
rename from framework/yii/web/AssetManager.php
rename to framework/web/AssetManager.php
diff --git a/framework/yii/web/BadRequestHttpException.php b/framework/web/BadRequestHttpException.php
similarity index 100%
rename from framework/yii/web/BadRequestHttpException.php
rename to framework/web/BadRequestHttpException.php
diff --git a/framework/yii/web/CacheSession.php b/framework/web/CacheSession.php
similarity index 100%
rename from framework/yii/web/CacheSession.php
rename to framework/web/CacheSession.php
diff --git a/framework/yii/web/Controller.php b/framework/web/Controller.php
similarity index 100%
rename from framework/yii/web/Controller.php
rename to framework/web/Controller.php
diff --git a/framework/yii/web/Cookie.php b/framework/web/Cookie.php
similarity index 100%
rename from framework/yii/web/Cookie.php
rename to framework/web/Cookie.php
diff --git a/framework/yii/web/CookieCollection.php b/framework/web/CookieCollection.php
similarity index 100%
rename from framework/yii/web/CookieCollection.php
rename to framework/web/CookieCollection.php
diff --git a/framework/yii/web/DbSession.php b/framework/web/DbSession.php
similarity index 100%
rename from framework/yii/web/DbSession.php
rename to framework/web/DbSession.php
diff --git a/framework/yii/web/ErrorAction.php b/framework/web/ErrorAction.php
similarity index 100%
rename from framework/yii/web/ErrorAction.php
rename to framework/web/ErrorAction.php
diff --git a/framework/yii/web/HeaderCollection.php b/framework/web/HeaderCollection.php
similarity index 100%
rename from framework/yii/web/HeaderCollection.php
rename to framework/web/HeaderCollection.php
diff --git a/framework/yii/web/HttpCache.php b/framework/web/HttpCache.php
similarity index 100%
rename from framework/yii/web/HttpCache.php
rename to framework/web/HttpCache.php
diff --git a/framework/yii/web/HttpException.php b/framework/web/HttpException.php
similarity index 100%
rename from framework/yii/web/HttpException.php
rename to framework/web/HttpException.php
diff --git a/framework/yii/web/IdentityInterface.php b/framework/web/IdentityInterface.php
similarity index 100%
rename from framework/yii/web/IdentityInterface.php
rename to framework/web/IdentityInterface.php
diff --git a/framework/yii/web/JqueryAsset.php b/framework/web/JqueryAsset.php
similarity index 100%
rename from framework/yii/web/JqueryAsset.php
rename to framework/web/JqueryAsset.php
diff --git a/framework/yii/web/JsExpression.php b/framework/web/JsExpression.php
similarity index 100%
rename from framework/yii/web/JsExpression.php
rename to framework/web/JsExpression.php
diff --git a/framework/yii/web/MethodNotAllowedHttpException.php b/framework/web/MethodNotAllowedHttpException.php
similarity index 100%
rename from framework/yii/web/MethodNotAllowedHttpException.php
rename to framework/web/MethodNotAllowedHttpException.php
diff --git a/framework/yii/web/NotFoundHttpException.php b/framework/web/NotFoundHttpException.php
similarity index 100%
rename from framework/yii/web/NotFoundHttpException.php
rename to framework/web/NotFoundHttpException.php
diff --git a/framework/yii/web/PageCache.php b/framework/web/PageCache.php
similarity index 100%
rename from framework/yii/web/PageCache.php
rename to framework/web/PageCache.php
diff --git a/framework/yii/web/Request.php b/framework/web/Request.php
similarity index 100%
rename from framework/yii/web/Request.php
rename to framework/web/Request.php
diff --git a/framework/yii/web/Response.php b/framework/web/Response.php
similarity index 100%
rename from framework/yii/web/Response.php
rename to framework/web/Response.php
diff --git a/framework/yii/web/ResponseFormatterInterface.php b/framework/web/ResponseFormatterInterface.php
similarity index 100%
rename from framework/yii/web/ResponseFormatterInterface.php
rename to framework/web/ResponseFormatterInterface.php
diff --git a/framework/yii/web/Session.php b/framework/web/Session.php
similarity index 100%
rename from framework/yii/web/Session.php
rename to framework/web/Session.php
diff --git a/framework/yii/web/SessionIterator.php b/framework/web/SessionIterator.php
similarity index 100%
rename from framework/yii/web/SessionIterator.php
rename to framework/web/SessionIterator.php
diff --git a/framework/yii/web/UploadedFile.php b/framework/web/UploadedFile.php
similarity index 100%
rename from framework/yii/web/UploadedFile.php
rename to framework/web/UploadedFile.php
diff --git a/framework/yii/web/UrlManager.php b/framework/web/UrlManager.php
similarity index 100%
rename from framework/yii/web/UrlManager.php
rename to framework/web/UrlManager.php
diff --git a/framework/yii/web/UrlRule.php b/framework/web/UrlRule.php
similarity index 100%
rename from framework/yii/web/UrlRule.php
rename to framework/web/UrlRule.php
diff --git a/framework/yii/web/User.php b/framework/web/User.php
similarity index 100%
rename from framework/yii/web/User.php
rename to framework/web/User.php
diff --git a/framework/yii/web/UserEvent.php b/framework/web/UserEvent.php
similarity index 100%
rename from framework/yii/web/UserEvent.php
rename to framework/web/UserEvent.php
diff --git a/framework/yii/web/VerbFilter.php b/framework/web/VerbFilter.php
similarity index 100%
rename from framework/yii/web/VerbFilter.php
rename to framework/web/VerbFilter.php
diff --git a/framework/yii/web/View.php b/framework/web/View.php
similarity index 100%
rename from framework/yii/web/View.php
rename to framework/web/View.php
diff --git a/framework/yii/web/XmlResponseFormatter.php b/framework/web/XmlResponseFormatter.php
similarity index 100%
rename from framework/yii/web/XmlResponseFormatter.php
rename to framework/web/XmlResponseFormatter.php
diff --git a/framework/yii/web/YiiAsset.php b/framework/web/YiiAsset.php
similarity index 100%
rename from framework/yii/web/YiiAsset.php
rename to framework/web/YiiAsset.php
diff --git a/framework/yii/widgets/ActiveField.php b/framework/widgets/ActiveField.php
similarity index 100%
rename from framework/yii/widgets/ActiveField.php
rename to framework/widgets/ActiveField.php
diff --git a/framework/yii/widgets/ActiveForm.php b/framework/widgets/ActiveForm.php
similarity index 100%
rename from framework/yii/widgets/ActiveForm.php
rename to framework/widgets/ActiveForm.php
diff --git a/framework/yii/widgets/ActiveFormAsset.php b/framework/widgets/ActiveFormAsset.php
similarity index 100%
rename from framework/yii/widgets/ActiveFormAsset.php
rename to framework/widgets/ActiveFormAsset.php
diff --git a/framework/yii/widgets/BaseListView.php b/framework/widgets/BaseListView.php
similarity index 100%
rename from framework/yii/widgets/BaseListView.php
rename to framework/widgets/BaseListView.php
diff --git a/framework/yii/widgets/Block.php b/framework/widgets/Block.php
similarity index 100%
rename from framework/yii/widgets/Block.php
rename to framework/widgets/Block.php
diff --git a/framework/yii/widgets/Breadcrumbs.php b/framework/widgets/Breadcrumbs.php
similarity index 100%
rename from framework/yii/widgets/Breadcrumbs.php
rename to framework/widgets/Breadcrumbs.php
diff --git a/framework/yii/widgets/ContentDecorator.php b/framework/widgets/ContentDecorator.php
similarity index 100%
rename from framework/yii/widgets/ContentDecorator.php
rename to framework/widgets/ContentDecorator.php
diff --git a/framework/yii/widgets/DetailView.php b/framework/widgets/DetailView.php
similarity index 100%
rename from framework/yii/widgets/DetailView.php
rename to framework/widgets/DetailView.php
diff --git a/framework/yii/widgets/FragmentCache.php b/framework/widgets/FragmentCache.php
similarity index 100%
rename from framework/yii/widgets/FragmentCache.php
rename to framework/widgets/FragmentCache.php
diff --git a/framework/yii/widgets/InputWidget.php b/framework/widgets/InputWidget.php
similarity index 100%
rename from framework/yii/widgets/InputWidget.php
rename to framework/widgets/InputWidget.php
diff --git a/framework/yii/widgets/LinkPager.php b/framework/widgets/LinkPager.php
similarity index 100%
rename from framework/yii/widgets/LinkPager.php
rename to framework/widgets/LinkPager.php
diff --git a/framework/yii/widgets/LinkSorter.php b/framework/widgets/LinkSorter.php
similarity index 100%
rename from framework/yii/widgets/LinkSorter.php
rename to framework/widgets/LinkSorter.php
diff --git a/framework/yii/widgets/ListView.php b/framework/widgets/ListView.php
similarity index 100%
rename from framework/yii/widgets/ListView.php
rename to framework/widgets/ListView.php
diff --git a/framework/yii/widgets/MaskedInput.php b/framework/widgets/MaskedInput.php
similarity index 100%
rename from framework/yii/widgets/MaskedInput.php
rename to framework/widgets/MaskedInput.php
diff --git a/framework/yii/widgets/MaskedInputAsset.php b/framework/widgets/MaskedInputAsset.php
similarity index 100%
rename from framework/yii/widgets/MaskedInputAsset.php
rename to framework/widgets/MaskedInputAsset.php
diff --git a/framework/yii/widgets/Menu.php b/framework/widgets/Menu.php
similarity index 100%
rename from framework/yii/widgets/Menu.php
rename to framework/widgets/Menu.php
diff --git a/framework/yii/widgets/Spaceless.php b/framework/widgets/Spaceless.php
similarity index 100%
rename from framework/yii/widgets/Spaceless.php
rename to framework/widgets/Spaceless.php
diff --git a/framework/yii/yii b/framework/yii
similarity index 100%
rename from framework/yii/yii
rename to framework/yii
diff --git a/framework/yii/yii.bat b/framework/yii.bat
similarity index 100%
rename from framework/yii/yii.bat
rename to framework/yii.bat