diff --git a/fixtures/packaging/browserify/dev/package.json b/fixtures/packaging/browserify/dev/package.json
index 6108263def..ce4caf22c6 100644
--- a/fixtures/packaging/browserify/dev/package.json
+++ b/fixtures/packaging/browserify/dev/package.json
@@ -5,6 +5,6 @@
     "browserify": "^13.3.0"
   },
   "scripts": {
-    "build": "rm -f output.js && NODE_PATH=../../../../build/rollup/packages browserify ./input.js -o output.js"
+    "build": "rm -f output.js && NODE_PATH=../../../../build/packages browserify ./input.js -o output.js"
   }
 }
diff --git a/fixtures/packaging/browserify/prod/package.json b/fixtures/packaging/browserify/prod/package.json
index e7589084d2..95d4e197f8 100644
--- a/fixtures/packaging/browserify/prod/package.json
+++ b/fixtures/packaging/browserify/prod/package.json
@@ -5,7 +5,7 @@
     "browserify": "^13.3.0"
   },
   "scripts": {
-    "build": "rm -f output.js && NODE_PATH=../../../../build/rollup/packages browserify ./input.js -g [envify --NODE_ENV 'production'] -o output.js"
+    "build": "rm -f output.js && NODE_PATH=../../../../build/packages browserify ./input.js -g [envify --NODE_ENV 'production'] -o output.js"
   },
   "devDependencies": {
     "envify": "^4.0.0"
diff --git a/fixtures/packaging/brunch/dev/package.json b/fixtures/packaging/brunch/dev/package.json
index 32907bdcdb..19b8693717 100644
--- a/fixtures/packaging/brunch/dev/package.json
+++ b/fixtures/packaging/brunch/dev/package.json
@@ -5,6 +5,6 @@
       "javascript-brunch": "^2.0.0"
   },
   "scripts": {
-    "build": "rm -rf public && ln -fs ../../../../../build/rollup/packages/react node_modules/react && ln -fs ../../../../../build/rollup/packages/react-dom node_modules/react-dom && brunch build"
+    "build": "rm -rf public && ln -fs ../../../../../build/packages/react node_modules/react && ln -fs ../../../../../build/packages/react-dom node_modules/react-dom && brunch build"
   }
 }
\ No newline at end of file
diff --git a/fixtures/packaging/brunch/prod/package.json b/fixtures/packaging/brunch/prod/package.json
index 31f9a77259..00e428d80c 100644
--- a/fixtures/packaging/brunch/prod/package.json
+++ b/fixtures/packaging/brunch/prod/package.json
@@ -5,6 +5,6 @@
       "javascript-brunch": "^2.0.0"
   },
   "scripts": {
-    "build": "rm -rf public && ln -fs ../../../../../build/rollup/packages/react node_modules/react && ln -fs ../../../../../build/rollup/packages/react-dom node_modules/react-dom && brunch build -p"
+    "build": "rm -rf public && ln -fs ../../../../../build/packages/react node_modules/react && ln -fs ../../../../../build/packages/react-dom node_modules/react-dom && brunch build -p"
   }
 }
\ No newline at end of file
diff --git a/fixtures/packaging/globals/dev.html b/fixtures/packaging/globals/dev.html
index 31de39b4e9..f70f14cb4a 100644
--- a/fixtures/packaging/globals/dev.html
+++ b/fixtures/packaging/globals/dev.html
@@ -1,7 +1,7 @@
 <html>
   <body>
-    <script src="../../../build/rollup/dist/react.dev.js"></script>
-    <script src="../../../build/rollup/dist/react-dom.dev.js"></script>
+    <script src="../../../build/dist/react.dev.js"></script>
+    <script src="../../../build/dist/react-dom.dev.js"></script>
     <div id="container"></div>
     <script>
       ReactDOM.render(
diff --git a/fixtures/packaging/globals/prod.html b/fixtures/packaging/globals/prod.html
index d5e6a62364..38de0418ba 100644
--- a/fixtures/packaging/globals/prod.html
+++ b/fixtures/packaging/globals/prod.html
@@ -1,7 +1,7 @@
 <html>
   <body>
-    <script src="../../../build/rollup/dist/react.prod.min.js"></script>
-    <script src="../../../build/rollup/dist/react-dom.prod.min.js"></script>
+    <script src="../../../build/dist/react.prod.min.js"></script>
+    <script src="../../../build/dist/react-dom.prod.min.js"></script>
     <div id="container"></div>
     <script>
       ReactDOM.render(
diff --git a/fixtures/packaging/requirejs/dev.html b/fixtures/packaging/requirejs/dev.html
index f3f474cb62..9b342907d0 100644
--- a/fixtures/packaging/requirejs/dev.html
+++ b/fixtures/packaging/requirejs/dev.html
@@ -5,8 +5,8 @@
     <script>
       requirejs.config({
         paths: {
-          react: '../../../build/rollup/dist/react.dev',
-          'react-dom': '../../../build/rollup/dist/react-dom.dev'
+          react: '../../../build/dist/react.dev',
+          'react-dom': '../../../build/dist/react-dom.dev'
         }
       });
 
diff --git a/fixtures/packaging/requirejs/prod.html b/fixtures/packaging/requirejs/prod.html
index 4850dc3665..1785e3a80a 100644
--- a/fixtures/packaging/requirejs/prod.html
+++ b/fixtures/packaging/requirejs/prod.html
@@ -5,8 +5,8 @@
     <script>
       requirejs.config({
         paths: {
-          react: '../../../build/rollup/dist/react.prod.min',
-          'react-dom': '../../../build/rollup/dist/react-dom.prod.min'
+          react: '../../../build/dist/react.prod.min',
+          'react-dom': '../../../build/dist/react-dom.prod.min'
         }
       });
 
diff --git a/fixtures/packaging/rjs/dev/config.js b/fixtures/packaging/rjs/dev/config.js
index 333863ba01..184ffb76b8 100644
--- a/fixtures/packaging/rjs/dev/config.js
+++ b/fixtures/packaging/rjs/dev/config.js
@@ -4,7 +4,7 @@ module.exports = {
   out: 'output.js',
   optimize: 'none',
   paths: {
-    react: '../../../../build/rollup/dist/react.dev',
-    'react-dom': '../../../../build/rollup/dist/react-dom.dev',
+    react: '../../../../build/dist/react.dev',
+    'react-dom': '../../../../build/dist/react-dom.dev',
   },
 };
diff --git a/fixtures/packaging/rjs/prod/config.js b/fixtures/packaging/rjs/prod/config.js
index 6daef8d0cd..f69a442b43 100644
--- a/fixtures/packaging/rjs/prod/config.js
+++ b/fixtures/packaging/rjs/prod/config.js
@@ -4,7 +4,7 @@ module.exports = {
   out: 'output.js',
   optimize: 'none',
   paths: {
-    react: '../../../../build/rollup/dist/react.prod.min',
-    'react-dom': '../../../../build/rollup/dist/react-dom.prod.min',
+    react: '../../../../build/dist/react.prod.min',
+    'react-dom': '../../../../build/dist/react-dom.prod.min',
   },
 };
diff --git a/fixtures/packaging/systemjs-builder/dev/config.js b/fixtures/packaging/systemjs-builder/dev/config.js
index e1a8db9b01..27e85f0cb5 100644
--- a/fixtures/packaging/systemjs-builder/dev/config.js
+++ b/fixtures/packaging/systemjs-builder/dev/config.js
@@ -1,6 +1,6 @@
 System.config({
   paths: {
-    react: '../../../../build/rollup/dist/react.dev.js',
-    'react-dom': '../../../../build/rollup/dist/react-dom.dev.js',
+    react: '../../../../build/dist/react.dev.js',
+    'react-dom': '../../../../build/dist/react-dom.dev.js',
   },
 });
diff --git a/fixtures/packaging/systemjs-builder/prod/config.js b/fixtures/packaging/systemjs-builder/prod/config.js
index b544d7c247..26215d30c0 100644
--- a/fixtures/packaging/systemjs-builder/prod/config.js
+++ b/fixtures/packaging/systemjs-builder/prod/config.js
@@ -1,6 +1,6 @@
 System.config({
   paths: {
-    react: '../../../../build/rollup/dist/react.prod.min.js',
-    'react-dom': '../../../../build/rollup/dist/react-dom.prod.min.js',
+    react: '../../../../build/dist/react.prod.min.js',
+    'react-dom': '../../../../build/dist/react-dom.prod.min.js',
   },
 });
diff --git a/fixtures/packaging/systemjs/dev.html b/fixtures/packaging/systemjs/dev.html
index 7fd7a2b26f..ee8100f90b 100644
--- a/fixtures/packaging/systemjs/dev.html
+++ b/fixtures/packaging/systemjs/dev.html
@@ -5,8 +5,8 @@
     <script>
       System.config({
         paths: {
-          react: '../../../build/rollup/dist/react.dev.js',
-          'react-dom': '../../../build/rollup/dist/react-dom.dev.js'
+          react: '../../../build/dist/react.dev.js',
+          'react-dom': '../../../build/dist/react-dom.dev.js'
         }
       });
 
diff --git a/fixtures/packaging/systemjs/prod.html b/fixtures/packaging/systemjs/prod.html
index 2e103fa95f..a866d9eaf6 100644
--- a/fixtures/packaging/systemjs/prod.html
+++ b/fixtures/packaging/systemjs/prod.html
@@ -5,8 +5,8 @@
     <script>
       System.config({
         paths: {
-          react: '../../../build/rollup/dist/react.prod.min.js',
-          'react-dom': '../../../build/rollup/dist/react-dom.prod.min.js'
+          react: '../../../build/dist/react.prod.min.js',
+          'react-dom': '../../../build/dist/react-dom.prod.min.js'
         }
       });
 
diff --git a/fixtures/packaging/webpack-alias/dev/config.js b/fixtures/packaging/webpack-alias/dev/config.js
index fd91f2af3c..fff8396d4a 100644
--- a/fixtures/packaging/webpack-alias/dev/config.js
+++ b/fixtures/packaging/webpack-alias/dev/config.js
@@ -6,10 +6,10 @@ module.exports = {
     filename: 'output.js',
   },
   resolve: {
-    root: path.resolve('../../../../build/rollup/packages'),
+    root: path.resolve('../../../../build/packages'),
     alias: {
-      'react': 'react/react.dev',
-      'react-dom': 'react-dom/react-dom.dev',
+      'react': 'react/dist/react.dev',
+      'react-dom': 'react-dom/dist/react-dom.dev',
     },
   },
 };
diff --git a/fixtures/packaging/webpack-alias/prod/config.js b/fixtures/packaging/webpack-alias/prod/config.js
index 7ae2705882..4b4f25e2aa 100644
--- a/fixtures/packaging/webpack-alias/prod/config.js
+++ b/fixtures/packaging/webpack-alias/prod/config.js
@@ -6,10 +6,10 @@ module.exports = {
     filename: 'output.js',
   },
   resolve: {
-    root: path.resolve('../../../../build/rollup/packages'),
+    root: path.resolve('../../../../build/packages'),
     alias: {
-      'react': 'react/react.prod.min',
-      'react-dom': 'react-dom/react-dom.prod.min',
+      'react': 'react/dist/react.prod.min',
+      'react-dom': 'react-dom/dist/react-dom.prod.min',
     },
   },
 };
diff --git a/fixtures/packaging/webpack/dev/config.js b/fixtures/packaging/webpack/dev/config.js
index 3e806cd262..24eed41fe1 100644
--- a/fixtures/packaging/webpack/dev/config.js
+++ b/fixtures/packaging/webpack/dev/config.js
@@ -6,6 +6,6 @@ module.exports = {
     filename: 'output.js',
   },
   resolve: {
-    root: path.resolve('../../../../build/rollup/packages/'),
+    root: path.resolve('../../../../build/packages/'),
   },
 };
diff --git a/fixtures/packaging/webpack/prod/config.js b/fixtures/packaging/webpack/prod/config.js
index 3a1d19a429..5516e81a80 100644
--- a/fixtures/packaging/webpack/prod/config.js
+++ b/fixtures/packaging/webpack/prod/config.js
@@ -7,7 +7,7 @@ module.exports = {
     filename: 'output.js',
   },
   resolve: {
-    root: path.resolve('../../../../build/rollup/packages/'),
+    root: path.resolve('../../../../build/packages/'),
   },
   plugins: [  
     new webpack.DefinePlugin({  
diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index 351895a3e4..6c85413834 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -196,7 +196,7 @@ function getCommonJsConfig(bundleType) {
 
 function copyNodePackageTemplate(packageName) {
   const from = resolve(`./packages/${packageName}`);
-  const to = resolve(`./build/rollup/packages/${packageName}`);  
+  const to = resolve(`./build/packages/${packageName}`);  
 
   // if the package directory already exists, we skip copying to it
   if (!existsSync(to) && existsSync(from)) {
@@ -214,15 +214,23 @@ function copyNodePackageTemplate(packageName) {
 }
 
 function copyBundleIntoNodePackage(packageName, filename, bundleType) {
-  let from = resolve(`./build/rollup/${filename}`);
-  
-  if (bundleType === bundleTypes.UMD_DEV || bundleType === bundleTypes.UMD_PROD) {
-    from = resolve(`./build/rollup/dist/${filename}`);
-  }
-  const packageDirectory = resolve(`./build/rollup/packages/${packageName}`);
-  const to = `${packageDirectory}/${filename}`;
+  const packageDirectory = resolve(`./build/packages/${packageName}`);
 
-  if (existsSync(packageDirectory)) {
+  if (existsSync(packageDirectory)) {  
+    let from = resolve(`./build/${filename}`);
+    let to = `${packageDirectory}/${filename}`;
+    // for UMD bundles we have to move the files into a dist directory
+    // within the package directory. we also need to set the from
+    // to be the root build from directory
+    if (bundleType === bundleTypes.UMD_DEV || bundleType === bundleTypes.UMD_PROD) {
+      const distDirectory = `${packageDirectory}/dist`;
+      // create a dist directory if not created
+      if (!existsSync(distDirectory)) {
+        mkdirSync(distDirectory);
+      }
+      from = resolve(`./build/dist/${filename}`);
+      to = `${packageDirectory}/dist/${filename}`;
+    }
     return new Promise((res, rej) => {
       ncp(from, to, error => {
         if (error) {
@@ -328,16 +336,16 @@ function createBundle({
   });
 }
 
-// clear the build folder
-rimraf(join('build', 'rollup'), async () => {
-  // TODO: this line can go away once we remove rollup folder
-  mkdirSync(resolve(`./build/rollup`));
+// clear the build directory
+rimraf('./build', async () => {
+  // create a new build directory
+  mkdirSync(resolve('build'));
   // create the packages folder for NODE+UMD bundles
-  mkdirSync(resolve(`./build/rollup/packages/`));
+  mkdirSync(resolve(join('build', 'packages')));
   // create the dist folder for UMD bundles
-  mkdirSync(resolve(`./build/rollup/dist/`));
+  mkdirSync(resolve(join('build', 'dist')));
   // create the facebookWWW folder for FB bundles
-  mkdirSync(resolve(`./build/rollup/${facebookWWW}/`));
+  mkdirSync(resolve(join('build', facebookWWW)));
 
   // rather than run concurently, opt to run them serially
   // this helps improve console/warning/error output
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index 576205751e..9a07b71518 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -31,7 +31,7 @@ const bundles = [
     babelOpts: babelOptsReact,
     bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB],
     config: {
-      destDir: 'build/rollup/',
+      destDir: 'build/',
       moduleName: 'React',
       sourceMap: false,
     },
@@ -59,7 +59,7 @@ const bundles = [
     babelOpts: babelOptsReact,
     bundleTypes: [FB],
     config: {
-      destDir: 'build/rollup/',
+      destDir: 'build/',
       globals: {
         'react': 'React',
       },
@@ -87,7 +87,7 @@ const bundles = [
     babelOpts: babelOptsReact,
     bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB],
     config: {
-      destDir: 'build/rollup/',
+      destDir: 'build/',
       globals: {
         'react': 'React',
       },
@@ -116,7 +116,7 @@ const bundles = [
     // TODO: deal with the Node version of react-dom-server package
     bundleTypes: [UMD_DEV, UMD_PROD, FB],
     config: {
-      destDir: 'build/rollup/',
+      destDir: 'build/',
       globals: {
         'react': 'React',
       },
@@ -150,7 +150,7 @@ const bundles = [
     // builds sync up to the building of the package directories
     bundleTypes: [FB],
     config: {
-      destDir: 'build/rollup/',
+      destDir: 'build/',
       globals: {
         'react': 'React',
       },
@@ -184,7 +184,7 @@ const bundles = [
     // builds sync up to the building of the package directories
     bundleTypes: [UMD_DEV, UMD_PROD, FB],
     config: {
-      destDir: 'build/rollup/',
+      destDir: 'build/',
       globals: {
         'react': 'React',
       },
@@ -217,7 +217,7 @@ const bundles = [
     babelOpts: babelOptsReact,
     bundleTypes: [RN],
     config: {
-      destDir: 'build/rollup/',
+      destDir: 'build/',
       moduleName: 'ReactNative',
       sourceMap: false,
     },
@@ -248,7 +248,7 @@ const bundles = [
     babelOpts: babelOptsReact,
     bundleTypes: [NODE_DEV, FB],
     config: {
-      destDir: 'build/rollup/',
+      destDir: 'build/',
       moduleName: 'ReactTestRenderer',
       sourceMap: false,
     },
@@ -272,7 +272,7 @@ const bundles = [
     babelOpts: babelOptsReact,
     bundleTypes: [FB],
     config: {
-      destDir: 'build/rollup/',
+      destDir: 'build/',
       moduleName: 'ReactTestRenderer',
       sourceMap: false,
     },
