diff --git a/.gitignore b/.gitignore
index d4efa0f8..bb9c6666 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@ node_modules/
 
 # Generated files
 .tmp
-/styleguide
diff --git a/.npmignore b/.npmignore
index b136c816..b75f22b6 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,4 +1,5 @@
 /.*
+/docs
 /src/js/tests
 /src/styleguide
 /src/less/homepage.md
diff --git a/Gruntfile.js b/Gruntfile.js
index 091f12c2..ee1002d1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,7 +10,7 @@ module.exports = function (grunt) {
       dist: 'dist',
       grunt: 'grunt',
       src: 'src',
-      styleguide: 'styleguide',
+      styleguide: 'docs',
       temp: '.tmp',
     },
 
diff --git a/docs/.nojekyll b/docs/.nojekyll
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/CNAME b/docs/CNAME
new file mode 100644
index 00000000..843b7c16
--- /dev/null
+++ b/docs/CNAME
@@ -0,0 +1 @@
+docs.bootstrap-ui.com
diff --git a/grunt/browserSync.js b/grunt/browserSync.js
index 543394fe..438fad25 100644
--- a/grunt/browserSync.js
+++ b/grunt/browserSync.js
@@ -12,7 +12,7 @@ module.exports = {
     },
     options: {
       server: {
-        baseDir: './styleguide/',
+        baseDir: '<%= paths.styleguide %>',
       },
       browser: '<%= devBrowser %>',
       watchTask: true,
diff --git a/grunt/clean.js b/grunt/clean.js
index 1b9d482e..3e0ec88d 100644
--- a/grunt/clean.js
+++ b/grunt/clean.js
@@ -4,6 +4,10 @@ module.exports = {
 
   temp: '<%= paths.temp %>',
   dist: '<%= paths.dist %>',
-  styleguide: '<%= paths.styleguide %>',
+  styleguide: [
+    '<%= paths.styleguide %>/*',
+    '!<%= paths.styleguide %>/.nojekyll',
+    '!<%= paths.styleguide %>/CNAME',
+  ],
 
 };
diff --git a/grunt/copy.js b/grunt/copy.js
index a92564b0..52974ffe 100644
--- a/grunt/copy.js
+++ b/grunt/copy.js
@@ -55,7 +55,7 @@ module.exports = {
       },
       {
         expand: true,
-        cwd: '<%= paths.src %>/styleguide/kss-assets/js/',
+        cwd: '<%= paths.src %>/docs/kss-assets/js/',
         src: ['*'],
         dest: '<%= paths.styleguide %>/kss-assets/js/',
       },
diff --git a/grunt/kss.js b/grunt/kss.js
index 63895eef..4e7cd73d 100644
--- a/grunt/kss.js
+++ b/grunt/kss.js
@@ -3,14 +3,11 @@
 module.exports = {
 
   options: {
-    builder: '<%= paths.temp %>/styleguide/',
+    builder: '<%= paths.temp %>/docs/',
   },
   dist: {
-    files: [
-      {
-        styleguide: '<%= paths.src %>/less/',
-      },
-    ],
+    src: ['<%= paths.src %>/less/'],
+    dest: '<%= paths.styleguide %>',
   },
 
 };
diff --git a/grunt/less.js b/grunt/less.js
index 5e39c761..b2157121 100644
--- a/grunt/less.js
+++ b/grunt/less.js
@@ -22,8 +22,8 @@ module.exports = {
       strictUnits: true,
     },
     files: {
-      '<%= paths.temp %>/styleguide/kss.css':
-        '<%= paths.src %>/styleguide/kss-assets/less/kss.less',
+      '<%= paths.temp %>/docs/kss.css':
+        '<%= paths.src %>/docs/kss-assets/less/kss.less',
     },
   },
 
diff --git a/grunt/postcss.js b/grunt/postcss.js
index 4c2163a5..8bee0cd4 100644
--- a/grunt/postcss.js
+++ b/grunt/postcss.js
@@ -37,7 +37,7 @@ module.exports = {
         }),
       ],
     },
-    src: '<%= paths.temp %>/styleguide/kss.css',
+    src: '<%= paths.temp %>/docs/kss.css',
     dest: '<%= paths.styleguide %>/kss-assets/css/kss.min.css',
   },
 
diff --git a/grunt/replace.js b/grunt/replace.js
index 98ad840d..193ddcc0 100644
--- a/grunt/replace.js
+++ b/grunt/replace.js
@@ -3,8 +3,8 @@
 module.exports = {
 
   styleguide: {
-    src: '<%= paths.src %>/styleguide/index.hbs',
-    dest: '<%= paths.temp %>/styleguide/index.hbs',
+    src: '<%= paths.src %>/docs/index.hbs',
+    dest: '<%= paths.temp %>/docs/index.hbs',
     replacements: [
       {
         from: '%VERSION%',
diff --git a/grunt/watch.js b/grunt/watch.js
index 48894b43..08692d72 100644
--- a/grunt/watch.js
+++ b/grunt/watch.js
@@ -21,7 +21,7 @@ module.exports = {
   styleguide: {
     files: [
       '<%= paths.src %>/less/homepage.md',
-      '<%= paths.src %>/styleguide/**/*',
+      '<%= paths.src %>/docs/**/*',
     ],
     tasks: [
       'build-styleguide',
diff --git a/package.json b/package.json
index 8e12376f..46150e80 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,9 @@
   "style": "dist/css/bootstrap-ui.css",
   "less": "src/less/bootstrap-ui.less",
   "scripts": {
+    "serve": "grunt serve",
     "build": "grunt build",
+    "dist": "grunt dist",
     "test": "grunt test"
   },
   "devDependencies": {
diff --git a/src/styleguide/index.hbs b/src/docs/index.hbs
similarity index 100%
rename from src/styleguide/index.hbs
rename to src/docs/index.hbs
diff --git a/src/styleguide/kss-assets/js/kss.js b/src/docs/kss-assets/js/kss.js
similarity index 100%
rename from src/styleguide/kss-assets/js/kss.js
rename to src/docs/kss-assets/js/kss.js
diff --git a/src/styleguide/kss-assets/js/prettify.js b/src/docs/kss-assets/js/prettify.js
similarity index 100%
rename from src/styleguide/kss-assets/js/prettify.js
rename to src/docs/kss-assets/js/prettify.js
diff --git a/src/styleguide/kss-assets/less/components/layout.less b/src/docs/kss-assets/less/components/layout.less
similarity index 100%
rename from src/styleguide/kss-assets/less/components/layout.less
rename to src/docs/kss-assets/less/components/layout.less
diff --git a/src/styleguide/kss-assets/less/components/prettify.less b/src/docs/kss-assets/less/components/prettify.less
similarity index 100%
rename from src/styleguide/kss-assets/less/components/prettify.less
rename to src/docs/kss-assets/less/components/prettify.less
diff --git a/src/styleguide/kss-assets/less/kss.less b/src/docs/kss-assets/less/kss.less
similarity index 100%
rename from src/styleguide/kss-assets/less/kss.less
rename to src/docs/kss-assets/less/kss.less