diff --git a/components/components.js b/components/components.js
new file mode 100755
index 00000000000..d335c2673ec
--- /dev/null
+++ b/components/components.js
@@ -0,0 +1,74 @@
+import bAlert from './alert'
+import bBreadcrumb from './breadcrumb'
+import bButtonCheckbox from './button-checkbox'
+import bButtonGroup from './button-group'
+import bButtonRadio from './button-radio'
+import bButton from './button'
+import bCard from './card'
+import bCarousel from './carousel'
+import bCarouselSlide from './carousel'
+import bCollapse from './collapse'
+import bCollapseToggle from './collapse-toggle'
+import bDropdown from './dropdown'
+import bDropdownSelect from './dropdown-select'
+import bFormCheckbox from './form-checkbox'
+import bFormRadio from './form-radio'
+import bFormInput from './form-input'
+import bFormSelect from './form-select'
+import bFormTextarea from './form-textarea'
+import bJumbotron from './jumbotron'
+import bTags from './tags'
+import bListGroup from './list-group'
+import bListGroupItem from './list-group-item'
+import bMedia from './media'
+import bModal from './modal'
+import bNav from './nav'
+import bNavItem from './nav-item'
+import bNavItemDropdown from './nav-item-dropdown'
+import bNavbar from './navbar'
+import bPagination from './pagination'
+import bPopover from './popover'
+import bProgress from './progress'
+import bTables from './tables'
+import bTabs from './tabs'
+import bTab from './tab'
+import bTooltip from './tooltip'
+
+export {
+  bAlert,
+  bBreadcrumb,
+  bButtonCheckbox,
+  bButtonGroup,
+  bButtonRadio,
+  bButton as bButton,
+  bButton as bBtn,
+  bCard,
+  bDropdown,
+  bDropdownSelect,
+  bFormCheckbox,
+  bFormRadio,
+  bFormInput,
+  bFormSelect,
+  bFormTextarea,
+  bJumbotron,
+  bTags,
+  bMedia,
+  bModal,
+  bNavbar,
+  bPagination,
+  bPopover,
+  bProgress,
+  bTables,
+  bTooltip,
+  bTab,
+  bTabs,
+  bNav,
+  bNavItem,
+  bNavItemDropdown,
+  bListGroupItem,
+  bListGroup,
+  bCarouselSlide,
+  bCarousel,
+  bCollapse,
+  bCollapseToggle
+}
diff --git a/components/index.js b/components/index.js
index 2f975e01afa..fd13c6f7bc6 100755
--- a/components/index.js
+++ b/components/index.js
@@ -1,84 +1,6 @@
-import bAlert from './alert'
-import bBreadcrumb from './breadcrumb'
-import bButtonCheckbox from './button-checkbox'
-import bButtonGroup from './button-group'
-import bButtonRadio from './button-radio'
-import bButton from './button'
-import bCard from './card'
-import carousel from './carousel'
-import carouselSlide from './carousel'
-import collapse from './collapse'
-import collapseToggle from './collapse-toggle'
-import bDropdown from './dropdown'
-import bDropdownSelect from './dropdown-select'
-import bFormCheckbox from './form-checkbox'
-import bFormRadio from './form-radio'
-import bFormInput from './form-input'
-import bFormSelect from './form-select'
-import bFormTextarea from './form-textarea'
-import bJumbotron from './jumbotron'
-import bTags from './tags'
-import listGroup from './list-group'
-import listGroupItem from './list-group-item'
-import bMedia from './media'
-import bModal from './modal'
-import nav from './nav'
-import navItem from './nav-item'
-import navItemDropdown from './nav-item-dropdown'
-import bNavbar from './navbar'
-import bPagination from './pagination'
-import bPopover from './popover'
-import bProgress from './progress'
-import bTables from './tables'
-import tabs from './tabs'
-import tab from './tab'
-import bTooltip from './tooltip'
-
-
-var components = {
-  bAlert,
-  bBreadcrumb,
-  bButtonCheckbox,
-  bButtonGroup,
-  bButtonRadio,
-  bButton,
-  bBtn: bButton,
-  bCard,
-  bDropdown,
-  bDropdownSelect,
-  bFormCheckbox,
-  bFormRadio,
-  bFormInput,
-  bFormSelect,
-  bFormTextarea,
-  bJumbotron,
-  bTags,
-  bMedia,
-  bModal,
-  bNavbar,
-  bPagination,
-  bPopover,
-  bProgress,
-  bTables,
-  bTooltip,
-  bTab: tab,
-  bTabs: tabs,
-  bNav: nav,
-  bNavItem: navItem,
-  bNavItemDropdown: navItemDropdown,
-
-  bListGroupItem: listGroupItem,
-  bListGroup: listGroup,
-
-  bCarouselSlide: carouselSlide,
-  bCarousel: carousel,
-
-  bCollapse: collapse,
-  bCollapseToggle: collapseToggle,
-};
+import * as components from './components';
 
 function plugin(Vue) {
-
   if (plugin.installed) {
     return;
   }
@@ -86,14 +8,13 @@ function plugin(Vue) {
   Object.keys(components).forEach(function (key) {
     Vue.component(key, components[key]);
   });
-
 }
 
 if (typeof window !== 'undefined') {
-  if (window.Vue)
+  if (window.Vue) {
     window.Vue.use(plugin);
-  //require('../styles/style.css');
+  }
 }
 
-module.exports = components;
-module.exports.default = plugin;
+export * from './components';
+export default plugin;
diff --git a/scripts/build b/scripts/build
index f7937318d29..410ede7fd9a 100755
--- a/scripts/build
+++ b/scripts/build
@@ -3,7 +3,7 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 
-export node_env=production
+export NODE_ENV=production
 
 echo "Building commonjs version"
 webpack --colors --progress --config webpack.common.js --env production --display-error-details