diff --git a/packages/animations/rollup.config.js b/packages/animations/rollup.config.js
index 9ecbc1047a..89a45e93d9 100644
--- a/packages/animations/rollup.config.js
+++ b/packages/animations/rollup.config.js
@@ -7,10 +7,10 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/animation/index.js',
-  dest: '../../../dist/packages-dist/animation/bundles/animation.umd.js',
+  entry: '../../dist/packages-dist/animations/@angular/animations.es5.js',
+  dest: '../../dist/packages-dist/animations/bundles/animations.umd.js',
   format: 'umd',
-  moduleName: 'ng.animation',
+  moduleName: 'ng.animations',
   globals: {
     '@angular/core': 'ng.core',
     'rxjs/Observable': 'Rx',
diff --git a/packages/benchpress/tsconfig-build.json b/packages/benchpress/tsconfig-build.json
index 39d6cbd0ff..0853d3c6ea 100644
--- a/packages/benchpress/tsconfig-build.json
+++ b/packages/benchpress/tsconfig-build.json
@@ -6,9 +6,9 @@
     "noImplicitAny": true,
     "sourceMap": true,
     "baseUrl": ".",
-    "outDir": "../../../dist/packages/benchpress",
+    "outDir": "../../dist/packages/benchpress",
     "paths": {
-      "@angular/core": ["../../../dist/packages/core"]
+      "@angular/core": ["../../dist/packages/core"]
     },
     "experimentalDecorators": true,
     "rootDir": ".",
diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js
index 1e6b494fc8..e8b1857b2e 100644
--- a/packages/common/rollup.config.js
+++ b/packages/common/rollup.config.js
@@ -7,8 +7,8 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/common/index.js',
-  dest: '../../../dist/packages-dist/common/bundles/common.umd.js',
+  entry: '../../dist/packages-dist/common/@angular/common.es5.js',
+  dest: '../../dist/packages-dist/common/bundles/common.umd.js',
   format: 'umd',
   moduleName: 'ng.common',
   globals: {
diff --git a/packages/common/testing/rollup.config.js b/packages/common/testing/rollup.config.js
index 8c0e1d7618..08b5b71ce5 100644
--- a/packages/common/testing/rollup.config.js
+++ b/packages/common/testing/rollup.config.js
@@ -7,7 +7,7 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/common/testing/index.js',
+  entry: '../../../dist/packages-dist/common/@angular/common/testing.es5.js',
   dest: '../../../dist/packages-dist/common/bundles/common-testing.umd.js',
   format: 'umd',
   moduleName: 'ng.common.testing',
diff --git a/packages/common/testing/tsconfig-build.json b/packages/common/testing/tsconfig-build.json
index 766d5659b6..8866cb5ab0 100644
--- a/packages/common/testing/tsconfig-build.json
+++ b/packages/common/testing/tsconfig-build.json
@@ -3,7 +3,7 @@
 
   "compilerOptions": {
     "paths": {
-      "@angular/core": ["../../dist/packages/core/"],
+      "@angular/core": ["../../dist/packages/core"],
       "@angular/common": ["../../dist/packages/common"]
     }
   },
diff --git a/packages/compiler/rollup.config.js b/packages/compiler/rollup.config.js
index 4aa5777651..0ae559a46f 100644
--- a/packages/compiler/rollup.config.js
+++ b/packages/compiler/rollup.config.js
@@ -7,8 +7,8 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/compiler/index.js',
-  dest: '../../../dist/packages-dist/compiler/bundles/compiler.umd.js',
+  entry: '../../dist/packages-dist/compiler/@angular/compiler.es5.js',
+  dest: '../../dist/packages-dist/compiler/bundles/compiler.umd.js',
   format: 'umd',
   moduleName: 'ng.compiler',
   globals: {
diff --git a/packages/compiler/testing/rollup.config.js b/packages/compiler/testing/rollup.config.js
index 8772530d02..c98d14fb5e 100644
--- a/packages/compiler/testing/rollup.config.js
+++ b/packages/compiler/testing/rollup.config.js
@@ -7,7 +7,7 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/compiler/testing/index.js',
+  entry: '../../../dist/packages-dist/compiler/@angular/compiler/testing.es5.js',
   dest: '../../../dist/packages-dist/compiler/bundles/compiler-testing.umd.js',
   format: 'umd',
   moduleName: 'ng.compiler.testing',
diff --git a/packages/core/esm5/src b/packages/core/esm5/src
deleted file mode 120000
index 5cd551cf26..0000000000
--- a/packages/core/esm5/src
+++ /dev/null
@@ -1 +0,0 @@
-../src
\ No newline at end of file
diff --git a/packages/core/testing/rollup.config.js b/packages/core/testing/rollup.config.js
index bf27b75a40..0dbbdf5fa1 100644
--- a/packages/core/testing/rollup.config.js
+++ b/packages/core/testing/rollup.config.js
@@ -7,7 +7,7 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/core/testing/index.js',
+  entry: '../../../dist/packages-dist/core/@angular/core/testing.es5.js',
   dest: '../../../dist/packages-dist/core/bundles/core-testing.umd.js',
   format: 'umd',
   moduleName: 'ng.core.testing',
diff --git a/packages/core/tsconfig-build.json b/packages/core/tsconfig-build.json
index b12d701549..2768c88842 100644
--- a/packages/core/tsconfig-build.json
+++ b/packages/core/tsconfig-build.json
@@ -17,7 +17,8 @@
     "lib": ["es2015", "dom"],
     "skipLibCheck": true,
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": []
+    "types": [],
+    "preserveConstEnums": true
   },
   "files": [
     "public_api.ts",
diff --git a/packages/forms/rollup.config.js b/packages/forms/rollup.config.js
index 89990f851c..fd38e88edf 100644
--- a/packages/forms/rollup.config.js
+++ b/packages/forms/rollup.config.js
@@ -7,8 +7,8 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/forms/index.js',
-  dest: '../../../dist/packages-dist/forms/bundles/forms.umd.js',
+  entry: '../../dist/packages-dist/forms/@angular/forms.es5.js',
+  dest: '../../dist/packages-dist/forms/bundles/forms.umd.js',
   format: 'umd',
   moduleName: 'ng.forms',
   globals: {
diff --git a/packages/http/rollup.config.js b/packages/http/rollup.config.js
index 69e786cdda..da400b5329 100644
--- a/packages/http/rollup.config.js
+++ b/packages/http/rollup.config.js
@@ -7,8 +7,8 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/http/index.js',
-  dest: '../../../dist/packages-dist/http/bundles/http.umd.js',
+  entry: '../../dist/packages-dist/http/@angular/http.es5.js',
+  dest: '../../dist/packages-dist/http/bundles/http.umd.js',
   format: 'umd',
   moduleName: 'ng.http',
   globals: {
diff --git a/packages/http/testing/rollup.config.js b/packages/http/testing/rollup.config.js
index 52c3207716..81e57f4be1 100644
--- a/packages/http/testing/rollup.config.js
+++ b/packages/http/testing/rollup.config.js
@@ -7,7 +7,7 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/http/testing/index.js',
+  entry: '../../../dist/packages-dist/http/@angular/http/testing.es5.js',
   dest: '../../../dist/packages-dist/http/bundles/http-testing.umd.js',
   format: 'umd',
   moduleName: 'ng.http.testing',
diff --git a/packages/language-service/rollup.config.js b/packages/language-service/rollup.config.js
index c0e158ee5a..bf9a572047 100644
--- a/packages/language-service/rollup.config.js
+++ b/packages/language-service/rollup.config.js
@@ -10,13 +10,13 @@ import commonjs from 'rollup-plugin-commonjs';
 import * as path from 'path';
 
 var m = /^\@angular\/((\w|\-)+)(\/(\w|\d|\/|\-)+)?$/;
-var location = normalize('../../../dist/packages-dist') + '/';
-var rxjsLocation = normalize('../../../node_modules/rxjs');
+var location = normalize('../../dist/packages-dist') + '/';
+var rxjsLocation = normalize('../../node_modules/rxjs');
 var esm = 'esm/';
 
 var locations = {
-  'tsc-wrapped': normalize('../../../dist/tools/@angular') + '/',
-  'compiler-cli': normalize('../../../dist/esm') + '/'
+  'tsc-wrapped': normalize('../../dist/tools/@angular') + '/',
+  'compiler-cli': normalize('../../dist/packages') + '/'
 };
 
 var esm_suffixes = {};
@@ -24,7 +24,7 @@ var esm_suffixes = {};
 function normalize(fileName) {
   return path.resolve(__dirname, fileName);
 }
-
+console.log('running')
 function resolve(id, from) {
   // console.log('Resolve id:', id, 'from', from)
   if (id == '@angular/tsc-wrapped') {
@@ -37,7 +37,7 @@ function resolve(id, from) {
     var packageName = match[1];
     var esm_suffix = esm_suffixes[packageName] || '';
     var loc = locations[packageName] || location;
-    var r = loc + esm_suffix + packageName + (match[3] || '/index') + '.js';
+    var r = loc !== location && (loc + esm_suffix + packageName + (match[3] || '/index') + '.js') || loc + packageName + '/@angular/' + packageName + '.es5.js';
     // console.log('** ANGULAR MAPPED **: ', r);
     return r;
   }
@@ -62,8 +62,8 @@ module.exports = function(provided) {
 `;
 
 export default {
-  entry: '../../../dist/packages-dist/language-service/index.js',
-  dest: '../../../dist/packages-dist/language-service/bundles/language-service.umd.js',
+  entry: '../../dist/packages-dist/language-service/@angular/language-service.es5.js',
+  dest: '../../dist/packages-dist/language-service/bundles/language-service.umd.js',
   format: 'amd',
   moduleName: 'ng.language_service',
   exports: 'named',
diff --git a/packages/platform-browser-dynamic/rollup.config.js b/packages/platform-browser-dynamic/rollup.config.js
index 03ed750040..429cb77872 100644
--- a/packages/platform-browser-dynamic/rollup.config.js
+++ b/packages/platform-browser-dynamic/rollup.config.js
@@ -7,9 +7,8 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/platform-browser-dynamic/index.js',
-  dest:
-      '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
+  entry: '../../dist/packages-dist/platform-browser-dynamic/@angular/platform-browser-dynamic.es5.js',
+  dest: '../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
   format: 'umd',
   moduleName: 'ng.platformBrowserDynamic',
   globals: {
diff --git a/packages/platform-browser-dynamic/testing/rollup.config.js b/packages/platform-browser-dynamic/testing/rollup.config.js
index ca88ac7f53..3790697596 100644
--- a/packages/platform-browser-dynamic/testing/rollup.config.js
+++ b/packages/platform-browser-dynamic/testing/rollup.config.js
@@ -7,7 +7,7 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/platform-browser-dynamic/testing/index.js',
+  entry: '../../../dist/packages-dist/platform-browser-dynamic/@angular/platform-browser-dynamic/testing.es5.js',
   dest:
       '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
   format: 'umd',
diff --git a/packages/platform-browser/animations/rollup.config.js b/packages/platform-browser/animations/rollup.config.js
new file mode 100644
index 0000000000..94a0bb3d0d
--- /dev/null
+++ b/packages/platform-browser/animations/rollup.config.js
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export default {
+  entry: '../../../dist/packages-dist/platform-browser/@angular/platform-browser/animations.es5.js',
+  dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-animations.umd.js',
+  format: 'umd',
+  moduleName: 'ng.platformBrowser.testing',
+  globals: {
+    '@angular/core': 'ng.core',
+    '@angular/common': 'ng.common',
+    '@angular/platform-browser': 'ng.platformBrowser'
+  }
+};
diff --git a/packages/platform-browser/animations/testing/rollup.config.js b/packages/platform-browser/animations/testing/rollup.config.js
new file mode 100644
index 0000000000..4aa53b0d6d
--- /dev/null
+++ b/packages/platform-browser/animations/testing/rollup.config.js
@@ -0,0 +1,19 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+export default {
+  entry: '../../../../dist/packages-dist/platform-browser/@angular/platform-browser/animations/testing.es5.js',
+  dest: '../../../../dist/packages-dist/platform-browser/bundles/platform-browser-animations-testing.umd.js',
+  format: 'umd',
+  moduleName: 'ng.platformBrowser.testing',
+  globals: {
+    '@angular/core': 'ng.core',
+    '@angular/common': 'ng.common',
+    '@angular/platform-browser': 'ng.platformBrowser'
+  }
+};
diff --git a/packages/platform-browser/rollup.config.js b/packages/platform-browser/rollup.config.js
index a02654510a..17810ca061 100644
--- a/packages/platform-browser/rollup.config.js
+++ b/packages/platform-browser/rollup.config.js
@@ -7,8 +7,8 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/platform-browser/index.js',
-  dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser.umd.js',
+  entry: '../../dist/packages-dist/platform-browser/@angular/platform-browser.es5.js',
+  dest: '../../dist/packages-dist/platform-browser/bundles/platform-browser.umd.js',
   format: 'umd',
   moduleName: 'ng.platformBrowser',
   globals: {
diff --git a/packages/platform-browser/testing/rollup.config.js b/packages/platform-browser/testing/rollup.config.js
index bd8fb02094..97fedec33b 100644
--- a/packages/platform-browser/testing/rollup.config.js
+++ b/packages/platform-browser/testing/rollup.config.js
@@ -7,7 +7,7 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/platform-browser/testing/index.js',
+  entry: '../../../dist/packages-dist/platform-browser/@angular/platform-browser/testing.es5.js',
   dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-testing.umd.js',
   format: 'umd',
   moduleName: 'ng.platformBrowser.testing',
diff --git a/packages/platform-server/rollup.config.js b/packages/platform-server/rollup.config.js
index 99f753257a..09254bf06d 100644
--- a/packages/platform-server/rollup.config.js
+++ b/packages/platform-server/rollup.config.js
@@ -7,8 +7,8 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/platform-server/index.js',
-  dest: '../../../dist/packages-dist/platform-server/bundles/platform-server.umd.js',
+  entry: '../../dist/packages-dist/platform-server/@angular/platform-server.es5.js',
+  dest: '../../dist/packages-dist/platform-server/bundles/platform-server.umd.js',
   format: 'umd',
   moduleName: 'ng.platformServer',
   globals: {
diff --git a/packages/platform-server/testing/rollup.config.js b/packages/platform-server/testing/rollup.config.js
index 94b9763bf2..23344e2af3 100644
--- a/packages/platform-server/testing/rollup.config.js
+++ b/packages/platform-server/testing/rollup.config.js
@@ -7,7 +7,7 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/platform-server/testing/index.js',
+  entry: '../../../dist/packages-dist/platform-server/@angular/platform-server/testing.es5.js',
   dest: '../../../dist/packages-dist/platform-server/bundles/platform-server-testing.umd.js',
   format: 'umd',
   moduleName: 'ng.platformServer.testing',
diff --git a/packages/platform-webworker-dynamic/rollup.config.js b/packages/platform-webworker-dynamic/rollup.config.js
index f8b4a0f4d3..c89d895645 100644
--- a/packages/platform-webworker-dynamic/rollup.config.js
+++ b/packages/platform-webworker-dynamic/rollup.config.js
@@ -7,9 +7,9 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/platform-webworker-dynamic/index.js',
+  entry: '../../dist/packages-dist/platform-webworker-dynamic/@angular/platform-webworker-dynamic.es5.js',
   dest:
-      '../../../dist/packages-dist/platform-webworker-dynamic/bundles/platform-webworker-dynamic.umd.js',
+      '../../dist/packages-dist/platform-webworker-dynamic/bundles/platform-webworker-dynamic.umd.js',
   format: 'umd',
   moduleName: 'ng.platformWebworkerDynamic',
   globals: {
diff --git a/packages/platform-webworker/rollup.config.js b/packages/platform-webworker/rollup.config.js
index c195c8be83..f8ebadec51 100644
--- a/packages/platform-webworker/rollup.config.js
+++ b/packages/platform-webworker/rollup.config.js
@@ -7,8 +7,8 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/platform-webworker/index.js',
-  dest: '../../../dist/packages-dist/platform-webworker/bundles/platform-webworker.umd.js',
+  entry: '../../dist/packages-dist/platform-webworker/@angular/platform-webworker.es5.js',
+  dest: '../../dist/packages-dist/platform-webworker/bundles/platform-webworker.umd.js',
   format: 'umd',
   moduleName: 'ng.platformWebworker',
   globals: {
diff --git a/packages/router/rollup.config.js b/packages/router/rollup.config.js
index 7f899dc72d..1417d0ec5e 100644
--- a/packages/router/rollup.config.js
+++ b/packages/router/rollup.config.js
@@ -7,8 +7,8 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/router/@angular/index.js',
-  dest: '../../../dist/packages-dist/router/bundles/router.umd.js',
+  entry: '../../dist/packages-dist/router/@angular/router.es5.js',
+  dest: '../../dist/packages-dist/router/bundles/router.umd.js',
   format: 'umd',
   moduleName: 'ng.router',
   globals: {
diff --git a/packages/router/testing/rollup.config.js b/packages/router/testing/rollup.config.js
index 1943b5793c..56e20b80fe 100644
--- a/packages/router/testing/rollup.config.js
+++ b/packages/router/testing/rollup.config.js
@@ -7,7 +7,7 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/router/testing/index.js',
+  entry: '../../../dist/packages-dist/router/@angular/router/testing.es5.js',
   dest: '../../../dist/packages-dist/router/bundles/router-testing.umd.js',
   format: 'umd',
   moduleName: 'ng.router.testing',
diff --git a/packages/router/upgrade/rollup.config.js b/packages/router/upgrade/rollup.config.js
index a7f56e3d02..12f1b482ac 100644
--- a/packages/router/upgrade/rollup.config.js
+++ b/packages/router/upgrade/rollup.config.js
@@ -7,7 +7,7 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/router/upgrade.js',
+  entry: '../../../dist/packages-dist/router/@angular/router/upgrade.es5.js',
   dest: '../../../dist/packages-dist/router/bundles/router-upgrade.umd.js',
   format: 'umd',
   moduleName: 'ng.router.upgrade',
diff --git a/packages/upgrade/rollup.config.js b/packages/upgrade/rollup.config.js
index f02a7da579..61a29de855 100644
--- a/packages/upgrade/rollup.config.js
+++ b/packages/upgrade/rollup.config.js
@@ -7,8 +7,8 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/upgrade/index.js',
-  dest: '../../../dist/packages-dist/upgrade/bundles/upgrade.umd.js',
+  entry: '../../dist/packages-dist/upgrade/@angular/upgrade.es5.js',
+  dest: '../../dist/packages-dist/upgrade/bundles/upgrade.umd.js',
   format: 'umd',
   moduleName: 'ng.upgrade',
   globals: {
diff --git a/packages/upgrade/static/rollup.config.js b/packages/upgrade/static/rollup.config.js
index a69138c84e..ce5781dad6 100644
--- a/packages/upgrade/static/rollup.config.js
+++ b/packages/upgrade/static/rollup.config.js
@@ -7,7 +7,7 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/upgrade/static.js',
+  entry: '../../../dist/packages-dist/upgrade/@angular/upgrade/static.es5.js',
   dest: '../../../dist/packages-dist/upgrade/bundles/upgrade-static.umd.js',
   format: 'umd',
   moduleName: 'ng.upgrade.static',