diff --git a/yii/assets.php b/yii/assets.php
index 6014710..79fbeb5 100644
--- a/yii/assets.php
+++ b/yii/assets.php
@@ -48,115 +48,4 @@ return array(
 			YII_DEBUG ? 'punycode/punycode.js' : 'punycode/punycode.min.js',
 		),
 	),
-	'yii/bootstrap' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'css' => array(
-			YII_DEBUG ? 'bootstrap/css/bootstrap.css' : 'bootstrap/css/bootstrap.min.css',
-		),
-	),
-	'yii/bootstrap-responsive' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'css' => array(
-			YII_DEBUG ? 'bootstrap/css/bootstrap-responsive.css' : 'bootstrap/css/bootstrap-responsive.min.css',
-		),
-		'depends' => array('yii/bootstrap'),
-	),
-	'yii/bootstrap-js' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			YII_DEBUG ? 'bootstrap/js/bootstrap.js' : 'bootstrap/js/bootstrap.min.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-affix' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-affix.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-alert' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-alert.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-button' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-button.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-carousel' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-carousel.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-collapse' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-collapse.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-dropdown' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-dropdown.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-modal' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-modal.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-popover' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-popover.js',
-		),
-		'depends' => array('yii/jquery','yii/bootstrap-js-tooltip'),
-	),
-	'yii/bootstrap-js-scrollspy' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-scrollspy.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-tab' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-tab.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-tooltip' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-tooltip.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-transition' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-transition.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
-	'yii/bootstrap-js-typeahead' => array(
-		'sourcePath' => __DIR__ . '/assets',
-		'js' => array(
-			'bootstrap/js/bootstrap-typeahead.js',
-		),
-		'depends' => array('yii/jquery'),
-	),
 );
diff --git a/yii/bootstrap/assets.php b/yii/bootstrap/assets.php
new file mode 100644
index 0000000..1205d2a
--- /dev/null
+++ b/yii/bootstrap/assets.php
@@ -0,0 +1,115 @@
+<?php
+
+return array(
+	'yii/bootstrap' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'css' => array(
+			YII_DEBUG ? 'css/bootstrap.css' : 'css/bootstrap.min.css',
+		),
+	),
+	'yii/bootstrap-responsive' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'css' => array(
+			YII_DEBUG ? 'css/bootstrap-responsive.css' : 'css/bootstrap-responsive.min.css',
+		),
+		'depends' => array('yii/bootstrap'),
+	),
+	'yii/bootstrap-js' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			YII_DEBUG ? 'js/bootstrap.js' : 'js/bootstrap.min.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-affix' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-affix.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-alert' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-alert.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-button' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-button.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-carousel' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-carousel.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-collapse' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-collapse.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-dropdown' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-dropdown.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-modal' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-modal.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-popover' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-popover.js',
+		),
+		'depends' => array('yii/jquery','yii/bootstrap-js-tooltip'),
+	),
+	'yii/bootstrap-js-scrollspy' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-scrollspy.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-tab' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-tab.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-tooltip' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-tooltip.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-transition' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-transition.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+	'yii/bootstrap-js-typeahead' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'js/bootstrap-typeahead.js',
+		),
+		'depends' => array('yii/jquery'),
+	),
+);
diff --git a/yii/assets/bootstrap/css/bootstrap-responsive.css b/yii/bootstrap/assets/css/bootstrap-responsive.css
similarity index 100%
rename from yii/assets/bootstrap/css/bootstrap-responsive.css
rename to yii/bootstrap/assets/css/bootstrap-responsive.css
diff --git a/yii/assets/bootstrap/css/bootstrap-responsive.min.css b/yii/bootstrap/assets/css/bootstrap-responsive.min.css
similarity index 100%
rename from yii/assets/bootstrap/css/bootstrap-responsive.min.css
rename to yii/bootstrap/assets/css/bootstrap-responsive.min.css
diff --git a/yii/assets/bootstrap/css/bootstrap.css b/yii/bootstrap/assets/css/bootstrap.css
similarity index 100%
rename from yii/assets/bootstrap/css/bootstrap.css
rename to yii/bootstrap/assets/css/bootstrap.css
diff --git a/yii/assets/bootstrap/css/bootstrap.min.css b/yii/bootstrap/assets/css/bootstrap.min.css
similarity index 100%
rename from yii/assets/bootstrap/css/bootstrap.min.css
rename to yii/bootstrap/assets/css/bootstrap.min.css
diff --git a/yii/assets/bootstrap/img/glyphicons-halflings-white.png b/yii/bootstrap/assets/img/glyphicons-halflings-white.png
similarity index 100%
rename from yii/assets/bootstrap/img/glyphicons-halflings-white.png
rename to yii/bootstrap/assets/img/glyphicons-halflings-white.png
diff --git a/yii/assets/bootstrap/img/glyphicons-halflings.png b/yii/bootstrap/assets/img/glyphicons-halflings.png
similarity index 100%
rename from yii/assets/bootstrap/img/glyphicons-halflings.png
rename to yii/bootstrap/assets/img/glyphicons-halflings.png
diff --git a/yii/assets/bootstrap/js/bootstrap-affix.js b/yii/bootstrap/assets/js/bootstrap-affix.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-affix.js
rename to yii/bootstrap/assets/js/bootstrap-affix.js
diff --git a/yii/assets/bootstrap/js/bootstrap-alert.js b/yii/bootstrap/assets/js/bootstrap-alert.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-alert.js
rename to yii/bootstrap/assets/js/bootstrap-alert.js
diff --git a/yii/assets/bootstrap/js/bootstrap-button.js b/yii/bootstrap/assets/js/bootstrap-button.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-button.js
rename to yii/bootstrap/assets/js/bootstrap-button.js
diff --git a/yii/assets/bootstrap/js/bootstrap-carousel.js b/yii/bootstrap/assets/js/bootstrap-carousel.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-carousel.js
rename to yii/bootstrap/assets/js/bootstrap-carousel.js
diff --git a/yii/assets/bootstrap/js/bootstrap-collapse.js b/yii/bootstrap/assets/js/bootstrap-collapse.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-collapse.js
rename to yii/bootstrap/assets/js/bootstrap-collapse.js
diff --git a/yii/assets/bootstrap/js/bootstrap-dropdown.js b/yii/bootstrap/assets/js/bootstrap-dropdown.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-dropdown.js
rename to yii/bootstrap/assets/js/bootstrap-dropdown.js
diff --git a/yii/assets/bootstrap/js/bootstrap-modal.js b/yii/bootstrap/assets/js/bootstrap-modal.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-modal.js
rename to yii/bootstrap/assets/js/bootstrap-modal.js
diff --git a/yii/assets/bootstrap/js/bootstrap-popover.js b/yii/bootstrap/assets/js/bootstrap-popover.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-popover.js
rename to yii/bootstrap/assets/js/bootstrap-popover.js
diff --git a/yii/assets/bootstrap/js/bootstrap-scrollspy.js b/yii/bootstrap/assets/js/bootstrap-scrollspy.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-scrollspy.js
rename to yii/bootstrap/assets/js/bootstrap-scrollspy.js
diff --git a/yii/assets/bootstrap/js/bootstrap-tab.js b/yii/bootstrap/assets/js/bootstrap-tab.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-tab.js
rename to yii/bootstrap/assets/js/bootstrap-tab.js
diff --git a/yii/assets/bootstrap/js/bootstrap-tooltip.js b/yii/bootstrap/assets/js/bootstrap-tooltip.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-tooltip.js
rename to yii/bootstrap/assets/js/bootstrap-tooltip.js
diff --git a/yii/assets/bootstrap/js/bootstrap-transition.js b/yii/bootstrap/assets/js/bootstrap-transition.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-transition.js
rename to yii/bootstrap/assets/js/bootstrap-transition.js
diff --git a/yii/assets/bootstrap/js/bootstrap-typeahead.js b/yii/bootstrap/assets/js/bootstrap-typeahead.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap-typeahead.js
rename to yii/bootstrap/assets/js/bootstrap-typeahead.js
diff --git a/yii/assets/bootstrap/js/bootstrap.js b/yii/bootstrap/assets/js/bootstrap.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap.js
rename to yii/bootstrap/assets/js/bootstrap.js
diff --git a/yii/assets/bootstrap/js/bootstrap.min.js b/yii/bootstrap/assets/js/bootstrap.min.js
similarity index 100%
rename from yii/assets/bootstrap/js/bootstrap.min.js
rename to yii/bootstrap/assets/js/bootstrap.min.js