diff --git a/.gitignore b/.gitignore
index 0111adc0ee..47a28166fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ docs/*.html
 docs/assets/bundle.js
 cjs/*
 amd/*
-ie8/bundle.js
\ No newline at end of file
+ie8/bundle.js
+lib/*
diff --git a/Gruntfile.js b/Gruntfile.js
index d763e31f40..a2f1a0ed86 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -8,13 +8,13 @@ module.exports = function (grunt) {
         expand: true,
         cwd: 'src/',
         src: ['**/*.js'],
-        dest: 'amd/'
+        dest: 'amd/lib'
       },
       transpiled: {
         expand: true,
         cwd: 'transpiled/',
         src: ['**/*.js'],
-        dest: 'amd/'
+        dest: 'amd/lib'
       }
     },
 
@@ -35,17 +35,17 @@ module.exports = function (grunt) {
             expand: true,
             cwd: 'transpiled/',
             src: ['**/*.js'],
-            dest: 'cjs/'
+            dest: 'lib/'
           },
           {
             expand: true,
             cwd: 'src/',
             src: ['**/*.js'],
-            dest: 'cjs/'
+            dest: 'lib/'
           },
           {
             src: ['**/*'],
-            dest: 'cjs/',
+            dest: 'lib/',
             cwd: 'tools/cjs',
             expand: true
           }
@@ -88,7 +88,7 @@ module.exports = function (grunt) {
 
     clean: {
       transpiled: ['transpiled'],
-      cjs: ['cjs'],
+      cjs: ['lib'],
       amd: ['amd'],
       test: ['test-built']
     },
diff --git a/docs/package.json b/docs/package.json
index 9a7075ef27..d83d3b9196 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -24,7 +24,7 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "supervisor -w .,../cjs -i node_modules server.js",
+    "start": "supervisor -w .,../lib -i node_modules server.js",
     "build": "node build.js && browserify client.js | uglifyjs -cm 2>/dev/null > ./assets/bundle.js",
     "start-prod": "NODE_ENV=production node server.js"
   },
diff --git a/docs/src/ComponentsPage.js b/docs/src/ComponentsPage.js
index 148caf618a..e184227855 100644
--- a/docs/src/ComponentsPage.js
+++ b/docs/src/ComponentsPage.js
@@ -3,10 +3,10 @@
 var React = require('react');
 var fs = require('fs');
 
-var Affix = require('../../cjs/Affix');
-var Nav = require('../../cjs/Nav');
-var SubNav = require('../../cjs/SubNav');
-var NavItem = require('../../cjs/NavItem');
+var Affix = require('../../lib/Affix');
+var Nav = require('../../lib/Nav');
+var SubNav = require('../../lib/SubNav');
+var NavItem = require('../../lib/NavItem');
 
 var NavMain = require('./NavMain');
 var PageHeader = require('./PageHeader');
diff --git a/docs/src/GettingStartedPage.js b/docs/src/GettingStartedPage.js
index 9c04f1ec54..1623cb8efa 100644
--- a/docs/src/GettingStartedPage.js
+++ b/docs/src/GettingStartedPage.js
@@ -34,7 +34,7 @@ var Page = React.createClass({
   $ npm install react-bootstrap\n\
                     '}</code></pre>
                     <pre><code className="js">{'\
-  var Alert = require(\'react-bootstrap/Alert\');\n\
+  var Alert = require(\'react-bootstrap/lib/Alert\');\n\
   // or\n\
   var Alert = require(\'react-bootstrap\').Alert;\
                     '}</code></pre>
@@ -47,7 +47,7 @@ var Page = React.createClass({
   $ bower install react-bootstrap\n\
                     '}</code></pre>
                     <pre><code className="js">{'\
-  var Alert = require(\'react-bootstrap/Alert\');\n\
+  var Alert = require(\'react-bootstrap/lib/Alert\');\n\
   // or\n\
   var Alert = require(\'react-bootstrap\').Alert;\
                     '}</code></pre>
diff --git a/docs/src/NavMain.js b/docs/src/NavMain.js
index 4cbd2adbf3..72cb59f400 100644
--- a/docs/src/NavMain.js
+++ b/docs/src/NavMain.js
@@ -2,8 +2,8 @@
 
 var React = require('react');
 var Router = require('react-router-component');
-var Navbar = require('../../cjs/Navbar');
-var Nav = require('../../cjs/Nav');
+var Navbar = require('../../lib/Navbar');
+var Nav = require('../../lib/Nav');
 
 var InternalLink = Router.Link;
 
diff --git a/docs/src/ReactPlayground.js b/docs/src/ReactPlayground.js
index ebf7155f3c..7ff19f1b02 100644
--- a/docs/src/ReactPlayground.js
+++ b/docs/src/ReactPlayground.js
@@ -2,45 +2,45 @@ var React = require('react');
 var classSet = require('react/lib/cx');
 var CodeMirror = global.CodeMirror;
 var JSXTransformer = global.JSXTransformer;
-var Accordion = require('../../cjs/Accordion');
-var Alert = require('../../cjs/Alert');
-var Badge = require('../../cjs/Badge');
-var Button = require('../../cjs/Button');
-var ButtonGroup = require('../../cjs/ButtonGroup');
-var ButtonToolbar = require('../../cjs/ButtonToolbar');
-var Carousel = require('../../cjs/Carousel');
-var CarouselItem = require('../../cjs/CarouselItem');
-var Col = require('../../cjs/Col');
-var DropdownButton = require('../../cjs/DropdownButton');
-var Glyphicon = require('../../cjs/Glyphicon');
-var Grid = require('../../cjs/Grid');
-var Input = require('../../cjs/Input');
-var Jumbotron = require('../../cjs/Jumbotron');
-var Label = require('../../cjs/Label');
-var ListGroup = require('../../cjs/ListGroup');
-var ListGroupItem = require('../../cjs/ListGroupItem');
-var Nav = require('../../cjs/Nav');
-var Navbar = require('../../cjs/Navbar');
-var NavItem = require('../../cjs/NavItem');
-var MenuItem = require('../../cjs/MenuItem');
-var Modal = require('../../cjs/Modal');
-var ModalTrigger = require('../../cjs/ModalTrigger');
-var OverlayTrigger = require('../../cjs/OverlayTrigger');
-var OverlayMixin = require('../../cjs/OverlayMixin');
-var PageHeader = require('../../cjs/PageHeader');
-var PageItem = require('../../cjs/PageItem');
-var Pager = require('../../cjs/Pager');
-var Panel = require('../../cjs/Panel');
-var PanelGroup = require('../../cjs/PanelGroup');
-var Popover = require('../../cjs/Popover');
-var ProgressBar = require('../../cjs/ProgressBar');
-var Row = require('../../cjs/Row');
-var SplitButton = require('../../cjs/SplitButton');
-var TabbedArea = require('../../cjs/TabbedArea');
-var Table = require('../../cjs/Table');
-var TabPane = require('../../cjs/TabPane');
-var Tooltip = require('../../cjs/Tooltip');
-var Well = require('../../cjs/Well');
+var Accordion = require('../../lib/Accordion');
+var Alert = require('../../lib/Alert');
+var Badge = require('../../lib/Badge');
+var Button = require('../../lib/Button');
+var ButtonGroup = require('../../lib/ButtonGroup');
+var ButtonToolbar = require('../../lib/ButtonToolbar');
+var Carousel = require('../../lib/Carousel');
+var CarouselItem = require('../../lib/CarouselItem');
+var Col = require('../../lib/Col');
+var DropdownButton = require('../../lib/DropdownButton');
+var Glyphicon = require('../../lib/Glyphicon');
+var Grid = require('../../lib/Grid');
+var Input = require('../../lib/Input');
+var Jumbotron = require('../../lib/Jumbotron');
+var Label = require('../../lib/Label');
+var ListGroup = require('../../lib/ListGroup');
+var ListGroupItem = require('../../lib/ListGroupItem');
+var Nav = require('../../lib/Nav');
+var Navbar = require('../../lib/Navbar');
+var NavItem = require('../../lib/NavItem');
+var MenuItem = require('../../lib/MenuItem');
+var Modal = require('../../lib/Modal');
+var ModalTrigger = require('../../lib/ModalTrigger');
+var OverlayTrigger = require('../../lib/OverlayTrigger');
+var OverlayMixin = require('../../lib/OverlayMixin');
+var PageHeader = require('../../lib/PageHeader');
+var PageItem = require('../../lib/PageItem');
+var Pager = require('../../lib/Pager');
+var Panel = require('../../lib/Panel');
+var PanelGroup = require('../../lib/PanelGroup');
+var Popover = require('../../lib/Popover');
+var ProgressBar = require('../../lib/ProgressBar');
+var Row = require('../../lib/Row');
+var SplitButton = require('../../lib/SplitButton');
+var TabbedArea = require('../../lib/TabbedArea');
+var Table = require('../../lib/Table');
+var TabPane = require('../../lib/TabPane');
+var Tooltip = require('../../lib/Tooltip');
+var Well = require('../../lib/Well');
 
 var IS_MOBILE = typeof navigator !== 'undefined' && (
   navigator.userAgent.match(/Android/i)
diff --git a/ie8/src.js b/ie8/src.js
index 20a045af4a..abe90607aa 100644
--- a/ie8/src.js
+++ b/ie8/src.js
@@ -1,21 +1,21 @@
 /** @jsx React.DOM */
 var React = require('react');
-var Button = require('../cjs/Button');
-var DropdownButton = require('../cjs/DropdownButton');
-var MenuItem = require('../cjs/MenuItem');
-var Accordion = require('../cjs/Accordion');
-var Panel = require('../cjs/Panel');
-var ButtonToolbar = require('../cjs/ButtonToolbar');
-var OverlayTrigger = require('../cjs/OverlayTrigger');
-var Tooltip = require('../cjs/Tooltip');
-var Alert = require('../cjs/Alert');
-var TabbedArea = require('../cjs/TabbedArea');
-var TabPane = require('../cjs/TabPane');
-var Modal = require('../cjs/Modal');
-var OverlayMixin = require('../cjs/OverlayMixin');
-var Popover = require('../cjs/Popover');
-var Carousel = require('../cjs/Carousel');
-var CarouselItem = require('../cjs/CarouselItem');
+var Button = require('../lib/Button');
+var DropdownButton = require('../lib/DropdownButton');
+var MenuItem = require('../lib/MenuItem');
+var Accordion = require('../lib/Accordion');
+var Panel = require('../lib/Panel');
+var ButtonToolbar = require('../lib/ButtonToolbar');
+var OverlayTrigger = require('../lib/OverlayTrigger');
+var Tooltip = require('../lib/Tooltip');
+var Alert = require('../lib/Alert');
+var TabbedArea = require('../lib/TabbedArea');
+var TabPane = require('../lib/TabPane');
+var Modal = require('../lib/Modal');
+var OverlayMixin = require('../lib/OverlayMixin');
+var Popover = require('../lib/Popover');
+var Carousel = require('../lib/Carousel');
+var CarouselItem = require('../lib/CarouselItem');
 
 var dropdownInstance = (
   <DropdownButton title="Dropdown">
diff --git a/package.json b/package.json
index 9c9201f870..0048fb3f65 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,12 @@
   "scripts": {
     "build": "./node_modules/.bin/grunt build",
     "test-watch": "./node_modules/.bin/grunt watch 2>&1 >/dev/null & ./node_modules/karma/bin/karma start karma.dev.js",
-    "test": "./node_modules/.bin/grunt build && ./node_modules/karma/bin/karma start karma.ci.js"
+    "test": "./node_modules/.bin/grunt build && ./node_modules/karma/bin/karma start karma.ci.js",
+    "prepublish": "./node_modules/.bin/grunt build"
+  },
+  "main": "lib/main.js",
+  "directories": {
+    "lib": "lib/"
   },
   "keywords": [
     "react",
diff --git a/test/AlertSpec.jsx b/test/AlertSpec.jsx
index 207a5112c8..330ddd756e 100644
--- a/test/AlertSpec.jsx
+++ b/test/AlertSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Alert          = require('../cjs/Alert');
+var Alert          = require('../lib/Alert');
 
 describe('Alert', function () {
   it('Should output a alert with message', function () {
@@ -73,4 +73,4 @@ describe('Alert', function () {
     );
     assert.ok(instance.getDOMNode().className.match(/\balert-danger\b/));
   });
-});
\ No newline at end of file
+});
diff --git a/test/BadgeSpec.jsx b/test/BadgeSpec.jsx
index cac08a5f16..d59a8ed852 100644
--- a/test/BadgeSpec.jsx
+++ b/test/BadgeSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Badge          = require('../cjs/Badge');
+var Badge          = require('../lib/Badge');
 
 describe('Badge', function () {
   it('Should output a badge with content', function () {
diff --git a/test/BootstrapMixinSpec.jsx b/test/BootstrapMixinSpec.jsx
index 3985268938..a80545c519 100644
--- a/test/BootstrapMixinSpec.jsx
+++ b/test/BootstrapMixinSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var BootstrapMixin = require('../cjs/BootstrapMixin');
+var BootstrapMixin = require('../lib/BootstrapMixin');
 
 var Component;
 
@@ -189,4 +189,4 @@ describe('BootstrapMixin', function () {
       assert.deepEqual(instance.getBsClassSet(), {'btn': true, 'btn-xs': true});
     });
   });
-});
\ No newline at end of file
+});
diff --git a/test/ButtonGroupSpec.jsx b/test/ButtonGroupSpec.jsx
index fa572a3f38..f80452893e 100644
--- a/test/ButtonGroupSpec.jsx
+++ b/test/ButtonGroupSpec.jsx
@@ -2,8 +2,8 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var ButtonGroup    = require('../cjs/ButtonGroup');
-var Button         = require('../cjs/Button');
+var ButtonGroup    = require('../lib/ButtonGroup');
+var Button         = require('../lib/Button');
 
 describe('ButtonGroup', function () {
   it('Should output a button group', function () {
@@ -50,4 +50,4 @@ describe('ButtonGroup', function () {
     );
     assert.ok(instance.getDOMNode().className.match(/\bbtn-group-justified\b/));
   });
-});
\ No newline at end of file
+});
diff --git a/test/ButtonSpec.jsx b/test/ButtonSpec.jsx
index b683619dbf..79b2689618 100644
--- a/test/ButtonSpec.jsx
+++ b/test/ButtonSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Button         = require('../cjs/Button');
+var Button         = require('../lib/Button');
 
 describe('Button', function () {
   it('Should output a button', function () {
diff --git a/test/ButtonToolbarSpec.jsx b/test/ButtonToolbarSpec.jsx
index 5ab0bb1614..e8a5e6e62c 100644
--- a/test/ButtonToolbarSpec.jsx
+++ b/test/ButtonToolbarSpec.jsx
@@ -2,9 +2,9 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var ButtonToolbar  = require('../cjs/ButtonToolbar');
-var ButtonGroup    = require('../cjs/ButtonGroup');
-var Button         = require('../cjs/Button');
+var ButtonToolbar  = require('../lib/ButtonToolbar');
+var ButtonGroup    = require('../lib/ButtonGroup');
+var Button         = require('../lib/Button');
 
 describe('ButtonToolbar', function () {
   it('Should output a button toolbar', function () {
@@ -21,4 +21,4 @@ describe('ButtonToolbar', function () {
     assert.ok(instance.getDOMNode().className.match(/\bbtn-toolbar\b/));
     assert.equal(instance.getDOMNode().getAttribute('role'), 'toolbar');
   });
-});
\ No newline at end of file
+});
diff --git a/test/CarouselSpec.jsx b/test/CarouselSpec.jsx
index bb76aa9892..6174dd16c0 100644
--- a/test/CarouselSpec.jsx
+++ b/test/CarouselSpec.jsx
@@ -2,8 +2,8 @@
 
 var React           = require('react');
 var ReactTestUtils  = require('react/lib/ReactTestUtils');
-var Carousel        = require('../cjs/Carousel');
-var CarouselItem    = require('../cjs/CarouselItem');
+var Carousel        = require('../lib/Carousel');
+var CarouselItem    = require('../lib/CarouselItem');
 
 describe('Carousel', function () {
   it('Should show the correct item', function () {
@@ -73,4 +73,4 @@ describe('Carousel', function () {
       )[0]
     );
   });
-});
\ No newline at end of file
+});
diff --git a/test/CustomPropTypesSpec.jsx b/test/CustomPropTypesSpec.jsx
index 1ad19cac8a..2db21bc970 100644
--- a/test/CustomPropTypesSpec.jsx
+++ b/test/CustomPropTypesSpec.jsx
@@ -2,7 +2,7 @@
 
 var React           = require('react');
 var ReactTestUtils  = require('react/lib/ReactTestUtils');
-var CustomPropTypes = require('../cjs/utils/CustomPropTypes');
+var CustomPropTypes = require('../lib/utils/CustomPropTypes');
 
 describe('CustomPropTypes', function () {
 
diff --git a/test/DropdownButtonSpec.jsx b/test/DropdownButtonSpec.jsx
index 7f6c0b7e73..61b9381b18 100644
--- a/test/DropdownButtonSpec.jsx
+++ b/test/DropdownButtonSpec.jsx
@@ -2,10 +2,10 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var DropdownButton = require('../cjs/DropdownButton');
-var MenuItem       = require('../cjs/MenuItem');
-var DropdownMenu   = require('../cjs/DropdownMenu');
-var Button         = require('../cjs/Button');
+var DropdownButton = require('../lib/DropdownButton');
+var MenuItem       = require('../lib/MenuItem');
+var DropdownMenu   = require('../lib/DropdownMenu');
+var Button         = require('../lib/Button');
 
 describe('DropdownButton', function () {
   var instance;
@@ -203,4 +203,4 @@ describe('DropdownButton', function () {
     var carets = button.getElementsByClassName('caret');
     assert.equal(carets.length, 0);
   });
-});
+});
\ No newline at end of file
diff --git a/test/DropdownMenuSpec.jsx b/test/DropdownMenuSpec.jsx
index 2990ae13c0..c91eb7421d 100644
--- a/test/DropdownMenuSpec.jsx
+++ b/test/DropdownMenuSpec.jsx
@@ -2,8 +2,8 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var DropdownMenu   = require('../cjs/DropdownMenu');
-var MenuItem       = require('../cjs/MenuItem');
+var DropdownMenu   = require('../lib/DropdownMenu');
+var MenuItem       = require('../lib/MenuItem');
 
 describe('DropdownMenu', function () {
   it('Should render menu correctly', function () {
@@ -100,4 +100,4 @@ describe('DropdownMenu', function () {
     ReactTestUtils.findRenderedDOMComponentWithTag(menuItems[1], 'a').getDOMNode()
       .dispatchEvent(evt);
   });
-});
\ No newline at end of file
+});
diff --git a/test/FadeMixinSpec.jsx b/test/FadeMixinSpec.jsx
index 130afd9a6b..dc091cc955 100644
--- a/test/FadeMixinSpec.jsx
+++ b/test/FadeMixinSpec.jsx
@@ -3,7 +3,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var FadeMixin = require('../cjs/FadeMixin');
+var FadeMixin = require('../lib/FadeMixin');
 
 var Component;
 
diff --git a/test/GlyphiconSpec.jsx b/test/GlyphiconSpec.jsx
index 183ac935d0..b08e1d3cd6 100644
--- a/test/GlyphiconSpec.jsx
+++ b/test/GlyphiconSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Glyphicon      = require('../cjs/Glyphicon');
+var Glyphicon      = require('../lib/Glyphicon');
 
 describe('Glyphicon', function () {
   it('Should have correct class', function () {
@@ -12,4 +12,4 @@ describe('Glyphicon', function () {
     assert.ok(instance.getDOMNode().className.match(/\bglyphicon\b/));
     assert.ok(instance.getDOMNode().className.match(/\bglyphicon-star\b/));
   });
-});
\ No newline at end of file
+});
diff --git a/test/InputSpec.jsx b/test/InputSpec.jsx
index c207d1c874..4303a0ab64 100644
--- a/test/InputSpec.jsx
+++ b/test/InputSpec.jsx
@@ -2,10 +2,10 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Input          = require('../cjs/Input');
-var Button         = require('../cjs/Button');
-var DropdownButton = require('../cjs/DropdownButton');
-var MenuItem       = require('../cjs/MenuItem');
+var Input          = require('../lib/Input');
+var Button         = require('../lib/Button');
+var DropdownButton = require('../lib/DropdownButton');
+var MenuItem       = require('../lib/MenuItem');
 
 describe('Input', function () {
   beforeEach(function() {
diff --git a/test/JumbotronSpec.jsx b/test/JumbotronSpec.jsx
index 62c2e6f0d1..e90e40808e 100644
--- a/test/JumbotronSpec.jsx
+++ b/test/JumbotronSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Jumbotron      = require('../cjs/Jumbotron');
+var Jumbotron      = require('../lib/Jumbotron');
 
 describe('Jumbotron', function () {
   it('Should output a div with content', function () {
@@ -23,4 +23,4 @@ describe('Jumbotron', function () {
     assert.ok(instance.getDOMNode().className.match(/\bjumbotron\b/));
   });
 
-});
\ No newline at end of file
+});
diff --git a/test/LabelSpec.jsx b/test/LabelSpec.jsx
index dfec3ade11..c1be49d274 100644
--- a/test/LabelSpec.jsx
+++ b/test/LabelSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Label          = require('../cjs/Label');
+var Label          = require('../lib/Label');
 
 describe('Label', function () {
 
@@ -33,4 +33,4 @@ describe('Label', function () {
     assert.ok(instance.getDOMNode().className.match(/\blabel-default\b/));
   });
 
-});
\ No newline at end of file
+});
diff --git a/test/ListGroupItemSpec.jsx b/test/ListGroupItemSpec.jsx
index ba64a91ce2..8ba1a85c4b 100644
--- a/test/ListGroupItemSpec.jsx
+++ b/test/ListGroupItemSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var ListGroupItem  = require('../cjs/ListGroupItem');
+var ListGroupItem  = require('../lib/ListGroupItem');
 
 describe('ListGroupItem', function () {
 
diff --git a/test/ListGroupSpec.jsx b/test/ListGroupSpec.jsx
index 896eccd21b..c4f15f251e 100644
--- a/test/ListGroupSpec.jsx
+++ b/test/ListGroupSpec.jsx
@@ -2,8 +2,8 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var ListGroup      = require('../cjs/ListGroup');
-var ListGroupItem  = require('../cjs/ListGroupItem');
+var ListGroup      = require('../lib/ListGroup');
+var ListGroupItem  = require('../lib/ListGroupItem');
 
 describe('ListGroup', function () {
 
diff --git a/test/MenuItemSpec.jsx b/test/MenuItemSpec.jsx
index d53fc50b86..602ab63969 100644
--- a/test/MenuItemSpec.jsx
+++ b/test/MenuItemSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var MenuItem       = require('../cjs/MenuItem');
+var MenuItem       = require('../lib/MenuItem');
 
 
 describe('MenuItem', function () {
diff --git a/test/ModalSpec.jsx b/test/ModalSpec.jsx
index 8e632f8df0..bbc0a6a1c6 100644
--- a/test/ModalSpec.jsx
+++ b/test/ModalSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Modal          = require('../cjs/Modal');
+var Modal          = require('../lib/Modal');
 
 describe('Modal', function () {
 
diff --git a/test/NavItemSpec.jsx b/test/NavItemSpec.jsx
index 5f65982c6e..5888a597ba 100644
--- a/test/NavItemSpec.jsx
+++ b/test/NavItemSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var NavItem        = require('../cjs/NavItem');
+var NavItem        = require('../lib/NavItem');
 
 describe('NavItem', function () {
   it('Should add active class', function () {
diff --git a/test/NavSpec.jsx b/test/NavSpec.jsx
index 8f49c77976..a3ba344665 100644
--- a/test/NavSpec.jsx
+++ b/test/NavSpec.jsx
@@ -2,9 +2,9 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Nav            = require('../cjs/Nav');
-var NavItem        = require('../cjs/NavItem');
-var Button         = require('../cjs/Button');
+var Nav            = require('../lib/Nav');
+var NavItem        = require('../lib/NavItem');
+var Button         = require('../lib/Button');
 
 describe('Nav', function () {
   it('Should set the correct item active', function () {
diff --git a/test/NavbarSpec.jsx b/test/NavbarSpec.jsx
index 28eced23c4..3fd34df4f7 100644
--- a/test/NavbarSpec.jsx
+++ b/test/NavbarSpec.jsx
@@ -2,8 +2,8 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Navbar         = require('../cjs/Navbar');
-var Nav            = require('../cjs/Nav');
+var Navbar         = require('../lib/Navbar');
+var Nav            = require('../lib/Nav');
 
 describe('Nav', function () {
 
diff --git a/test/OverlayMixinSpec.jsx b/test/OverlayMixinSpec.jsx
index 271fc666ce..855affe9e8 100644
--- a/test/OverlayMixinSpec.jsx
+++ b/test/OverlayMixinSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var OverlayMixin   = require('../cjs/OverlayMixin');
+var OverlayMixin   = require('../lib/OverlayMixin');
 
 describe('OverlayMixin', function () {
   var instance;
diff --git a/test/PageHeaderSpec.jsx b/test/PageHeaderSpec.jsx
index e8dbd2b28b..92198bf07c 100644
--- a/test/PageHeaderSpec.jsx
+++ b/test/PageHeaderSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var PageHeader     = require('../cjs/PageHeader');
+var PageHeader     = require('../lib/PageHeader');
 
 describe('PageHeader', function () {
   it('Should output a div with content', function () {
@@ -23,4 +23,4 @@ describe('PageHeader', function () {
     assert.ok(instance.getDOMNode().className.match(/\bpage-header\b/));
   });
 
-});
\ No newline at end of file
+});
diff --git a/test/PageItemSpec.jsx b/test/PageItemSpec.jsx
index 95857e3314..f1c726b0e2 100644
--- a/test/PageItemSpec.jsx
+++ b/test/PageItemSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var PageItem       = require('../cjs/PageItem');
+var PageItem       = require('../lib/PageItem');
 
 describe('PageItem', function () {
   it('Should output a "list item" as root element, and an "anchor" as a child item', function () {
diff --git a/test/PagerSpec.jsx b/test/PagerSpec.jsx
index d725579fc9..ead2be4e6c 100644
--- a/test/PagerSpec.jsx
+++ b/test/PagerSpec.jsx
@@ -2,8 +2,8 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Pager          = require('../cjs/Pager');
-var PageItem       = require('../cjs/PageItem');
+var Pager          = require('../lib/Pager');
+var PageItem       = require('../lib/PageItem');
 
 describe('Pager', function () {
   it('Should output a unordered list as root element with class "pager"', function () {
@@ -51,4 +51,4 @@ describe('Pager', function () {
     );
     ReactTestUtils.Simulate.click(ReactTestUtils.findRenderedDOMComponentWithTag(instance.refs.item2, 'a'));
   });
-});
\ No newline at end of file
+});
diff --git a/test/PanelGroupSpec.jsx b/test/PanelGroupSpec.jsx
index 5b2290936d..2ebc37b281 100644
--- a/test/PanelGroupSpec.jsx
+++ b/test/PanelGroupSpec.jsx
@@ -2,8 +2,8 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var PanelGroup     = require('../cjs/PanelGroup');
-var Panel          = require('../cjs/Panel');
+var PanelGroup     = require('../lib/PanelGroup');
+var Panel          = require('../lib/Panel');
 
 describe('PanelGroup', function () {
   it('Should pass bsStyle to Panels', function () {
@@ -49,4 +49,4 @@ describe('PanelGroup', function () {
 
     assert.notOk(panel.state.collapsing);
   });
-});
\ No newline at end of file
+});
diff --git a/test/PanelSpec.jsx b/test/PanelSpec.jsx
index 0000de30a0..37a93c38d0 100644
--- a/test/PanelSpec.jsx
+++ b/test/PanelSpec.jsx
@@ -2,8 +2,8 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Panel          = require('../cjs/Panel');
-var Table          = require('../cjs/Table');
+var Panel          = require('../lib/Panel');
+var Table          = require('../lib/Table');
 
 describe('Panel', function () {
   it('Should have class and body', function () {
@@ -174,4 +174,4 @@ describe('Panel', function () {
     assert.equal(children[0].nodeName, 'TABLE');
     assert.notOk(children[0].className.match(/\bpanel-body\b/));
   });
-});
+});
\ No newline at end of file
diff --git a/test/ProgressBarSpec.jsx b/test/ProgressBarSpec.jsx
index 9eccce0275..decf431f99 100644
--- a/test/ProgressBarSpec.jsx
+++ b/test/ProgressBarSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var ProgressBar    = require('../cjs/ProgressBar');
+var ProgressBar    = require('../lib/ProgressBar');
 
 var getProgressBar = function (wrapper) {
   return ReactTestUtils.findRenderedDOMComponentWithClass(wrapper, 'progress-bar');
diff --git a/test/SplitButtonSpec.jsx b/test/SplitButtonSpec.jsx
index a3ada637b2..60877cdae8 100644
--- a/test/SplitButtonSpec.jsx
+++ b/test/SplitButtonSpec.jsx
@@ -2,9 +2,9 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var SplitButton    = require('../cjs/SplitButton');
-var MenuItem       = require('../cjs/MenuItem');
-var Button       = require('../cjs/Button');
+var SplitButton    = require('../lib/SplitButton');
+var MenuItem       = require('../lib/MenuItem');
+var Button       = require('../lib/Button');
 
 describe('SplitButton', function () {
   var instance;
diff --git a/test/TabPaneSpec.jsx b/test/TabPaneSpec.jsx
index 2fc0e8e24e..9a32120350 100644
--- a/test/TabPaneSpec.jsx
+++ b/test/TabPaneSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var TabPane        = require('../cjs/TabPane');
+var TabPane        = require('../lib/TabPane');
 
 describe('TabPane', function () {
   it('Should have class', function () {
@@ -18,4 +18,4 @@ describe('TabPane', function () {
     );
     assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'active'));
   });
-});
\ No newline at end of file
+});
diff --git a/test/TabbedAreaSpec.jsx b/test/TabbedAreaSpec.jsx
index c5614b8aef..a42aca0786 100644
--- a/test/TabbedAreaSpec.jsx
+++ b/test/TabbedAreaSpec.jsx
@@ -2,9 +2,9 @@
 
 var React                  = require('react');
 var ReactTestUtils         = require('react/lib/ReactTestUtils');
-var TabbedArea             = require('../cjs/TabbedArea');
-var TabPane                = require('../cjs/TabPane');
-var ValidComponentChildren = require('../cjs/utils/ValidComponentChildren');
+var TabbedArea             = require('../lib/TabbedArea');
+var TabPane                = require('../lib/TabPane');
+var ValidComponentChildren = require('../lib/utils/ValidComponentChildren');
 
 describe('TabbedArea', function () {
   it('Should show the correct tab', function () {
@@ -165,4 +165,4 @@ describe('TabbedArea', function () {
 
     assert.ok(ReactTestUtils.findRenderedDOMComponentWithClass(instance, 'nav-pills'));
   });
-});
\ No newline at end of file
+});
diff --git a/test/TableSpec.jsx b/test/TableSpec.jsx
index 777d15f1e7..c6b40a61de 100644
--- a/test/TableSpec.jsx
+++ b/test/TableSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Table          = require('../cjs/Table');
+var Table          = require('../lib/Table');
 
 describe('Table', function () {
   it('Should be a table', function () {
@@ -48,4 +48,4 @@ describe('Table', function () {
     assert.ok(instance.getDOMNode().className.match(/\btable-responsive\b/));
     assert.ok(instance.getDOMNode().firstChild.className.match(/\btable\b/));
   });
-});
\ No newline at end of file
+});
diff --git a/test/WellSpec.jsx b/test/WellSpec.jsx
index 9490f606d4..8bd53ffad0 100644
--- a/test/WellSpec.jsx
+++ b/test/WellSpec.jsx
@@ -2,7 +2,7 @@
 
 var React          = require('react');
 var ReactTestUtils = require('react/lib/ReactTestUtils');
-var Well           = require('../cjs/Well');
+var Well           = require('../lib/Well');
 
 describe('Well', function () {
   it('Should output a well with content', function () {
@@ -32,4 +32,4 @@ describe('Well', function () {
       assert.ok(instance.getDOMNode().className.match(/\bwell-sm\b/));
     });
 
-});
\ No newline at end of file
+});
diff --git a/tools/amd/index.js b/tools/amd/index.js
index f0efeab92c..bc848179c6 100644
--- a/tools/amd/index.js
+++ b/tools/amd/index.js
@@ -4,53 +4,53 @@ define(function (require) {
   'use strict';
 
   return {
-    Accordion: require('./Accordion'),
-    Affix: require('./Affix'),
-    AffixMixin: require('./AffixMixin'),
-    Alert: require('./Alert'),
-    BootstrapMixin: require('./BootstrapMixin'),
-    Badge: require('./Badge'),
-    Button: require('./Button'),
-    ButtonGroup: require('./ButtonGroup'),
-    ButtonToolbar: require('./ButtonToolbar'),
-    Carousel: require('./Carousel'),
-    CarouselItem: require('./CarouselItem'),
-    Col: require('./Col'),
-    CollapsableMixin: require('./CollapsableMixin'),
-    DropdownButton: require('./DropdownButton'),
-    DropdownMenu: require('./DropdownMenu'),
-    DropdownStateMixin: require('./DropdownStateMixin'),
-    FadeMixin: require('./FadeMixin'),
-    Glyphicon: require('./Glyphicon'),
-    Grid: require('./Grid'),
-    Input: require('./Input'),
-    Interpolate: require('./Interpolate'),
-    Jumbotron: require('./Jumbotron'),
-    Label: require('./Label'),
-    ListGroup: require('./ListGroup'),
-    ListGroupItem: require('./ListGroupItem'),
-    MenuItem: require('./MenuItem'),
-    Modal: require('./Modal'),
-    Nav: require('./Nav'),
-    Navbar: require('./Navbar'),
-    NavItem: require('./NavItem'),
-    ModalTrigger: require('./ModalTrigger'),
-    OverlayTrigger: require('./OverlayTrigger'),
-    OverlayMixin: require('./OverlayMixin'),
-    PageHeader: require('./PageHeader'),
-    Panel: require('./Panel'),
-    PanelGroup: require('./PanelGroup'),
-    PageItem: require('./PageItem'),
-    Pager: require('./Pager'),
-    Popover: require('./Popover'),
-    ProgressBar: require('./ProgressBar'),
-    Row: require('./Row'),
-    SplitButton: require('./SplitButton'),
-    SubNav: require('./SubNav'),
-    TabbedArea: require('./TabbedArea'),
-    Table: require('./Table'),
-    TabPane: require('./TabPane'),
-    Tooltip: require('./Tooltip'),
-    Well: require('./Well')
+    Accordion: require('./lib/Accordion'),
+    Affix: require('./lib/Affix'),
+    AffixMixin: require('./lib/AffixMixin'),
+    Alert: require('./lib/Alert'),
+    BootstrapMixin: require('./lib/BootstrapMixin'),
+    Badge: require('./lib/Badge'),
+    Button: require('./lib/Button'),
+    ButtonGroup: require('./lib/ButtonGroup'),
+    ButtonToolbar: require('./lib/ButtonToolbar'),
+    Carousel: require('./lib/Carousel'),
+    CarouselItem: require('./lib/CarouselItem'),
+    Col: require('./lib/Col'),
+    CollapsableMixin: require('./lib/CollapsableMixin'),
+    DropdownButton: require('./lib/DropdownButton'),
+    DropdownMenu: require('./lib/DropdownMenu'),
+    DropdownStateMixin: require('./lib/DropdownStateMixin'),
+    FadeMixin: require('./lib/FadeMixin'),
+    Glyphicon: require('./lib/Glyphicon'),
+    Grid: require('./lib/Grid'),
+    Input: require('./lib/Input'),
+    Interpolate: require('./lib/Interpolate'),
+    Jumbotron: require('./lib/Jumbotron'),
+    Label: require('./lib/Label'),
+    ListGroup: require('./lib/ListGroup'),
+    ListGroupItem: require('./lib/ListGroupItem'),
+    MenuItem: require('./lib/MenuItem'),
+    Modal: require('./lib/Modal'),
+    Nav: require('./lib/Nav'),
+    Navbar: require('./lib/Navbar'),
+    NavItem: require('./lib/NavItem'),
+    ModalTrigger: require('./lib/ModalTrigger'),
+    OverlayTrigger: require('./lib/OverlayTrigger'),
+    OverlayMixin: require('./lib/OverlayMixin'),
+    PageHeader: require('./lib/PageHeader'),
+    Panel: require('./lib/Panel'),
+    PanelGroup: require('./lib/PanelGroup'),
+    PageItem: require('./lib/PageItem'),
+    Pager: require('./lib/Pager'),
+    Popover: require('./lib/Popover'),
+    ProgressBar: require('./lib/ProgressBar'),
+    Row: require('./lib/Row'),
+    SplitButton: require('./lib/SplitButton'),
+    SubNav: require('./lib/SubNav'),
+    TabbedArea: require('./lib/TabbedArea'),
+    Table: require('./lib/Table'),
+    TabPane: require('./lib/TabPane'),
+    Tooltip: require('./lib/Tooltip'),
+    Well: require('./lib/Well')
   };
 });