diff --git a/Gruntfile.js b/Gruntfile.js
index d8f9d549..35a38b0d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -99,11 +99,11 @@ module.exports = function (grunt) {
     return result;
   }
 
-  Object.keys(configBridge.paths).forEach(function (key) {
-    configBridge.paths[key].forEach(function (val, i, arr) {
-      arr[i] = path.join('./docs/assets', val);
-    });
-  });
+  //Object.keys(configBridge.paths).forEach(function (key) {
+  //  configBridge.paths[key].forEach(function (val, i, arr) {
+  //    arr[i] = path.join('./docs/assets', val);
+  //  });
+  //});
 
   // Project configuration.
   grunt.initConfig({
@@ -120,6 +120,7 @@ module.exports = function (grunt) {
     clean: {
       dist: 'dist',
       'dist-js': 'dist/js',
+      'docs-dist-js': 'docs/dist/js',
       docs: 'docs/dist'
     },
 
@@ -168,7 +169,7 @@ module.exports = function (grunt) {
       test: {
         src: 'js/tests/unit/*.js'
       },
-      assets: {
+      docs: {
         options: {
           requireCamelCaseOrUpperCaseIdentifiers: null
         },
@@ -216,31 +217,22 @@ module.exports = function (grunt) {
           'dist/js/bootstrap-material-design.umd.min.js': 'dist/js/bootstrap-material-design.umd.js',
           'dist/js/bootstrap-material-design.es6.min.js': 'dist/js/bootstrap-material-design.es6.js'
         }
-      }
-      //'systemjs-all': {
-      //  src: 'dist/js/system-all.js',
-      //  dest: 'dist/js/system-all.min.js'
-      //},
-      //'commonjs-all': {
-      //  src: 'dist/js/common-all.js',
-      //  dest: 'dist/js/common-all.min.js'
-      //},
+      },
 
-      //'systemjs-all': {
-      //  src: 'dist/js/system-all.js',
-      //  dest: 'dist/js/system-all.min.js'
-      //},
-      //'commonjs-all': {
-      //  src: 'dist/js/common-all.js',
-      //  dest: 'dist/js/common-all.min.js'
-      //},
-      //  docs: {
-      //    options: {
-      //      compress: false
-      //    },
-      //    src: configBridge.paths.docsJs,
-      //    dest: 'docs/assets/js/docs.min.js'
-      //  }
+      'docs-vendor': {
+        options: {
+          compress: false
+        },
+        //src: configBridge.paths.docsJs,
+        src: 'docs/assets/js/vendor/*.js',
+        //dest: 'docs/assets/js/docs.min.js'
+        dest: 'docs/dist/js/docs-vendor.min.js'
+      },
+      docs: {
+        files: {
+          'docs/dist/js/docs.iife.min.js': 'docs/dist/js/docs.iife.js'
+        }
+      }
     },
 
     qunit: {
@@ -341,21 +333,6 @@ module.exports = function (grunt) {
     },
 
     copy: {
-      'dist-to-docs': {
-        expand: true,
-        cwd: 'dist/',
-        src: [
-          '**/*',
-          '!js/demoduled',
-          '!js/demoduled/**/*',
-          '!js/umd',
-          '!js/umd/**/*',
-          //'!js/systemjs',
-          //'!js/systemjs/**/*',
-          '!js/npm.js'
-        ],
-        dest: 'docs/dist/'
-      },
       'bs-docs-js-vendor': {
         expand: true,
         cwd: '../bootstrap/docs/assets/js/vendor',
@@ -515,14 +492,17 @@ module.exports = function (grunt) {
       npmUpdate: {
         command: 'npm update'
       },
+      'rollup-docs-iife': {
+        command: 'rollup -c grunt/rollup.docs.iife.config.js'
+      },
       'rollup-iife': {
-        command: 'rollup -c rollup.iife.config.js'
+        command: 'rollup -c grunt/rollup.iife.config.js'
       },
       'rollup-umd': {
-        command: 'rollup -c rollup.umd.config.js'
+        command: 'rollup -c grunt/rollup.umd.config.js'
       },
       'rollup-es6': {
-        command: 'rollup -c rollup.es6.config.js'
+        command: 'rollup -c grunt/rollup.es6.config.js'
       }
     },
 
@@ -622,9 +602,17 @@ module.exports = function (grunt) {
     'exec:rollup-umd',
     'exec:rollup-es6',
     'stamp',
-    'uglify:dist',
-    'copy:dist-to-docs'
+    'uglify:dist'
   ]);
+  grunt.registerTask('docs-js', [
+    'clean:docs-dist-js',
+    'eslint',
+    'jscs:docs',
+    'exec:rollup-docs-iife',
+    'uglify:docs',
+    'uglify:docs-vendor'
+  ]);
+
 
   grunt.registerTask('test-scss', ['scsslint']);
 
@@ -666,14 +654,7 @@ module.exports = function (grunt) {
     'copy:bs-docs-plugins'
   ]);
   grunt.registerTask('docs-css', ['sass:docs', 'postcss:docs', 'postcss:examples', 'csscomb:docs', 'csscomb:examples', 'cssmin:docs']);
-  grunt.registerTask('lint-docs-js', ['jscs:assets']);
-  grunt.registerTask('docs-js', [
-    'babel:docs',
-    'lineremover:docs',
-    'uglify:docs',
-    'lint-docs-js',
-    'copy:dist-to-docs'
-  ]);
+
   grunt.registerTask('docs', ['clean:docs', 'docs-css', 'docs-js']);
   //------
 
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 9da6d0eb..8432672b 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -20,17 +20,11 @@
 <script src="{{ site.data.cdn.tether }}"></script>
 <script src="{{ site.data.cdn.bootstrap }}"></script>
 
+<script src="{{ site.baseurl }}/dist/js/docs-vendor.min.js"></script>
 {% if site.data.minified %}
-  <script src="{{ site.baseurl }}/dist/js/{{ site.data.name }}.min.js"></script>
-  <script src="{{ site.baseurl }}/assets/js/docs.min.js"></script>
+  <script src="{{ site.baseurl }}/dist/js/docs.iife.min.js"></script>
 {% else %}
-  {% for file in site.data.configBridge.paths.coreJs %}
-    <script src="{{ site.baseurl }}/{{ file }}"></script>
-  {% endfor %}
-
-  {% for file in site.data.configBridge.paths.docsJs %}
-    <script src="{{ site.baseurl }}/{{ file }}"></script>
-  {% endfor %}
+  <script src="{{ site.baseurl }}/dist/js/docs.iife.js"></script>
 {% endif %}
 
 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
@@ -38,7 +32,8 @@
 <script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
 
 {% if page.layout == "docs" %}
-<script src="{{ site.baseurl }}/assets/js/vendor/jekyll-search.min.js"></script>
+<!--already in docs-vendor.js -->
+<!--<script src="{{ site.baseurl }}/assets/js/vendor/jekyll-search.min.js"></script>-->
 
 <script>
 SimpleJekyllSearch.init({
diff --git a/docs/assets/js/src/application.js b/docs/assets/js/src/index.js
similarity index 97%
rename from docs/assets/js/src/application.js
rename to docs/assets/js/src/index.js
index 10f70419..acb5e708 100644
--- a/docs/assets/js/src/application.js
+++ b/docs/assets/js/src/index.js
@@ -1,7 +1,8 @@
-import 'babel-polyfill'
+//import 'babel-polyfill'
 import Style from './style'
 import Clipboard from 'clipboard'
 import anchors from 'anchor'
+//import mdb from '../../../../js/src/index' // eslint-disable-line no-unused-vars
 
 class Application {
 
diff --git a/grunt/configBridge.json b/grunt/configBridge.json
index 41925618..d903dcf3 100644
--- a/grunt/configBridge.json
+++ b/grunt/configBridge.json
@@ -18,37 +18,5 @@
       "bootstrapMaterialDesign.js",
       "index.js"
     ]
-  },
-  "docs": {
-    "files": [
-      "style.js",
-      "application.js"
-    ]
-  },
-  "paths": {
-    "docsJs": [
-      "../assets/js/vendor/anchor.min.js",
-      "../assets/js/vendor/clipboard.min.js",
-      "../assets/js/vendor/holder.min.js",
-      "../assets/js/dist/style.js",
-      "../assets/js/dist/application.js"
-    ],
-    "coreJs": [
-      "../dist/js/demoduled/baseInput.js",
-      "../dist/js/demoduled/baseSelection.js",
-      "../dist/js/demoduled/autofill.js",
-      "../dist/js/demoduled/bootstrapMaterialDesign.js",
-      "../dist/js/demoduled/checkbox.js",
-      "../dist/js/demoduled/checkboxInline.js",
-      "../dist/js/demoduled/file.js",
-      "../dist/js/demoduled/text.js",
-      "../dist/js/demoduled/textarea.js",
-      "../dist/js/demoduled/select.js",
-      "../dist/js/demoduled/radio.js",
-      "../dist/js/demoduled/radioInline.js",
-      "../dist/js/demoduled/ripples.js",
-      "../dist/js/demoduled/switch.js",
-      "../dist/js/demoduled/util.js"
-    ]
   }
 }
diff --git a/rollup.config.js b/grunt/rollup.config.js
similarity index 100%
rename from rollup.config.js
rename to grunt/rollup.config.js
diff --git a/grunt/rollup.docs.iife.config.js b/grunt/rollup.docs.iife.config.js
new file mode 100644
index 00000000..807d92a8
--- /dev/null
+++ b/grunt/rollup.docs.iife.config.js
@@ -0,0 +1,8 @@
+import config from './rollup.config.js';
+
+config.format = 'iife';
+config.entry = 'docs/assets/js/src/index.js',
+
+config.dest = 'docs/dist/js/docs.iife.js';
+
+export default config;
diff --git a/rollup.es6.config.js b/grunt/rollup.es6.config.js
similarity index 72%
rename from rollup.es6.config.js
rename to grunt/rollup.es6.config.js
index a559a22c..1dc5f319 100644
--- a/rollup.es6.config.js
+++ b/grunt/rollup.es6.config.js
@@ -1,4 +1,4 @@
-import config from './rollup.config';
+import config from './rollup.config.js';
 
 config.format = 'es6';
 config.dest = 'dist/js/bootstrap-material-design.es6.js';
diff --git a/rollup.iife.config.js b/grunt/rollup.iife.config.js
similarity index 72%
rename from rollup.iife.config.js
rename to grunt/rollup.iife.config.js
index d3904ced..03b762b7 100644
--- a/rollup.iife.config.js
+++ b/grunt/rollup.iife.config.js
@@ -1,4 +1,4 @@
-import config from './rollup.config';
+import config from './rollup.config.js';
 
 config.format = 'iife';
 config.dest = 'dist/js/bootstrap-material-design.iife.js';
diff --git a/rollup.umd.config.js b/grunt/rollup.umd.config.js
similarity index 54%
rename from rollup.umd.config.js
rename to grunt/rollup.umd.config.js
index b413b210..0f254f2f 100644
--- a/rollup.umd.config.js
+++ b/grunt/rollup.umd.config.js
@@ -1,8 +1,8 @@
 
-import config from './rollup.config';
+import config from './rollup.config.js';
 
 config.format = 'umd';
-config.moduleName = 'bootstrapMaterialDesign';
+//config.moduleName = 'bootstrapMaterialDesign';
 config.dest = 'dist/js/bootstrap-material-design.umd.js';
 
 export default config;