diff --git a/apps/bootstrap/www/index.php b/apps/bootstrap/www/index.php
index 0875881..3b7b2fc 100644
--- a/apps/bootstrap/www/index.php
+++ b/apps/bootstrap/www/index.php
@@ -3,7 +3,7 @@
 // comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
 require(__DIR__ . '/../vendor/autoload.php');
 
 $config = require(__DIR__ . '/../config/main.php');
diff --git a/apps/bootstrap/yii b/apps/bootstrap/yii
index e35ae3a..0793523 100755
--- a/apps/bootstrap/yii
+++ b/apps/bootstrap/yii
@@ -13,7 +13,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
 // fcgi doesn't have STDIN defined by default
 defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
 
-require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
+require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php');
 require(__DIR__ . '/vendor/autoload.php');
 
 $config = require(__DIR__ . '/config/console.php');
diff --git a/yii/CHANGELOG.md b/framework/CHANGELOG.md
similarity index 100%
rename from yii/CHANGELOG.md
rename to framework/CHANGELOG.md
diff --git a/yii/LICENSE.md b/framework/LICENSE.md
similarity index 100%
rename from yii/LICENSE.md
rename to framework/LICENSE.md
diff --git a/yii/README.md b/framework/README.md
similarity index 100%
rename from yii/README.md
rename to framework/README.md
diff --git a/yii/UPGRADE.md b/framework/UPGRADE.md
similarity index 100%
rename from yii/UPGRADE.md
rename to framework/UPGRADE.md
diff --git a/yii/composer.json b/framework/composer.json
similarity index 100%
rename from yii/composer.json
rename to framework/composer.json
diff --git a/framework/yii/.gitignore b/framework/yii/.gitignore
new file mode 100644
index 0000000..6f84e8f
--- /dev/null
+++ b/framework/yii/.gitignore
@@ -0,0 +1,3 @@
+phpunit.xml
+composer.lock
+
diff --git a/yii/.htaccess b/framework/yii/.htaccess
similarity index 100%
rename from yii/.htaccess
rename to framework/yii/.htaccess
diff --git a/yii/Yii.php b/framework/yii/Yii.php
similarity index 100%
rename from yii/Yii.php
rename to framework/yii/Yii.php
diff --git a/yii/YiiBase.php b/framework/yii/YiiBase.php
similarity index 100%
rename from yii/YiiBase.php
rename to framework/yii/YiiBase.php
diff --git a/yii/assets.php b/framework/yii/assets.php
similarity index 100%
rename from yii/assets.php
rename to framework/yii/assets.php
diff --git a/yii/assets/jquery.js b/framework/yii/assets/jquery.js
similarity index 100%
rename from yii/assets/jquery.js
rename to framework/yii/assets/jquery.js
diff --git a/yii/assets/jquery.min.js b/framework/yii/assets/jquery.min.js
similarity index 100%
rename from yii/assets/jquery.min.js
rename to framework/yii/assets/jquery.min.js
diff --git a/yii/assets/punycode/LICENSE-GPL.txt b/framework/yii/assets/punycode/LICENSE-GPL.txt
similarity index 100%
rename from yii/assets/punycode/LICENSE-GPL.txt
rename to framework/yii/assets/punycode/LICENSE-GPL.txt
diff --git a/yii/assets/punycode/LICENSE-MIT.txt b/framework/yii/assets/punycode/LICENSE-MIT.txt
similarity index 100%
rename from yii/assets/punycode/LICENSE-MIT.txt
rename to framework/yii/assets/punycode/LICENSE-MIT.txt
diff --git a/yii/assets/punycode/punycode.js b/framework/yii/assets/punycode/punycode.js
similarity index 100%
rename from yii/assets/punycode/punycode.js
rename to framework/yii/assets/punycode/punycode.js
diff --git a/yii/assets/punycode/punycode.min.js b/framework/yii/assets/punycode/punycode.min.js
similarity index 100%
rename from yii/assets/punycode/punycode.min.js
rename to framework/yii/assets/punycode/punycode.min.js
diff --git a/yii/assets/yii.activeForm.js b/framework/yii/assets/yii.activeForm.js
similarity index 100%
rename from yii/assets/yii.activeForm.js
rename to framework/yii/assets/yii.activeForm.js
diff --git a/yii/assets/yii.captcha.js b/framework/yii/assets/yii.captcha.js
similarity index 100%
rename from yii/assets/yii.captcha.js
rename to framework/yii/assets/yii.captcha.js
diff --git a/yii/assets/yii.debug.js b/framework/yii/assets/yii.debug.js
similarity index 100%
rename from yii/assets/yii.debug.js
rename to framework/yii/assets/yii.debug.js
diff --git a/yii/assets/yii.js b/framework/yii/assets/yii.js
similarity index 100%
rename from yii/assets/yii.js
rename to framework/yii/assets/yii.js
diff --git a/yii/assets/yii.validation.js b/framework/yii/assets/yii.validation.js
similarity index 100%
rename from yii/assets/yii.validation.js
rename to framework/yii/assets/yii.validation.js
diff --git a/yii/base/Action.php b/framework/yii/base/Action.php
similarity index 100%
rename from yii/base/Action.php
rename to framework/yii/base/Action.php
diff --git a/yii/base/ActionEvent.php b/framework/yii/base/ActionEvent.php
similarity index 100%
rename from yii/base/ActionEvent.php
rename to framework/yii/base/ActionEvent.php
diff --git a/yii/base/ActionFilter.php b/framework/yii/base/ActionFilter.php
similarity index 100%
rename from yii/base/ActionFilter.php
rename to framework/yii/base/ActionFilter.php
diff --git a/yii/base/Application.php b/framework/yii/base/Application.php
similarity index 100%
rename from yii/base/Application.php
rename to framework/yii/base/Application.php
diff --git a/yii/base/Behavior.php b/framework/yii/base/Behavior.php
similarity index 100%
rename from yii/base/Behavior.php
rename to framework/yii/base/Behavior.php
diff --git a/yii/base/Component.php b/framework/yii/base/Component.php
similarity index 100%
rename from yii/base/Component.php
rename to framework/yii/base/Component.php
diff --git a/yii/base/Controller.php b/framework/yii/base/Controller.php
similarity index 100%
rename from yii/base/Controller.php
rename to framework/yii/base/Controller.php
diff --git a/yii/base/ErrorException.php b/framework/yii/base/ErrorException.php
similarity index 100%
rename from yii/base/ErrorException.php
rename to framework/yii/base/ErrorException.php
diff --git a/yii/base/ErrorHandler.php b/framework/yii/base/ErrorHandler.php
similarity index 100%
rename from yii/base/ErrorHandler.php
rename to framework/yii/base/ErrorHandler.php
diff --git a/yii/base/Event.php b/framework/yii/base/Event.php
similarity index 100%
rename from yii/base/Event.php
rename to framework/yii/base/Event.php
diff --git a/yii/base/Exception.php b/framework/yii/base/Exception.php
similarity index 100%
rename from yii/base/Exception.php
rename to framework/yii/base/Exception.php
diff --git a/yii/base/HttpException.php b/framework/yii/base/HttpException.php
similarity index 100%
rename from yii/base/HttpException.php
rename to framework/yii/base/HttpException.php
diff --git a/yii/base/InlineAction.php b/framework/yii/base/InlineAction.php
similarity index 100%
rename from yii/base/InlineAction.php
rename to framework/yii/base/InlineAction.php
diff --git a/yii/base/InvalidCallException.php b/framework/yii/base/InvalidCallException.php
similarity index 100%
rename from yii/base/InvalidCallException.php
rename to framework/yii/base/InvalidCallException.php
diff --git a/yii/base/InvalidConfigException.php b/framework/yii/base/InvalidConfigException.php
similarity index 100%
rename from yii/base/InvalidConfigException.php
rename to framework/yii/base/InvalidConfigException.php
diff --git a/yii/base/InvalidParamException.php b/framework/yii/base/InvalidParamException.php
similarity index 100%
rename from yii/base/InvalidParamException.php
rename to framework/yii/base/InvalidParamException.php
diff --git a/yii/base/InvalidRequestException.php b/framework/yii/base/InvalidRequestException.php
similarity index 100%
rename from yii/base/InvalidRequestException.php
rename to framework/yii/base/InvalidRequestException.php
diff --git a/yii/base/InvalidRouteException.php b/framework/yii/base/InvalidRouteException.php
similarity index 100%
rename from yii/base/InvalidRouteException.php
rename to framework/yii/base/InvalidRouteException.php
diff --git a/yii/base/Model.php b/framework/yii/base/Model.php
similarity index 100%
rename from yii/base/Model.php
rename to framework/yii/base/Model.php
diff --git a/yii/base/ModelEvent.php b/framework/yii/base/ModelEvent.php
similarity index 100%
rename from yii/base/ModelEvent.php
rename to framework/yii/base/ModelEvent.php
diff --git a/yii/base/Module.php b/framework/yii/base/Module.php
similarity index 100%
rename from yii/base/Module.php
rename to framework/yii/base/Module.php
diff --git a/yii/base/NotSupportedException.php b/framework/yii/base/NotSupportedException.php
similarity index 100%
rename from yii/base/NotSupportedException.php
rename to framework/yii/base/NotSupportedException.php
diff --git a/yii/base/Object.php b/framework/yii/base/Object.php
similarity index 100%
rename from yii/base/Object.php
rename to framework/yii/base/Object.php
diff --git a/yii/base/Request.php b/framework/yii/base/Request.php
similarity index 100%
rename from yii/base/Request.php
rename to framework/yii/base/Request.php
diff --git a/yii/base/Response.php b/framework/yii/base/Response.php
similarity index 100%
rename from yii/base/Response.php
rename to framework/yii/base/Response.php
diff --git a/yii/base/Theme.php b/framework/yii/base/Theme.php
similarity index 100%
rename from yii/base/Theme.php
rename to framework/yii/base/Theme.php
diff --git a/yii/base/UnknownClassException.php b/framework/yii/base/UnknownClassException.php
similarity index 100%
rename from yii/base/UnknownClassException.php
rename to framework/yii/base/UnknownClassException.php
diff --git a/yii/base/UnknownMethodException.php b/framework/yii/base/UnknownMethodException.php
similarity index 100%
rename from yii/base/UnknownMethodException.php
rename to framework/yii/base/UnknownMethodException.php
diff --git a/yii/base/UnknownPropertyException.php b/framework/yii/base/UnknownPropertyException.php
similarity index 100%
rename from yii/base/UnknownPropertyException.php
rename to framework/yii/base/UnknownPropertyException.php
diff --git a/yii/base/UserException.php b/framework/yii/base/UserException.php
similarity index 100%
rename from yii/base/UserException.php
rename to framework/yii/base/UserException.php
diff --git a/yii/base/View.php b/framework/yii/base/View.php
similarity index 100%
rename from yii/base/View.php
rename to framework/yii/base/View.php
diff --git a/yii/base/ViewEvent.php b/framework/yii/base/ViewEvent.php
similarity index 100%
rename from yii/base/ViewEvent.php
rename to framework/yii/base/ViewEvent.php
diff --git a/yii/base/ViewRenderer.php b/framework/yii/base/ViewRenderer.php
similarity index 100%
rename from yii/base/ViewRenderer.php
rename to framework/yii/base/ViewRenderer.php
diff --git a/yii/base/Widget.php b/framework/yii/base/Widget.php
similarity index 100%
rename from yii/base/Widget.php
rename to framework/yii/base/Widget.php
diff --git a/yii/behaviors/AutoTimestamp.php b/framework/yii/behaviors/AutoTimestamp.php
similarity index 100%
rename from yii/behaviors/AutoTimestamp.php
rename to framework/yii/behaviors/AutoTimestamp.php
diff --git a/yii/bootstrap/Alert.php b/framework/yii/bootstrap/Alert.php
similarity index 100%
rename from yii/bootstrap/Alert.php
rename to framework/yii/bootstrap/Alert.php
diff --git a/yii/bootstrap/Modal.php b/framework/yii/bootstrap/Modal.php
similarity index 100%
rename from yii/bootstrap/Modal.php
rename to framework/yii/bootstrap/Modal.php
diff --git a/yii/bootstrap/TypeAhead.php b/framework/yii/bootstrap/TypeAhead.php
similarity index 100%
rename from yii/bootstrap/TypeAhead.php
rename to framework/yii/bootstrap/TypeAhead.php
diff --git a/yii/bootstrap/Widget.php b/framework/yii/bootstrap/Widget.php
similarity index 100%
rename from yii/bootstrap/Widget.php
rename to framework/yii/bootstrap/Widget.php
diff --git a/yii/bootstrap/assets.php b/framework/yii/bootstrap/assets.php
similarity index 100%
rename from yii/bootstrap/assets.php
rename to framework/yii/bootstrap/assets.php
diff --git a/yii/bootstrap/assets/css/bootstrap-responsive.css b/framework/yii/bootstrap/assets/css/bootstrap-responsive.css
similarity index 100%
rename from yii/bootstrap/assets/css/bootstrap-responsive.css
rename to framework/yii/bootstrap/assets/css/bootstrap-responsive.css
diff --git a/yii/bootstrap/assets/css/bootstrap-responsive.min.css b/framework/yii/bootstrap/assets/css/bootstrap-responsive.min.css
similarity index 100%
rename from yii/bootstrap/assets/css/bootstrap-responsive.min.css
rename to framework/yii/bootstrap/assets/css/bootstrap-responsive.min.css
diff --git a/yii/bootstrap/assets/css/bootstrap.css b/framework/yii/bootstrap/assets/css/bootstrap.css
similarity index 100%
rename from yii/bootstrap/assets/css/bootstrap.css
rename to framework/yii/bootstrap/assets/css/bootstrap.css
diff --git a/yii/bootstrap/assets/css/bootstrap.min.css b/framework/yii/bootstrap/assets/css/bootstrap.min.css
similarity index 100%
rename from yii/bootstrap/assets/css/bootstrap.min.css
rename to framework/yii/bootstrap/assets/css/bootstrap.min.css
diff --git a/yii/bootstrap/assets/img/glyphicons-halflings-white.png b/framework/yii/bootstrap/assets/img/glyphicons-halflings-white.png
similarity index 100%
rename from yii/bootstrap/assets/img/glyphicons-halflings-white.png
rename to framework/yii/bootstrap/assets/img/glyphicons-halflings-white.png
diff --git a/yii/bootstrap/assets/img/glyphicons-halflings.png b/framework/yii/bootstrap/assets/img/glyphicons-halflings.png
similarity index 100%
rename from yii/bootstrap/assets/img/glyphicons-halflings.png
rename to framework/yii/bootstrap/assets/img/glyphicons-halflings.png
diff --git a/yii/bootstrap/assets/js/bootstrap-affix.js b/framework/yii/bootstrap/assets/js/bootstrap-affix.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-affix.js
rename to framework/yii/bootstrap/assets/js/bootstrap-affix.js
diff --git a/yii/bootstrap/assets/js/bootstrap-alert.js b/framework/yii/bootstrap/assets/js/bootstrap-alert.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-alert.js
rename to framework/yii/bootstrap/assets/js/bootstrap-alert.js
diff --git a/yii/bootstrap/assets/js/bootstrap-button.js b/framework/yii/bootstrap/assets/js/bootstrap-button.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-button.js
rename to framework/yii/bootstrap/assets/js/bootstrap-button.js
diff --git a/yii/bootstrap/assets/js/bootstrap-carousel.js b/framework/yii/bootstrap/assets/js/bootstrap-carousel.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-carousel.js
rename to framework/yii/bootstrap/assets/js/bootstrap-carousel.js
diff --git a/yii/bootstrap/assets/js/bootstrap-collapse.js b/framework/yii/bootstrap/assets/js/bootstrap-collapse.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-collapse.js
rename to framework/yii/bootstrap/assets/js/bootstrap-collapse.js
diff --git a/yii/bootstrap/assets/js/bootstrap-dropdown.js b/framework/yii/bootstrap/assets/js/bootstrap-dropdown.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-dropdown.js
rename to framework/yii/bootstrap/assets/js/bootstrap-dropdown.js
diff --git a/yii/bootstrap/assets/js/bootstrap-modal.js b/framework/yii/bootstrap/assets/js/bootstrap-modal.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-modal.js
rename to framework/yii/bootstrap/assets/js/bootstrap-modal.js
diff --git a/yii/bootstrap/assets/js/bootstrap-popover.js b/framework/yii/bootstrap/assets/js/bootstrap-popover.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-popover.js
rename to framework/yii/bootstrap/assets/js/bootstrap-popover.js
diff --git a/yii/bootstrap/assets/js/bootstrap-scrollspy.js b/framework/yii/bootstrap/assets/js/bootstrap-scrollspy.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-scrollspy.js
rename to framework/yii/bootstrap/assets/js/bootstrap-scrollspy.js
diff --git a/yii/bootstrap/assets/js/bootstrap-tab.js b/framework/yii/bootstrap/assets/js/bootstrap-tab.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-tab.js
rename to framework/yii/bootstrap/assets/js/bootstrap-tab.js
diff --git a/yii/bootstrap/assets/js/bootstrap-tooltip.js b/framework/yii/bootstrap/assets/js/bootstrap-tooltip.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-tooltip.js
rename to framework/yii/bootstrap/assets/js/bootstrap-tooltip.js
diff --git a/yii/bootstrap/assets/js/bootstrap-transition.js b/framework/yii/bootstrap/assets/js/bootstrap-transition.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-transition.js
rename to framework/yii/bootstrap/assets/js/bootstrap-transition.js
diff --git a/yii/bootstrap/assets/js/bootstrap-typeahead.js b/framework/yii/bootstrap/assets/js/bootstrap-typeahead.js
similarity index 100%
rename from yii/bootstrap/assets/js/bootstrap-typeahead.js
rename to framework/yii/bootstrap/assets/js/bootstrap-typeahead.js
diff --git a/yii/caching/ApcCache.php b/framework/yii/caching/ApcCache.php
similarity index 100%
rename from yii/caching/ApcCache.php
rename to framework/yii/caching/ApcCache.php
diff --git a/yii/caching/Cache.php b/framework/yii/caching/Cache.php
similarity index 100%
rename from yii/caching/Cache.php
rename to framework/yii/caching/Cache.php
diff --git a/yii/caching/ChainedDependency.php b/framework/yii/caching/ChainedDependency.php
similarity index 100%
rename from yii/caching/ChainedDependency.php
rename to framework/yii/caching/ChainedDependency.php
diff --git a/yii/caching/DbCache.php b/framework/yii/caching/DbCache.php
similarity index 100%
rename from yii/caching/DbCache.php
rename to framework/yii/caching/DbCache.php
diff --git a/yii/caching/DbDependency.php b/framework/yii/caching/DbDependency.php
similarity index 100%
rename from yii/caching/DbDependency.php
rename to framework/yii/caching/DbDependency.php
diff --git a/yii/caching/Dependency.php b/framework/yii/caching/Dependency.php
similarity index 100%
rename from yii/caching/Dependency.php
rename to framework/yii/caching/Dependency.php
diff --git a/yii/caching/DummyCache.php b/framework/yii/caching/DummyCache.php
similarity index 100%
rename from yii/caching/DummyCache.php
rename to framework/yii/caching/DummyCache.php
diff --git a/yii/caching/ExpressionDependency.php b/framework/yii/caching/ExpressionDependency.php
similarity index 100%
rename from yii/caching/ExpressionDependency.php
rename to framework/yii/caching/ExpressionDependency.php
diff --git a/yii/caching/FileCache.php b/framework/yii/caching/FileCache.php
similarity index 100%
rename from yii/caching/FileCache.php
rename to framework/yii/caching/FileCache.php
diff --git a/yii/caching/FileDependency.php b/framework/yii/caching/FileDependency.php
similarity index 100%
rename from yii/caching/FileDependency.php
rename to framework/yii/caching/FileDependency.php
diff --git a/yii/caching/MemCache.php b/framework/yii/caching/MemCache.php
similarity index 100%
rename from yii/caching/MemCache.php
rename to framework/yii/caching/MemCache.php
diff --git a/yii/caching/MemCacheServer.php b/framework/yii/caching/MemCacheServer.php
similarity index 100%
rename from yii/caching/MemCacheServer.php
rename to framework/yii/caching/MemCacheServer.php
diff --git a/yii/caching/WinCache.php b/framework/yii/caching/WinCache.php
similarity index 100%
rename from yii/caching/WinCache.php
rename to framework/yii/caching/WinCache.php
diff --git a/yii/caching/XCache.php b/framework/yii/caching/XCache.php
similarity index 100%
rename from yii/caching/XCache.php
rename to framework/yii/caching/XCache.php
diff --git a/yii/caching/ZendDataCache.php b/framework/yii/caching/ZendDataCache.php
similarity index 100%
rename from yii/caching/ZendDataCache.php
rename to framework/yii/caching/ZendDataCache.php
diff --git a/yii/console/Application.php b/framework/yii/console/Application.php
similarity index 100%
rename from yii/console/Application.php
rename to framework/yii/console/Application.php
diff --git a/yii/console/Controller.php b/framework/yii/console/Controller.php
similarity index 100%
rename from yii/console/Controller.php
rename to framework/yii/console/Controller.php
diff --git a/yii/console/Exception.php b/framework/yii/console/Exception.php
similarity index 100%
rename from yii/console/Exception.php
rename to framework/yii/console/Exception.php
diff --git a/yii/console/Request.php b/framework/yii/console/Request.php
similarity index 100%
rename from yii/console/Request.php
rename to framework/yii/console/Request.php
diff --git a/yii/console/controllers/AppController.php b/framework/yii/console/controllers/AppController.php
similarity index 100%
rename from yii/console/controllers/AppController.php
rename to framework/yii/console/controllers/AppController.php
diff --git a/yii/console/controllers/AssetController.php b/framework/yii/console/controllers/AssetController.php
similarity index 100%
rename from yii/console/controllers/AssetController.php
rename to framework/yii/console/controllers/AssetController.php
diff --git a/yii/console/controllers/CacheController.php b/framework/yii/console/controllers/CacheController.php
similarity index 100%
rename from yii/console/controllers/CacheController.php
rename to framework/yii/console/controllers/CacheController.php
diff --git a/yii/console/controllers/HelpController.php b/framework/yii/console/controllers/HelpController.php
similarity index 100%
rename from yii/console/controllers/HelpController.php
rename to framework/yii/console/controllers/HelpController.php
diff --git a/yii/console/controllers/MessageController.php b/framework/yii/console/controllers/MessageController.php
similarity index 100%
rename from yii/console/controllers/MessageController.php
rename to framework/yii/console/controllers/MessageController.php
diff --git a/yii/console/controllers/MigrateController.php b/framework/yii/console/controllers/MigrateController.php
similarity index 100%
rename from yii/console/controllers/MigrateController.php
rename to framework/yii/console/controllers/MigrateController.php
diff --git a/yii/console/runtime/.gitignore b/framework/yii/console/runtime/.gitignore
similarity index 100%
rename from yii/console/runtime/.gitignore
rename to framework/yii/console/runtime/.gitignore
diff --git a/yii/db/ActiveQuery.php b/framework/yii/db/ActiveQuery.php
similarity index 100%
rename from yii/db/ActiveQuery.php
rename to framework/yii/db/ActiveQuery.php
diff --git a/yii/db/ActiveRecord.php b/framework/yii/db/ActiveRecord.php
similarity index 100%
rename from yii/db/ActiveRecord.php
rename to framework/yii/db/ActiveRecord.php
diff --git a/yii/db/ActiveRelation.php b/framework/yii/db/ActiveRelation.php
similarity index 100%
rename from yii/db/ActiveRelation.php
rename to framework/yii/db/ActiveRelation.php
diff --git a/yii/db/ColumnSchema.php b/framework/yii/db/ColumnSchema.php
similarity index 100%
rename from yii/db/ColumnSchema.php
rename to framework/yii/db/ColumnSchema.php
diff --git a/yii/db/Command.php b/framework/yii/db/Command.php
similarity index 100%
rename from yii/db/Command.php
rename to framework/yii/db/Command.php
diff --git a/yii/db/Connection.php b/framework/yii/db/Connection.php
similarity index 100%
rename from yii/db/Connection.php
rename to framework/yii/db/Connection.php
diff --git a/yii/db/DataReader.php b/framework/yii/db/DataReader.php
similarity index 100%
rename from yii/db/DataReader.php
rename to framework/yii/db/DataReader.php
diff --git a/yii/db/Exception.php b/framework/yii/db/Exception.php
similarity index 100%
rename from yii/db/Exception.php
rename to framework/yii/db/Exception.php
diff --git a/yii/db/Expression.php b/framework/yii/db/Expression.php
similarity index 100%
rename from yii/db/Expression.php
rename to framework/yii/db/Expression.php
diff --git a/yii/db/Migration.php b/framework/yii/db/Migration.php
similarity index 100%
rename from yii/db/Migration.php
rename to framework/yii/db/Migration.php
diff --git a/yii/db/Query.php b/framework/yii/db/Query.php
similarity index 100%
rename from yii/db/Query.php
rename to framework/yii/db/Query.php
diff --git a/yii/db/QueryBuilder.php b/framework/yii/db/QueryBuilder.php
similarity index 100%
rename from yii/db/QueryBuilder.php
rename to framework/yii/db/QueryBuilder.php
diff --git a/yii/db/Schema.php b/framework/yii/db/Schema.php
similarity index 100%
rename from yii/db/Schema.php
rename to framework/yii/db/Schema.php
diff --git a/yii/db/StaleObjectException.php b/framework/yii/db/StaleObjectException.php
similarity index 100%
rename from yii/db/StaleObjectException.php
rename to framework/yii/db/StaleObjectException.php
diff --git a/yii/db/TableSchema.php b/framework/yii/db/TableSchema.php
similarity index 100%
rename from yii/db/TableSchema.php
rename to framework/yii/db/TableSchema.php
diff --git a/yii/db/Transaction.php b/framework/yii/db/Transaction.php
similarity index 100%
rename from yii/db/Transaction.php
rename to framework/yii/db/Transaction.php
diff --git a/yii/db/mysql/QueryBuilder.php b/framework/yii/db/mysql/QueryBuilder.php
similarity index 100%
rename from yii/db/mysql/QueryBuilder.php
rename to framework/yii/db/mysql/QueryBuilder.php
diff --git a/yii/db/mysql/Schema.php b/framework/yii/db/mysql/Schema.php
similarity index 100%
rename from yii/db/mysql/Schema.php
rename to framework/yii/db/mysql/Schema.php
diff --git a/yii/db/sqlite/QueryBuilder.php b/framework/yii/db/sqlite/QueryBuilder.php
similarity index 100%
rename from yii/db/sqlite/QueryBuilder.php
rename to framework/yii/db/sqlite/QueryBuilder.php
diff --git a/yii/db/sqlite/Schema.php b/framework/yii/db/sqlite/Schema.php
similarity index 100%
rename from yii/db/sqlite/Schema.php
rename to framework/yii/db/sqlite/Schema.php
diff --git a/yii/debug/Module.php b/framework/yii/debug/Module.php
similarity index 100%
rename from yii/debug/Module.php
rename to framework/yii/debug/Module.php
diff --git a/yii/debug/Toolbar.php b/framework/yii/debug/Toolbar.php
similarity index 100%
rename from yii/debug/Toolbar.php
rename to framework/yii/debug/Toolbar.php
diff --git a/yii/debug/controllers/DefaultController.php b/framework/yii/debug/controllers/DefaultController.php
similarity index 100%
rename from yii/debug/controllers/DefaultController.php
rename to framework/yii/debug/controllers/DefaultController.php
diff --git a/yii/debug/views/default/toolbar.php b/framework/yii/debug/views/default/toolbar.php
similarity index 100%
rename from yii/debug/views/default/toolbar.php
rename to framework/yii/debug/views/default/toolbar.php
diff --git a/yii/helpers/ArrayHelper.php b/framework/yii/helpers/ArrayHelper.php
similarity index 100%
rename from yii/helpers/ArrayHelper.php
rename to framework/yii/helpers/ArrayHelper.php
diff --git a/yii/helpers/Console.php b/framework/yii/helpers/Console.php
similarity index 100%
rename from yii/helpers/Console.php
rename to framework/yii/helpers/Console.php
diff --git a/yii/helpers/FileHelper.php b/framework/yii/helpers/FileHelper.php
similarity index 100%
rename from yii/helpers/FileHelper.php
rename to framework/yii/helpers/FileHelper.php
diff --git a/yii/helpers/Html.php b/framework/yii/helpers/Html.php
similarity index 100%
rename from yii/helpers/Html.php
rename to framework/yii/helpers/Html.php
diff --git a/yii/helpers/Json.php b/framework/yii/helpers/Json.php
similarity index 100%
rename from yii/helpers/Json.php
rename to framework/yii/helpers/Json.php
diff --git a/yii/helpers/Markdown.php b/framework/yii/helpers/Markdown.php
similarity index 100%
rename from yii/helpers/Markdown.php
rename to framework/yii/helpers/Markdown.php
diff --git a/yii/helpers/Purifier.php b/framework/yii/helpers/Purifier.php
similarity index 100%
rename from yii/helpers/Purifier.php
rename to framework/yii/helpers/Purifier.php
diff --git a/yii/helpers/SecurityHelper.php b/framework/yii/helpers/SecurityHelper.php
similarity index 100%
rename from yii/helpers/SecurityHelper.php
rename to framework/yii/helpers/SecurityHelper.php
diff --git a/yii/helpers/StringHelper.php b/framework/yii/helpers/StringHelper.php
similarity index 100%
rename from yii/helpers/StringHelper.php
rename to framework/yii/helpers/StringHelper.php
diff --git a/yii/helpers/VarDumper.php b/framework/yii/helpers/VarDumper.php
similarity index 100%
rename from yii/helpers/VarDumper.php
rename to framework/yii/helpers/VarDumper.php
diff --git a/yii/helpers/base/ArrayHelper.php b/framework/yii/helpers/base/ArrayHelper.php
similarity index 100%
rename from yii/helpers/base/ArrayHelper.php
rename to framework/yii/helpers/base/ArrayHelper.php
diff --git a/yii/helpers/base/Console.php b/framework/yii/helpers/base/Console.php
similarity index 100%
rename from yii/helpers/base/Console.php
rename to framework/yii/helpers/base/Console.php
diff --git a/yii/helpers/base/FileHelper.php b/framework/yii/helpers/base/FileHelper.php
similarity index 100%
rename from yii/helpers/base/FileHelper.php
rename to framework/yii/helpers/base/FileHelper.php
diff --git a/yii/helpers/base/Html.php b/framework/yii/helpers/base/Html.php
similarity index 100%
rename from yii/helpers/base/Html.php
rename to framework/yii/helpers/base/Html.php
diff --git a/yii/helpers/base/Json.php b/framework/yii/helpers/base/Json.php
similarity index 100%
rename from yii/helpers/base/Json.php
rename to framework/yii/helpers/base/Json.php
diff --git a/yii/helpers/base/Markdown.php b/framework/yii/helpers/base/Markdown.php
similarity index 100%
rename from yii/helpers/base/Markdown.php
rename to framework/yii/helpers/base/Markdown.php
diff --git a/yii/helpers/base/Purifier.php b/framework/yii/helpers/base/Purifier.php
similarity index 100%
rename from yii/helpers/base/Purifier.php
rename to framework/yii/helpers/base/Purifier.php
diff --git a/yii/helpers/base/SecurityHelper.php b/framework/yii/helpers/base/SecurityHelper.php
similarity index 100%
rename from yii/helpers/base/SecurityHelper.php
rename to framework/yii/helpers/base/SecurityHelper.php
diff --git a/yii/helpers/base/StringHelper.php b/framework/yii/helpers/base/StringHelper.php
similarity index 100%
rename from yii/helpers/base/StringHelper.php
rename to framework/yii/helpers/base/StringHelper.php
diff --git a/yii/helpers/base/VarDumper.php b/framework/yii/helpers/base/VarDumper.php
similarity index 100%
rename from yii/helpers/base/VarDumper.php
rename to framework/yii/helpers/base/VarDumper.php
diff --git a/yii/helpers/base/mimeTypes.php b/framework/yii/helpers/base/mimeTypes.php
similarity index 100%
rename from yii/helpers/base/mimeTypes.php
rename to framework/yii/helpers/base/mimeTypes.php
diff --git a/yii/i18n/GettextFile.php b/framework/yii/i18n/GettextFile.php
similarity index 100%
rename from yii/i18n/GettextFile.php
rename to framework/yii/i18n/GettextFile.php
diff --git a/yii/i18n/GettextMessageSource.php b/framework/yii/i18n/GettextMessageSource.php
similarity index 100%
rename from yii/i18n/GettextMessageSource.php
rename to framework/yii/i18n/GettextMessageSource.php
diff --git a/yii/i18n/GettextMoFile.php b/framework/yii/i18n/GettextMoFile.php
similarity index 100%
rename from yii/i18n/GettextMoFile.php
rename to framework/yii/i18n/GettextMoFile.php
diff --git a/yii/i18n/GettextPoFile.php b/framework/yii/i18n/GettextPoFile.php
similarity index 100%
rename from yii/i18n/GettextPoFile.php
rename to framework/yii/i18n/GettextPoFile.php
diff --git a/yii/i18n/I18N.php b/framework/yii/i18n/I18N.php
similarity index 100%
rename from yii/i18n/I18N.php
rename to framework/yii/i18n/I18N.php
diff --git a/yii/i18n/MessageSource.php b/framework/yii/i18n/MessageSource.php
similarity index 100%
rename from yii/i18n/MessageSource.php
rename to framework/yii/i18n/MessageSource.php
diff --git a/yii/i18n/MissingTranslationEvent.php b/framework/yii/i18n/MissingTranslationEvent.php
similarity index 100%
rename from yii/i18n/MissingTranslationEvent.php
rename to framework/yii/i18n/MissingTranslationEvent.php
diff --git a/yii/i18n/PhpMessageSource.php b/framework/yii/i18n/PhpMessageSource.php
similarity index 100%
rename from yii/i18n/PhpMessageSource.php
rename to framework/yii/i18n/PhpMessageSource.php
diff --git a/yii/i18n/data/plurals.php b/framework/yii/i18n/data/plurals.php
similarity index 100%
rename from yii/i18n/data/plurals.php
rename to framework/yii/i18n/data/plurals.php
diff --git a/yii/i18n/data/plurals.xml b/framework/yii/i18n/data/plurals.xml
similarity index 100%
rename from yii/i18n/data/plurals.xml
rename to framework/yii/i18n/data/plurals.xml
diff --git a/yii/logging/DbTarget.php b/framework/yii/logging/DbTarget.php
similarity index 100%
rename from yii/logging/DbTarget.php
rename to framework/yii/logging/DbTarget.php
diff --git a/yii/logging/DebugTarget.php b/framework/yii/logging/DebugTarget.php
similarity index 100%
rename from yii/logging/DebugTarget.php
rename to framework/yii/logging/DebugTarget.php
diff --git a/yii/logging/EmailTarget.php b/framework/yii/logging/EmailTarget.php
similarity index 100%
rename from yii/logging/EmailTarget.php
rename to framework/yii/logging/EmailTarget.php
diff --git a/yii/logging/FileTarget.php b/framework/yii/logging/FileTarget.php
similarity index 100%
rename from yii/logging/FileTarget.php
rename to framework/yii/logging/FileTarget.php
diff --git a/yii/logging/Logger.php b/framework/yii/logging/Logger.php
similarity index 100%
rename from yii/logging/Logger.php
rename to framework/yii/logging/Logger.php
diff --git a/yii/logging/ProfileTarget.php b/framework/yii/logging/ProfileTarget.php
similarity index 100%
rename from yii/logging/ProfileTarget.php
rename to framework/yii/logging/ProfileTarget.php
diff --git a/yii/logging/Router.php b/framework/yii/logging/Router.php
similarity index 100%
rename from yii/logging/Router.php
rename to framework/yii/logging/Router.php
diff --git a/yii/logging/Target.php b/framework/yii/logging/Target.php
similarity index 100%
rename from yii/logging/Target.php
rename to framework/yii/logging/Target.php
diff --git a/yii/rbac/Assignment.php b/framework/yii/rbac/Assignment.php
similarity index 100%
rename from yii/rbac/Assignment.php
rename to framework/yii/rbac/Assignment.php
diff --git a/yii/rbac/DbManager.php b/framework/yii/rbac/DbManager.php
similarity index 100%
rename from yii/rbac/DbManager.php
rename to framework/yii/rbac/DbManager.php
diff --git a/yii/rbac/Item.php b/framework/yii/rbac/Item.php
similarity index 100%
rename from yii/rbac/Item.php
rename to framework/yii/rbac/Item.php
diff --git a/yii/rbac/Manager.php b/framework/yii/rbac/Manager.php
similarity index 100%
rename from yii/rbac/Manager.php
rename to framework/yii/rbac/Manager.php
diff --git a/yii/rbac/PhpManager.php b/framework/yii/rbac/PhpManager.php
similarity index 100%
rename from yii/rbac/PhpManager.php
rename to framework/yii/rbac/PhpManager.php
diff --git a/yii/rbac/schema-mssql.sql b/framework/yii/rbac/schema-mssql.sql
similarity index 100%
rename from yii/rbac/schema-mssql.sql
rename to framework/yii/rbac/schema-mssql.sql
diff --git a/yii/rbac/schema-mysql.sql b/framework/yii/rbac/schema-mysql.sql
similarity index 100%
rename from yii/rbac/schema-mysql.sql
rename to framework/yii/rbac/schema-mysql.sql
diff --git a/yii/rbac/schema-oci.sql b/framework/yii/rbac/schema-oci.sql
similarity index 100%
rename from yii/rbac/schema-oci.sql
rename to framework/yii/rbac/schema-oci.sql
diff --git a/yii/rbac/schema-pgsql.sql b/framework/yii/rbac/schema-pgsql.sql
similarity index 100%
rename from yii/rbac/schema-pgsql.sql
rename to framework/yii/rbac/schema-pgsql.sql
diff --git a/yii/rbac/schema-sqlite.sql b/framework/yii/rbac/schema-sqlite.sql
similarity index 100%
rename from yii/rbac/schema-sqlite.sql
rename to framework/yii/rbac/schema-sqlite.sql
diff --git a/yii/renderers/SmartyViewRenderer.php b/framework/yii/renderers/SmartyViewRenderer.php
similarity index 100%
rename from yii/renderers/SmartyViewRenderer.php
rename to framework/yii/renderers/SmartyViewRenderer.php
diff --git a/yii/renderers/TwigViewRenderer.php b/framework/yii/renderers/TwigViewRenderer.php
similarity index 100%
rename from yii/renderers/TwigViewRenderer.php
rename to framework/yii/renderers/TwigViewRenderer.php
diff --git a/yii/requirements/YiiRequirementChecker.php b/framework/yii/requirements/YiiRequirementChecker.php
similarity index 100%
rename from yii/requirements/YiiRequirementChecker.php
rename to framework/yii/requirements/YiiRequirementChecker.php
diff --git a/yii/requirements/requirements.php b/framework/yii/requirements/requirements.php
similarity index 100%
rename from yii/requirements/requirements.php
rename to framework/yii/requirements/requirements.php
diff --git a/yii/requirements/views/console/index.php b/framework/yii/requirements/views/console/index.php
similarity index 100%
rename from yii/requirements/views/console/index.php
rename to framework/yii/requirements/views/console/index.php
diff --git a/yii/requirements/views/web/css.php b/framework/yii/requirements/views/web/css.php
similarity index 100%
rename from yii/requirements/views/web/css.php
rename to framework/yii/requirements/views/web/css.php
diff --git a/yii/requirements/views/web/index.php b/framework/yii/requirements/views/web/index.php
similarity index 100%
rename from yii/requirements/views/web/index.php
rename to framework/yii/requirements/views/web/index.php
diff --git a/yii/test/TestCase.php b/framework/yii/test/TestCase.php
similarity index 100%
rename from yii/test/TestCase.php
rename to framework/yii/test/TestCase.php
diff --git a/yii/test/WebTestCase.php b/framework/yii/test/WebTestCase.php
similarity index 100%
rename from yii/test/WebTestCase.php
rename to framework/yii/test/WebTestCase.php
diff --git a/yii/validators/BooleanValidator.php b/framework/yii/validators/BooleanValidator.php
similarity index 100%
rename from yii/validators/BooleanValidator.php
rename to framework/yii/validators/BooleanValidator.php
diff --git a/yii/validators/CaptchaValidator.php b/framework/yii/validators/CaptchaValidator.php
similarity index 100%
rename from yii/validators/CaptchaValidator.php
rename to framework/yii/validators/CaptchaValidator.php
diff --git a/yii/validators/CompareValidator.php b/framework/yii/validators/CompareValidator.php
similarity index 100%
rename from yii/validators/CompareValidator.php
rename to framework/yii/validators/CompareValidator.php
diff --git a/yii/validators/DateValidator.php b/framework/yii/validators/DateValidator.php
similarity index 100%
rename from yii/validators/DateValidator.php
rename to framework/yii/validators/DateValidator.php
diff --git a/yii/validators/DefaultValueValidator.php b/framework/yii/validators/DefaultValueValidator.php
similarity index 100%
rename from yii/validators/DefaultValueValidator.php
rename to framework/yii/validators/DefaultValueValidator.php
diff --git a/yii/validators/EmailValidator.php b/framework/yii/validators/EmailValidator.php
similarity index 100%
rename from yii/validators/EmailValidator.php
rename to framework/yii/validators/EmailValidator.php
diff --git a/yii/validators/ExistValidator.php b/framework/yii/validators/ExistValidator.php
similarity index 100%
rename from yii/validators/ExistValidator.php
rename to framework/yii/validators/ExistValidator.php
diff --git a/yii/validators/FileValidator.php b/framework/yii/validators/FileValidator.php
similarity index 100%
rename from yii/validators/FileValidator.php
rename to framework/yii/validators/FileValidator.php
diff --git a/yii/validators/FilterValidator.php b/framework/yii/validators/FilterValidator.php
similarity index 100%
rename from yii/validators/FilterValidator.php
rename to framework/yii/validators/FilterValidator.php
diff --git a/yii/validators/InlineValidator.php b/framework/yii/validators/InlineValidator.php
similarity index 100%
rename from yii/validators/InlineValidator.php
rename to framework/yii/validators/InlineValidator.php
diff --git a/yii/validators/NumberValidator.php b/framework/yii/validators/NumberValidator.php
similarity index 100%
rename from yii/validators/NumberValidator.php
rename to framework/yii/validators/NumberValidator.php
diff --git a/yii/validators/RangeValidator.php b/framework/yii/validators/RangeValidator.php
similarity index 100%
rename from yii/validators/RangeValidator.php
rename to framework/yii/validators/RangeValidator.php
diff --git a/yii/validators/RegularExpressionValidator.php b/framework/yii/validators/RegularExpressionValidator.php
similarity index 100%
rename from yii/validators/RegularExpressionValidator.php
rename to framework/yii/validators/RegularExpressionValidator.php
diff --git a/yii/validators/RequiredValidator.php b/framework/yii/validators/RequiredValidator.php
similarity index 100%
rename from yii/validators/RequiredValidator.php
rename to framework/yii/validators/RequiredValidator.php
diff --git a/yii/validators/StringValidator.php b/framework/yii/validators/StringValidator.php
similarity index 100%
rename from yii/validators/StringValidator.php
rename to framework/yii/validators/StringValidator.php
diff --git a/yii/validators/UniqueValidator.php b/framework/yii/validators/UniqueValidator.php
similarity index 100%
rename from yii/validators/UniqueValidator.php
rename to framework/yii/validators/UniqueValidator.php
diff --git a/yii/validators/UrlValidator.php b/framework/yii/validators/UrlValidator.php
similarity index 100%
rename from yii/validators/UrlValidator.php
rename to framework/yii/validators/UrlValidator.php
diff --git a/yii/validators/Validator.php b/framework/yii/validators/Validator.php
similarity index 100%
rename from yii/validators/Validator.php
rename to framework/yii/validators/Validator.php
diff --git a/yii/views/error.php b/framework/yii/views/error.php
similarity index 100%
rename from yii/views/error.php
rename to framework/yii/views/error.php
diff --git a/yii/views/exception.php b/framework/yii/views/exception.php
similarity index 100%
rename from yii/views/exception.php
rename to framework/yii/views/exception.php
diff --git a/yii/views/migration.php b/framework/yii/views/migration.php
similarity index 100%
rename from yii/views/migration.php
rename to framework/yii/views/migration.php
diff --git a/yii/web/AccessControl.php b/framework/yii/web/AccessControl.php
similarity index 100%
rename from yii/web/AccessControl.php
rename to framework/yii/web/AccessControl.php
diff --git a/yii/web/AccessRule.php b/framework/yii/web/AccessRule.php
similarity index 100%
rename from yii/web/AccessRule.php
rename to framework/yii/web/AccessRule.php
diff --git a/yii/web/Application.php b/framework/yii/web/Application.php
similarity index 100%
rename from yii/web/Application.php
rename to framework/yii/web/Application.php
diff --git a/yii/web/AssetBundle.php b/framework/yii/web/AssetBundle.php
similarity index 100%
rename from yii/web/AssetBundle.php
rename to framework/yii/web/AssetBundle.php
diff --git a/yii/web/AssetConverter.php b/framework/yii/web/AssetConverter.php
similarity index 100%
rename from yii/web/AssetConverter.php
rename to framework/yii/web/AssetConverter.php
diff --git a/yii/web/AssetManager.php b/framework/yii/web/AssetManager.php
similarity index 100%
rename from yii/web/AssetManager.php
rename to framework/yii/web/AssetManager.php
diff --git a/yii/web/CacheSession.php b/framework/yii/web/CacheSession.php
similarity index 100%
rename from yii/web/CacheSession.php
rename to framework/yii/web/CacheSession.php
diff --git a/yii/web/CaptchaAction.php b/framework/yii/web/CaptchaAction.php
similarity index 100%
rename from yii/web/CaptchaAction.php
rename to framework/yii/web/CaptchaAction.php
diff --git a/yii/web/Controller.php b/framework/yii/web/Controller.php
similarity index 100%
rename from yii/web/Controller.php
rename to framework/yii/web/Controller.php
diff --git a/yii/web/Cookie.php b/framework/yii/web/Cookie.php
similarity index 100%
rename from yii/web/Cookie.php
rename to framework/yii/web/Cookie.php
diff --git a/yii/web/CookieCollection.php b/framework/yii/web/CookieCollection.php
similarity index 100%
rename from yii/web/CookieCollection.php
rename to framework/yii/web/CookieCollection.php
diff --git a/yii/web/DbSession.php b/framework/yii/web/DbSession.php
similarity index 100%
rename from yii/web/DbSession.php
rename to framework/yii/web/DbSession.php
diff --git a/yii/web/HttpCache.php b/framework/yii/web/HttpCache.php
similarity index 100%
rename from yii/web/HttpCache.php
rename to framework/yii/web/HttpCache.php
diff --git a/yii/web/IAssetConverter.php b/framework/yii/web/IAssetConverter.php
similarity index 100%
rename from yii/web/IAssetConverter.php
rename to framework/yii/web/IAssetConverter.php
diff --git a/yii/web/Identity.php b/framework/yii/web/Identity.php
similarity index 100%
rename from yii/web/Identity.php
rename to framework/yii/web/Identity.php
diff --git a/yii/web/JsExpression.php b/framework/yii/web/JsExpression.php
similarity index 100%
rename from yii/web/JsExpression.php
rename to framework/yii/web/JsExpression.php
diff --git a/yii/web/PageCache.php b/framework/yii/web/PageCache.php
similarity index 100%
rename from yii/web/PageCache.php
rename to framework/yii/web/PageCache.php
diff --git a/yii/web/Pagination.php b/framework/yii/web/Pagination.php
similarity index 100%
rename from yii/web/Pagination.php
rename to framework/yii/web/Pagination.php
diff --git a/yii/web/Request.php b/framework/yii/web/Request.php
similarity index 100%
rename from yii/web/Request.php
rename to framework/yii/web/Request.php
diff --git a/yii/web/Response.php b/framework/yii/web/Response.php
similarity index 100%
rename from yii/web/Response.php
rename to framework/yii/web/Response.php
diff --git a/yii/web/Session.php b/framework/yii/web/Session.php
similarity index 100%
rename from yii/web/Session.php
rename to framework/yii/web/Session.php
diff --git a/yii/web/SessionIterator.php b/framework/yii/web/SessionIterator.php
similarity index 100%
rename from yii/web/SessionIterator.php
rename to framework/yii/web/SessionIterator.php
diff --git a/yii/web/Sort.php b/framework/yii/web/Sort.php
similarity index 100%
rename from yii/web/Sort.php
rename to framework/yii/web/Sort.php
diff --git a/yii/web/SpicyRice.md b/framework/yii/web/SpicyRice.md
similarity index 100%
rename from yii/web/SpicyRice.md
rename to framework/yii/web/SpicyRice.md
diff --git a/yii/web/SpicyRice.ttf b/framework/yii/web/SpicyRice.ttf
similarity index 100%
rename from yii/web/SpicyRice.ttf
rename to framework/yii/web/SpicyRice.ttf
diff --git a/yii/web/UploadedFile.php b/framework/yii/web/UploadedFile.php
similarity index 100%
rename from yii/web/UploadedFile.php
rename to framework/yii/web/UploadedFile.php
diff --git a/yii/web/UrlManager.php b/framework/yii/web/UrlManager.php
similarity index 100%
rename from yii/web/UrlManager.php
rename to framework/yii/web/UrlManager.php
diff --git a/yii/web/UrlRule.php b/framework/yii/web/UrlRule.php
similarity index 100%
rename from yii/web/UrlRule.php
rename to framework/yii/web/UrlRule.php
diff --git a/yii/web/User.php b/framework/yii/web/User.php
similarity index 100%
rename from yii/web/User.php
rename to framework/yii/web/User.php
diff --git a/yii/web/UserEvent.php b/framework/yii/web/UserEvent.php
similarity index 100%
rename from yii/web/UserEvent.php
rename to framework/yii/web/UserEvent.php
diff --git a/yii/widgets/ActiveField.php b/framework/yii/widgets/ActiveField.php
similarity index 100%
rename from yii/widgets/ActiveField.php
rename to framework/yii/widgets/ActiveField.php
diff --git a/yii/widgets/ActiveForm.php b/framework/yii/widgets/ActiveForm.php
similarity index 100%
rename from yii/widgets/ActiveForm.php
rename to framework/yii/widgets/ActiveForm.php
diff --git a/yii/widgets/Block.php b/framework/yii/widgets/Block.php
similarity index 100%
rename from yii/widgets/Block.php
rename to framework/yii/widgets/Block.php
diff --git a/yii/widgets/Breadcrumbs.php b/framework/yii/widgets/Breadcrumbs.php
similarity index 100%
rename from yii/widgets/Breadcrumbs.php
rename to framework/yii/widgets/Breadcrumbs.php
diff --git a/yii/widgets/Captcha.php b/framework/yii/widgets/Captcha.php
similarity index 100%
rename from yii/widgets/Captcha.php
rename to framework/yii/widgets/Captcha.php
diff --git a/yii/widgets/ContentDecorator.php b/framework/yii/widgets/ContentDecorator.php
similarity index 100%
rename from yii/widgets/ContentDecorator.php
rename to framework/yii/widgets/ContentDecorator.php
diff --git a/yii/widgets/FragmentCache.php b/framework/yii/widgets/FragmentCache.php
similarity index 100%
rename from yii/widgets/FragmentCache.php
rename to framework/yii/widgets/FragmentCache.php
diff --git a/yii/widgets/LinkPager.php b/framework/yii/widgets/LinkPager.php
similarity index 100%
rename from yii/widgets/LinkPager.php
rename to framework/yii/widgets/LinkPager.php
diff --git a/yii/widgets/ListPager.php b/framework/yii/widgets/ListPager.php
similarity index 100%
rename from yii/widgets/ListPager.php
rename to framework/yii/widgets/ListPager.php
diff --git a/yii/widgets/Menu.php b/framework/yii/widgets/Menu.php
similarity index 100%
rename from yii/widgets/Menu.php
rename to framework/yii/widgets/Menu.php
diff --git a/yii/yii b/framework/yii/yii
similarity index 100%
rename from yii/yii
rename to framework/yii/yii
diff --git a/yii/yii.bat b/framework/yii/yii.bat
similarity index 100%
rename from yii/yii.bat
rename to framework/yii/yii.bat