diff --git a/Gruntfile.js b/Gruntfile.js
index ac7e47b6..26fcc743 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -115,14 +115,14 @@ module.exports = function(grunt) {
         src: util.wrap(['src/ngCookies/cookies.js'], 'module')
       },
       bootstrap: {
-        dest: 'build/angular-bootstrap.js',
-        src: util.wrap(['src/bootstrap/bootstrap.js'], 'module')
+        dest: 'build/docs/components/angular-bootstrap.js',
+        src: util.wrap(['docs/components/bootstrap/bootstrap.js'], 'module')
       },
       bootstrapPrettify: {
-        dest: 'build/angular-bootstrap-prettify.js',
-        src: util.wrap(['src/bootstrap/bootstrap-prettify.js', 'src/bootstrap/google-prettify/prettify.js'], 'module'),
+        dest: 'build/docs/components/angular-bootstrap-prettify.js',
+        src: util.wrap(['docs/components/bootstrap/bootstrap-prettify.js', 'docs/components/bootstrap/google-prettify/prettify.js'], 'module'),
         styles: {
-          css: ['src/bootstrap/google-prettify/prettify.css'],
+          css: ['docs/components/bootstrap/google-prettify/prettify.css'],
           minify: true
         }
       }
@@ -136,8 +136,8 @@ module.exports = function(grunt) {
       mobile: 'build/angular-mobile.js',
       resource: 'build/angular-resource.js',
       sanitize: 'build/angular-sanitize.js',
-      bootstrap: 'build/angular-bootstrap.js',
-      bootstrapPrettify: 'build/angular-bootstrap-prettify.js',
+      bootstrap: 'build/docs/components/angular-bootstrap.js',
+      bootstrapPrettify: 'build/docs/components/angular-bootstrap-prettify.js',
     },
 
 
diff --git a/angularFiles.js b/angularFiles.js
index 2c2e4e0c..0a14df0e 100755
--- a/angularFiles.js
+++ b/angularFiles.js
@@ -76,7 +76,7 @@ angularFiles = {
     'src/ngMobile/directive/ngClick.js',
     'src/ngMobile/directive/ngSwipe.js',
 
-    'src/bootstrap/bootstrap.js'
+    'docs/components/bootstrap/bootstrap.js'
   ],
 
   'angularScenario': [
@@ -104,7 +104,6 @@ angularFiles = {
     'test/ngScenario/jstd-scenario-adapter/*.js',
     'test/*.js',
     'test/auto/*.js',
-    'test/bootstrap/*.js',
     'test/ng/*.js',
     'test/ng/directive/*.js',
     'test/ng/filter/*.js',
@@ -114,7 +113,9 @@ angularFiles = {
     'test/ngSanitize/directive/*.js',
     'test/ngSanitize/filter/*.js',
     'test/ngMock/*.js',
-    'test/ngMobile/directive/*.js'
+    'test/ngMobile/directive/*.js',
+    'docs/component-spec/bootstrap/*.js',
+    'docs/component-spec/*.js'
   ],
 
   'jstd': [
diff --git a/test/bootstrap/bootstrapSpec.js b/docs/component-spec/bootstrap/bootstrapSpec.js
similarity index 100%
rename from test/bootstrap/bootstrapSpec.js
rename to docs/component-spec/bootstrap/bootstrapSpec.js
diff --git a/test/bootstrap/code.html b/docs/component-spec/bootstrap/code.html
similarity index 100%
rename from test/bootstrap/code.html
rename to docs/component-spec/bootstrap/code.html
diff --git a/src/angular-bootstrap.js b/docs/components/angular-bootstrap.js
similarity index 100%
rename from src/angular-bootstrap.js
rename to docs/components/angular-bootstrap.js
diff --git a/src/bootstrap/bootstrap-prettify.js b/docs/components/bootstrap/bootstrap-prettify.js
similarity index 100%
rename from src/bootstrap/bootstrap-prettify.js
rename to docs/components/bootstrap/bootstrap-prettify.js
diff --git a/src/bootstrap/bootstrap.js b/docs/components/bootstrap/bootstrap.js
similarity index 100%
rename from src/bootstrap/bootstrap.js
rename to docs/components/bootstrap/bootstrap.js
diff --git a/src/bootstrap/css/bootstrap.css b/docs/components/bootstrap/css/bootstrap.css
similarity index 100%
rename from src/bootstrap/css/bootstrap.css
rename to docs/components/bootstrap/css/bootstrap.css
diff --git a/src/bootstrap/google-prettify/prettify.css b/docs/components/bootstrap/google-prettify/prettify.css
similarity index 100%
rename from src/bootstrap/google-prettify/prettify.css
rename to docs/components/bootstrap/google-prettify/prettify.css
diff --git a/src/bootstrap/google-prettify/prettify.js b/docs/components/bootstrap/google-prettify/prettify.js
similarity index 100%
rename from src/bootstrap/google-prettify/prettify.js
rename to docs/components/bootstrap/google-prettify/prettify.js
diff --git a/docs/src/templates/index.html b/docs/src/templates/index.html
index 3d5fd4c5..5252605e 100644
--- a/docs/src/templates/index.html
+++ b/docs/src/templates/index.html
@@ -41,8 +41,8 @@
       addTag('script', {src: path('angular-cookies.js') }, sync);
       addTag('script', {src: path('angular-sanitize.js') }, sync);
       addTag('script', {src: path('angular-mobile.js') }, sync);
-      addTag('script', {src: path('angular-bootstrap.js') }, sync);
-      addTag('script', {src: path('angular-bootstrap-prettify.js') }, sync);
+      addTag('script', {src: 'components/angular-bootstrap.js' }, sync);
+      addTag('script', {src: 'components/angular-bootstrap-prettify.js' }, sync);
       addTag('script', {src: 'js/lunr.js' }, sync);
       addTag('script', {src: 'js/docs.js'}, sync);
       addTag('script', {src: 'docs-keywords.js'}, sync);