diff --git a/apps/bootstrap/protected/commands/HelloController.php b/apps/bootstrap/commands/HelloController.php
similarity index 100%
rename from apps/bootstrap/protected/commands/HelloController.php
rename to apps/bootstrap/commands/HelloController.php
diff --git a/apps/bootstrap/composer.json b/apps/bootstrap/composer.json
new file mode 100644
index 0000000..323b751
--- /dev/null
+++ b/apps/bootstrap/composer.json
@@ -0,0 +1,44 @@
+{
+	"name": "yiisoft/yii2-bootstrap",
+	"description": "Yii 2 Bootstrap Application",
+	"keywords": ["yii", "framework", "bootstrap"],
+	"homepage": "http://www.yiiframework.com/",
+	"type": "project",
+	"license": "BSD-3-Clause",
+	"support": {
+		"issues": "https://github.com/yiisoft/yii2/issues?state=open",
+		"forum": "http://www.yiiframework.com/forum/",
+		"wiki": "http://www.yiiframework.com/wiki/",
+		"irc": "irc://irc.freenode.net/yii",
+		"source": "https://github.com/yiisoft/yii2"
+	},
+	"config": {
+		"vendor-dir": "vendor"
+	},
+	"bin": [
+		"yii"
+	],
+	"minimum-stability": "dev",
+	"repositories": [
+		{
+			"type": "package",
+			"package": {
+				"name": "bestiejs/punycode.js",
+				"version": "1.2.1",
+				"dist": {
+					"url": "https://github.com/bestiejs/punycode.js/archive/1.2.1.zip",
+					"type": "zip"
+				},
+				"source": {
+					"url": "https://github.com/bestiejs/punycode.js.git",
+					"type": "git",
+					"reference": "tags/1.2.1"
+				}
+			}
+		}
+	],
+	"require": {
+		"php": ">=5.3.0",
+		"yiisoft/yii2": "dev-master"
+	}
+}
diff --git a/apps/bootstrap/protected/config/assets.php b/apps/bootstrap/config/assets.php
similarity index 100%
rename from apps/bootstrap/protected/config/assets.php
rename to apps/bootstrap/config/assets.php
diff --git a/apps/bootstrap/protected/config/console.php b/apps/bootstrap/config/console.php
similarity index 100%
rename from apps/bootstrap/protected/config/console.php
rename to apps/bootstrap/config/console.php
diff --git a/apps/bootstrap/protected/config/main.php b/apps/bootstrap/config/main.php
similarity index 100%
rename from apps/bootstrap/protected/config/main.php
rename to apps/bootstrap/config/main.php
diff --git a/apps/bootstrap/protected/config/params.php b/apps/bootstrap/config/params.php
similarity index 100%
rename from apps/bootstrap/protected/config/params.php
rename to apps/bootstrap/config/params.php
diff --git a/apps/bootstrap/protected/controllers/SiteController.php b/apps/bootstrap/controllers/SiteController.php
similarity index 100%
rename from apps/bootstrap/protected/controllers/SiteController.php
rename to apps/bootstrap/controllers/SiteController.php
diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
deleted file mode 100644
index a0488ca..0000000
--- a/apps/bootstrap/index.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-// comment out the following line to disable debug mode
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-
-$frameworkPath = __DIR__ . '/../../yii';
-
-require($frameworkPath . '/Yii.php');
-// Register Composer autoloader
-@include($frameworkPath . '/vendor/autoload.php');
-
-$config = require(__DIR__ . '/protected/config/main.php');
-$application = new yii\web\Application($config);
-$application->run();
diff --git a/apps/bootstrap/protected/models/ContactForm.php b/apps/bootstrap/models/ContactForm.php
similarity index 100%
rename from apps/bootstrap/protected/models/ContactForm.php
rename to apps/bootstrap/models/ContactForm.php
diff --git a/apps/bootstrap/protected/models/LoginForm.php b/apps/bootstrap/models/LoginForm.php
similarity index 100%
rename from apps/bootstrap/protected/models/LoginForm.php
rename to apps/bootstrap/models/LoginForm.php
diff --git a/apps/bootstrap/protected/models/User.php b/apps/bootstrap/models/User.php
similarity index 100%
rename from apps/bootstrap/protected/models/User.php
rename to apps/bootstrap/models/User.php
diff --git a/apps/bootstrap/protected/.htaccess b/apps/bootstrap/protected/.htaccess
deleted file mode 100644
index 8d2f256..0000000
--- a/apps/bootstrap/protected/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
diff --git a/apps/bootstrap/readme.md b/apps/bootstrap/readme.md
new file mode 100644
index 0000000..63c3f29
--- /dev/null
+++ b/apps/bootstrap/readme.md
@@ -0,0 +1,40 @@
+Yii 2 Bootstrap Application
+===========================
+
+** NOTE ** Yii 2 and the relevant applications and extensions are still under heavy
+development. We may make significant changes without prior notices. Please do not
+use them for production. Please consider using [Yii v1.1](https://github.com/yiisoft/yii)
+which is production ready.
+
+
+Thank you for choosing Yii 2 - the new generation of high-performance PHP framework.
+
+The Yii 2 Bootstrap Application is a Web application template that you can easily customize
+to fit for your needs. It is particularly suitable for small Websites which mainly contain
+a few informational pages.
+
+
+DIRECTORY STRUCTURE
+-------------------
+
+      commands/           contains console commands (controllers)
+      config/             contains application configurations
+      controllers/        contains Web controller classes
+      models/             contains model classes
+      runtime/            contains files generated during runtime
+      vendor/             contains dependent 3rd-party packages
+      views/              contains view files for the Web application
+      www/                contains the entry script and Web resources
+
+
+
+REQUIREMENTS
+------------
+
+The minimum requirement by Yii is that your Web server supports PHP 5.3.?.
+
+
+INSTALLATION
+------------
+
+
diff --git a/apps/bootstrap/protected/requirements.php b/apps/bootstrap/requirements.php
similarity index 98%
rename from apps/bootstrap/protected/requirements.php
rename to apps/bootstrap/requirements.php
index ba1f3ff..5a2d910 100644
--- a/apps/bootstrap/protected/requirements.php
+++ b/apps/bootstrap/requirements.php
@@ -11,7 +11,7 @@
  */
 
 // you may need to adjust this path to the correct Yii framework path
-$frameworkPath = dirname(__FILE__) . '/../../../yii';
+$frameworkPath = dirname(__FILE__) . '/../../yii';
 
 require_once($frameworkPath . '/requirements/YiiRequirementChecker.php');
 $requirementsChecker = new YiiRequirementChecker();
@@ -93,4 +93,4 @@ $requirements = array(
 		'memo' => 'PHP mail SMTP server required',
 	),
 );
-$requirementsChecker->checkYii()->check($requirements)->render();
\ No newline at end of file
+$requirementsChecker->checkYii()->check($requirements)->render();
diff --git a/apps/bootstrap/assets/.gitignore b/apps/bootstrap/runtime/.gitignore
similarity index 100%
rename from apps/bootstrap/assets/.gitignore
rename to apps/bootstrap/runtime/.gitignore
diff --git a/apps/bootstrap/protected/runtime/.gitignore b/apps/bootstrap/vendor/.gitignore
similarity index 100%
rename from apps/bootstrap/protected/runtime/.gitignore
rename to apps/bootstrap/vendor/.gitignore
diff --git a/apps/bootstrap/protected/views/layouts/main.php b/apps/bootstrap/views/layouts/main.php
similarity index 100%
rename from apps/bootstrap/protected/views/layouts/main.php
rename to apps/bootstrap/views/layouts/main.php
diff --git a/apps/bootstrap/protected/views/site/about.php b/apps/bootstrap/views/site/about.php
similarity index 100%
rename from apps/bootstrap/protected/views/site/about.php
rename to apps/bootstrap/views/site/about.php
diff --git a/apps/bootstrap/protected/views/site/contact.php b/apps/bootstrap/views/site/contact.php
similarity index 100%
rename from apps/bootstrap/protected/views/site/contact.php
rename to apps/bootstrap/views/site/contact.php
diff --git a/apps/bootstrap/protected/views/site/index.php b/apps/bootstrap/views/site/index.php
similarity index 100%
rename from apps/bootstrap/protected/views/site/index.php
rename to apps/bootstrap/views/site/index.php
diff --git a/apps/bootstrap/protected/views/site/login.php b/apps/bootstrap/views/site/login.php
similarity index 100%
rename from apps/bootstrap/protected/views/site/login.php
rename to apps/bootstrap/views/site/login.php
diff --git a/apps/bootstrap/www/assets/.gitignore b/apps/bootstrap/www/assets/.gitignore
new file mode 100644
index 0000000..72e8ffc
--- /dev/null
+++ b/apps/bootstrap/www/assets/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/apps/bootstrap/css/bootstrap-responsive.css b/apps/bootstrap/www/css/bootstrap-responsive.css
similarity index 100%
rename from apps/bootstrap/css/bootstrap-responsive.css
rename to apps/bootstrap/www/css/bootstrap-responsive.css
diff --git a/apps/bootstrap/css/bootstrap-responsive.min.css b/apps/bootstrap/www/css/bootstrap-responsive.min.css
similarity index 100%
rename from apps/bootstrap/css/bootstrap-responsive.min.css
rename to apps/bootstrap/www/css/bootstrap-responsive.min.css
diff --git a/apps/bootstrap/css/bootstrap.css b/apps/bootstrap/www/css/bootstrap.css
similarity index 100%
rename from apps/bootstrap/css/bootstrap.css
rename to apps/bootstrap/www/css/bootstrap.css
diff --git a/apps/bootstrap/css/bootstrap.min.css b/apps/bootstrap/www/css/bootstrap.min.css
similarity index 100%
rename from apps/bootstrap/css/bootstrap.min.css
rename to apps/bootstrap/www/css/bootstrap.min.css
diff --git a/apps/bootstrap/css/site.css b/apps/bootstrap/www/css/site.css
similarity index 100%
rename from apps/bootstrap/css/site.css
rename to apps/bootstrap/www/css/site.css
diff --git a/apps/bootstrap/img/glyphicons-halflings-white.png b/apps/bootstrap/www/img/glyphicons-halflings-white.png
similarity index 100%
rename from apps/bootstrap/img/glyphicons-halflings-white.png
rename to apps/bootstrap/www/img/glyphicons-halflings-white.png
diff --git a/apps/bootstrap/img/glyphicons-halflings.png b/apps/bootstrap/www/img/glyphicons-halflings.png
similarity index 100%
rename from apps/bootstrap/img/glyphicons-halflings.png
rename to apps/bootstrap/www/img/glyphicons-halflings.png
diff --git a/apps/bootstrap/www/index.php b/apps/bootstrap/www/index.php
new file mode 100644
index 0000000..e354dbb
--- /dev/null
+++ b/apps/bootstrap/www/index.php
@@ -0,0 +1,12 @@
+<?php
+
+// comment out the following line to disable debug mode
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+
+require(__DIR__ . '/../vendor/yiisoft/yii2/yii/yii.php');
+require(__DIR__ . '/../vendor/autoload.php');
+
+$config = require(__DIR__ . '/../config/main.php');
+
+$application = new yii\web\Application($config);
+$application->run();
diff --git a/apps/bootstrap/js/bootstrap.js b/apps/bootstrap/www/js/bootstrap.js
similarity index 100%
rename from apps/bootstrap/js/bootstrap.js
rename to apps/bootstrap/www/js/bootstrap.js
diff --git a/apps/bootstrap/js/bootstrap.min.js b/apps/bootstrap/www/js/bootstrap.min.js
similarity index 100%
rename from apps/bootstrap/js/bootstrap.min.js
rename to apps/bootstrap/www/js/bootstrap.min.js
diff --git a/apps/bootstrap/protected/yii b/apps/bootstrap/yii
similarity index 88%
rename from apps/bootstrap/protected/yii
rename to apps/bootstrap/yii
index df58e58..cee771a 100644
--- a/apps/bootstrap/protected/yii
+++ b/apps/bootstrap/yii
@@ -13,11 +13,11 @@ 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'));
 
-$frameworkPath = __DIR__ . '/../../../yii';
+$frameworkPath = __DIR__ . '/../../yii';
 
 require($frameworkPath . '/Yii.php');
 
 $config = require(__DIR__ . '/config/console.php');
 
 $application = new yii\console\Application($config);
-$application->run();
\ No newline at end of file
+$application->run();
diff --git a/apps/bootstrap/protected/yii.bat b/apps/bootstrap/yii.bat
similarity index 100%
rename from apps/bootstrap/protected/yii.bat
rename to apps/bootstrap/yii.bat