diff --git a/build.sh b/build.sh
index 51aa9fb614..99a571d1be 100755
--- a/build.sh
+++ b/build.sh
@@ -26,7 +26,8 @@ PACKAGES=(core
   benchpress)
 
 NODE_PACKAGES=(compiler-cli
-  benchpress)
+  benchpress
+  tsc-wrapped)
 
 BUILD_ALL=true
 BUNDLE=true
@@ -107,76 +108,36 @@ containsElement () {
   return 1
 }
 
-#######################################
-# Downlevel ES2015 to ESM/ES5
-# Arguments:
-#   param1 - Source folder
-#   param2 - Naming suffix to apply. Must end in ".ts" (defaults to .es5.ts)
-# Returns:
-#   None
-#######################################
-downlevelES2015() {
-  # Iterate over the files in this directory, converting to .es5.ts
-  regex="(.+).js"
-  for file in ${1}/*.js ; do
-    if [[ ${file} =~ $regex ]]; then
-      ts_file="${BASH_REMATCH[1]}${2:-".es5.ts"}"
-      cp ${file} ${ts_file}
-
-      echo "======           $TSC ${ts_file} --target es5 --module es2015 --noLib --sourceMap --importHelpers"
-      ($TSC ${ts_file} --target es5 --module es2015 --noLib --sourceMap --importHelpers) > /dev/null 2>&1 || true
-      mapSources "${BASH_REMATCH[1]}${2:-".es5.js"}"
-      rm -f ${ts_file}
-    fi
-  done
-
-  # Recurse for sub directories
-  for DIR in ${1}/* ; do
-    isIgnoredDirectory ${DIR} && continue
-    downlevelES2015 ${DIR}
-  done
-}
-
 #######################################
 # Rollup index files recursively, ignoring blacklisted directories
 # Arguments:
 #   param1 - Base source folder
 #   param2 - Destination directory
-#   param3 - Config file
 # Returns:
 #   None
 #######################################
 rollupIndex() {
   # Iterate over the files in this directory, rolling up each into ${2} directory
   local regex=".+/(.+)/index.js"
-  if [[ "${1}/index.js" =~ $regex ]]; then
-    in_file="${1}/index.js"
-    out_file="${2}/${BASH_REMATCH[1]}.js"
+  in_file="${1}/index.js"
+  out_file="${2}/index.js"
 
-    echo "======           $ROLLUP -i ${in_file} -o ${out_file}"
+  BANNER_TEXT=`cat ${LICENSE_BANNER}`
 
-    if [[ -f "${3}" ]]; then
-      $ROLLUP -i ${in_file} -o ${out_file} -c ${3} --sourcemap
-    else
-      $ROLLUP -i ${in_file} -o ${out_file} --sourcemap
-    fi
-    cat ${LICENSE_BANNER} > ${out_file}.tmp
-    cat ${out_file} >> ${out_file}.tmp
-    mv ${out_file}.tmp ${out_file}
-
-    mapSources "${out_file}"
-
-    # Recurse for sub directories
-    for DIR in ${1}/* ; do
-      isIgnoredDirectory ${DIR} && continue
-      # NOTE: We need to re-run this regex and use the new match as Bash doesn't have closures
-      if [[ "${1}/index.js" =~ $regex ]]; then
-        rollupIndex ${DIR} ${2}/${BASH_REMATCH[1]} "$(dirname $3)/${BASH_REMATCH[1]}/rollup.config.js"
-      fi
-    done
+  if [[ -f ${in_file} ]]; then
+    echo "===========           $ROLLUP -i ${in_file} -o ${out_file} -c ${ROOT_DIR}/rollup.config.js --sourcemap"
+    $ROLLUP -i ${in_file} -o ${out_file} --sourcemap -f es --banner "$BANNER_TEXT" >/dev/null 2>&1
   fi
-}
 
+  # Recurse for sub directories
+  for DIR in ${1}/* ; do
+    isIgnoredDirectory ${DIR} && continue
+    # NOTE: We need to re-run this regex and use the new match as Bash doesn't have closures
+    if [[ "${DIR}/index.js" =~ $regex ]]; then
+      rollupIndex ${DIR} ${2}/${BASH_REMATCH[1]}
+    fi
+  done
+}
 
 #######################################
 # Recursively runs rollup on any entry point that has a "rollup.config.js" file
@@ -186,17 +147,11 @@ rollupIndex() {
 #   None
 #######################################
 runRollup() {
-  local regex="dest: ['\"](.+)['\"],*"
   if [[ -f "${1}/rollup.config.js" ]]; then
     cd ${1}
 
     echo "======           $ROLLUP -c ${1}/rollup.config.js"
-    $ROLLUP -c rollup.config.js --sourcemap
-
-    local dest_line=$(cat "${1}/rollup.config.js" | grep 'dest:')
-    if [[ ${dest_line} =~ $regex ]]; then
-      mapSources "${BASH_REMATCH[1]}"
-    fi
+    $ROLLUP -c rollup.config.js --sourcemap >/dev/null 2>&1
 
     # Recurse for sub directories
     for DIR in ${1}/* ; do
@@ -241,7 +196,6 @@ minify() {
     if [[ "${base_file}" =~ $regex && "${base_file##*.}" != "map" ]]; then
       local out_file=$(dirname "${file}")/${BASH_REMATCH[1]}.min.js
       $UGLIFYJS -c --screw-ie8 --comments -o ${out_file} --source-map ${out_file}.map --source-map-include-sources ${file}
-      mapSources "${out_file}"
     fi
   done
 }
@@ -252,19 +206,18 @@ minify() {
 #   param1 - Source directory
 #   param2 - Out dir
 #   param3 - Package Name
-#   param4 - Is child (are we recursing?)
 # Returns:
 #   None
 #######################################
 compilePackage() {
   echo "======      [${3}]: COMPILING: ${NGC} -p ${1}/tsconfig-build.json"
   # For NODE_PACKAGES items (not getting rolled up)
-  if containsElement "${PACKAGE}" "${NODE_PACKAGES[@]}"; then
+  if containsElement "${3}" "${NODE_PACKAGES[@]}"; then
     $TSC -p ${1}/tsconfig-build.json
   else
     local package_name=$(basename "${2}")
     $NGC -p ${1}/tsconfig-build.json
-    echo "======           Create ${1}/../${package_name}.d.ts re-export file for Closure"
+    echo "======           Create ${1}/../${package_name}.d.ts re-export file for tsickle"
     echo "$(cat ${LICENSE_BANNER}) ${N} export * from './${package_name}/index'" > ${2}/../${package_name}.d.ts
     echo "{\"__symbolic\":\"module\",\"version\":3,\"metadata\":{},\"exports\":[{\"from\":\"./${package_name}/index\"}],\"flatModuleIndexRedirect\":true}" > ${2}/../${package_name}.metadata.json
   fi
@@ -274,24 +227,31 @@ compilePackage() {
     BASE_DIR=$(basename "${DIR}")
     # Skip over directories that are not nested entry points
     [[ -e ${DIR}/tsconfig-build.json && "${BASE_DIR}" != "integrationtest" ]] || continue
-    compilePackage ${DIR} ${2}/${BASE_DIR} ${3} true
+    compilePackage ${DIR} ${2}/${BASE_DIR} ${3}
   done
 }
 
 #######################################
-# Moves typings and metadata files appropriately
+# Recursively compile package
 # Arguments:
-#   param1 - Source of typings & metadata files
-#   param2 - Root of destination directory
-#   param3 - Package name (needed to correspond to name of d.ts and metadata.json files)
+#   param1 - Source directory
+#   param2 - Out dir
+#   param3 - Package Name
 # Returns:
 #   None
 #######################################
-moveTypings() {
-  if [[ -f ${1}/index.d.ts && -f ${1}/index.metadata.json ]]; then
-    mv ${1}/index.d.ts ${1}/${2}.d.ts
-    mv ${1}/index.metadata.json ${1}/${2}.metadata.json
-  fi
+compilePackageES5() {
+  echo "======      [${3}]: COMPILING: ${NGC} -p ${1}/tsconfig-build.json --target es5 -d false --outDir ${2} --importHelpers true --sourceMap"
+  local package_name=$(basename "${2}")
+  $NGC -p ${1}/tsconfig-build.json --target es5 -d false --outDir ${2} --importHelpers true --sourceMap
+
+  for DIR in ${1}/* ; do
+    [ -d "${DIR}" ] || continue
+    BASE_DIR=$(basename "${DIR}")
+    # Skip over directories that are not nested entry points
+    [[ -e ${DIR}/tsconfig-build.json && "${BASE_DIR}" != "integrationtest" ]] || continue
+    compilePackageES5 ${DIR} ${2} ${3}
+  done
 }
 
 #######################################
@@ -314,19 +274,6 @@ addNgcPackageJson() {
   done
 }
 
-#######################################
-# This is read by NGC to be able to find the flat module index.
-# Arguments:
-#   param1 - JavaScript file on which to re-map sources
-# Returns:
-#   None
-#######################################
-mapSources() {
-  if [[ -f "${1}.map" ]]; then
-    $MAP_SOURCES -f "${1}"
-  fi
-}
-
 updateVersionReferences() {
   NPM_DIR="$1"
   (
@@ -343,8 +290,7 @@ echo "====== BUILDING: Version ${VERSION}"
 N="
 "
 TSC=`pwd`/node_modules/.bin/tsc
-NGC="node --max-old-space-size=3000 dist/packages-dist/tsc-wrapped/src/main"
-MAP_SOURCES="node `pwd`/scripts/build/map_sources.js "
+NGC="node --max-old-space-size=3000 `pwd`/dist/packages-dist/tsc-wrapped/src/main"
 UGLIFYJS=`pwd`/node_modules/.bin/uglifyjs
 TSCONFIG=./tools/tsconfig.json
 ROLLUP=`pwd`/node_modules/.bin/rollup
@@ -446,8 +392,10 @@ do
   SRC_DIR=${ROOT_DIR}/${PACKAGE}
   ROOT_OUT_DIR=${PWD}/dist/packages
   OUT_DIR=${ROOT_OUT_DIR}/${PACKAGE}
+  OUT_DIR_ESM5=${ROOT_OUT_DIR}/${PACKAGE}/esm5
   NPM_DIR=${PWD}/dist/packages-dist/${PACKAGE}
-  MODULES_DIR=${NPM_DIR}/@angular
+  ESM15_DIR=${NPM_DIR}/esm15
+  ESM5_DIR=${NPM_DIR}/esm5
   BUNDLES_DIR=${NPM_DIR}/bundles
 
   LICENSE_BANNER=${ROOT_DIR}/license-banner.txt
@@ -466,15 +414,15 @@ do
 
       echo "======        Copy ${PACKAGE} typings"
       rsync -a --exclude=*.js --exclude=*.js.map ${OUT_DIR}/ ${NPM_DIR}
-      moveTypings ${NPM_DIR} ${PACKAGE}
 
       (
         cd  ${SRC_DIR}
         echo "======         Rollup ${PACKAGE}"
-        rollupIndex ${OUT_DIR} ${MODULES_DIR} ${ROOT_DIR}
+        rollupIndex ${OUT_DIR} ${ESM15_DIR} ${ROOT_DIR}
 
-        echo "======         Downleveling ES2015 to ESM/ES5"
-        downlevelES2015 ${MODULES_DIR}
+        echo "======         Produce ESM5 version"
+        compilePackageES5 ${SRC_DIR} ${OUT_DIR_ESM5} ${PACKAGE}
+        rollupIndex ${OUT_DIR_ESM5} ${ESM5_DIR} ${ROOT_DIR}
 
         echo "======         Run rollup conversions on ${PACKAGE}"
         runRollup ${SRC_DIR}
diff --git a/integration/hello_world__closure/closure.conf b/integration/hello_world__closure/closure.conf
index 8393a38b29..ba4bd6e1f1 100644
--- a/integration/hello_world__closure/closure.conf
+++ b/integration/hello_world__closure/closure.conf
@@ -13,18 +13,20 @@
 node_modules/zone.js/dist/zone_externs.js
 
 --js node_modules/rxjs/**.js
---process_common_js_modules
+
+--js node_modules/@angular/core/package.json
+--js node_modules/@angular/core/esm15/index.js
+--js node_modules/@angular/core/src/testability/testability.externs.js
+
+--js node_modules/@angular/common/package.json
+--js node_modules/@angular/common/esm15/index.js
+
+--js node_modules/@angular/platform-browser/package.json
+--js node_modules/@angular/platform-browser/esm15/index.js
+
 --module_resolution=node
-
-node_modules/@angular/core/@angular/core.js
---js_module_root=node_modules/@angular/core
-node_modules/@angular/core/src/testability/testability.externs.js
-
-node_modules/@angular/common/@angular/common.js
---js_module_root=node_modules/@angular/common
-
-node_modules/@angular/platform-browser/@angular/platform-browser.js
---js_module_root=node_modules/@angular/platform-browser
+--package_json_entry_names es2015
+--process_common_js_modules
 
 --js built/**.js
 --entry_point=built/src/main
diff --git a/integration/hello_world__closure/package.json b/integration/hello_world__closure/package.json
index 14d555606d..c2fa872634 100644
--- a/integration/hello_world__closure/package.json
+++ b/integration/hello_world__closure/package.json
@@ -11,7 +11,7 @@
     "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
     "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
     "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
-    "google-closure-compiler": "20170409.0.0",
+    "google-closure-compiler": "git+https://github.com/alexeagle/closure-compiler.git#packagejson.dist",
     "rxjs": "5.3.1",
     "typescript": "~2.3.1",
     "zone.js": "0.8.6"
@@ -29,4 +29,4 @@
     "preprotractor": "tsc -p e2e",
     "protractor": "protractor e2e/protractor.config.js"
   }
-}
\ No newline at end of file
+}
diff --git a/integration/i18n/closure.conf b/integration/i18n/closure.conf
index 8393a38b29..5d66c749e3 100644
--- a/integration/i18n/closure.conf
+++ b/integration/i18n/closure.conf
@@ -15,16 +15,17 @@ node_modules/zone.js/dist/zone_externs.js
 --js node_modules/rxjs/**.js
 --process_common_js_modules
 --module_resolution=node
+--package_json_entry_names es2015
 
-node_modules/@angular/core/@angular/core.js
---js_module_root=node_modules/@angular/core
-node_modules/@angular/core/src/testability/testability.externs.js
+--js node_modules/@angular/core/package.json
+--js node_modules/@angular/core/esm15/index.js
+--js node_modules/@angular/core/src/testability/testability.externs.js
 
-node_modules/@angular/common/@angular/common.js
---js_module_root=node_modules/@angular/common
+--js node_modules/@angular/common/package.json
+--js node_modules/@angular/common/esm15/index.js
 
-node_modules/@angular/platform-browser/@angular/platform-browser.js
---js_module_root=node_modules/@angular/platform-browser
+--js node_modules/@angular/platform-browser/package.json
+--js node_modules/@angular/platform-browser/esm15/index.js
 
 --js built/**.js
 --entry_point=built/src/main
diff --git a/integration/i18n/package.json b/integration/i18n/package.json
index 14d555606d..812fa878ce 100644
--- a/integration/i18n/package.json
+++ b/integration/i18n/package.json
@@ -11,7 +11,7 @@
     "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
     "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
     "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
-    "google-closure-compiler": "20170409.0.0",
+    "google-closure-compiler": "git+https://github.com/alexeagle/closure-compiler.git#packagejson.dist",
     "rxjs": "5.3.1",
     "typescript": "~2.3.1",
     "zone.js": "0.8.6"
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 7e6140e441..305f5095bf 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -1,20 +1,17 @@
 {
   "name": "angular-srcs",
-  "version": "5.0.0-beta.4",
+  "version": "5.0.0-beta.5",
   "dependencies": {
     "@bazel/typescript": {
       "version": "0.0.7",
       "dependencies": {
         "@types/node": {
           "version": "7.0.18"
-        },
-        "tsickle": {
-          "version": "0.23.6"
         }
       }
     },
     "@google-cloud/common": {
-      "version": "0.13.4",
+      "version": "0.13.5",
       "dependencies": {
         "array-uniq": {
           "version": "1.0.3"
@@ -477,6 +474,9 @@
     "asynckit": {
       "version": "0.4.0"
     },
+    "atob": {
+      "version": "2.0.3"
+    },
     "aws-sign2": {
       "version": "0.6.0"
     },
@@ -1871,10 +1871,10 @@
           "version": "4.17.4"
         },
         "mime-db": {
-          "version": "1.27.0"
+          "version": "1.29.0"
         },
         "mime-types": {
-          "version": "2.1.15"
+          "version": "2.1.16"
         },
         "minimist": {
           "version": "0.0.8"
@@ -2491,7 +2491,7 @@
           "version": "1.0.0"
         },
         "es5-ext": {
-          "version": "0.10.29"
+          "version": "0.10.30"
         },
         "es6-iterator": {
           "version": "2.0.1"
@@ -2531,7 +2531,7 @@
       "version": "4.2.0"
     },
     "estree-walker": {
-      "version": "0.2.1"
+      "version": "0.3.1"
     },
     "esutils": {
       "version": "1.1.6"
@@ -4885,7 +4885,7 @@
           "version": "2.0.0"
         },
         "nan": {
-          "version": "2.6.2"
+          "version": "2.7.0"
         },
         "node-pre-gyp": {
           "version": "0.6.36"
@@ -5729,7 +5729,7 @@
       }
     },
     "magic-string": {
-      "version": "0.16.0"
+      "version": "0.19.1"
     },
     "make-dir": {
       "version": "1.0.0"
@@ -6204,6 +6204,9 @@
     "path-key": {
       "version": "2.0.1"
     },
+    "path-parse": {
+      "version": "1.0.5"
+    },
     "path-to-regexp": {
       "version": "0.1.7"
     },
@@ -6581,6 +6584,9 @@
     "resolve": {
       "version": "1.1.6"
     },
+    "resolve-url": {
+      "version": "0.2.1"
+    },
     "response-time": {
       "version": "2.3.1"
     },
@@ -6677,24 +6683,32 @@
       "version": "1.1.0"
     },
     "rollup": {
-      "version": "0.41.6"
+      "version": "0.47.4"
     },
     "rollup-plugin-commonjs": {
-      "version": "5.0.5",
+      "version": "8.1.0",
       "dependencies": {
         "acorn": {
-          "version": "4.0.3"
+          "version": "4.0.13"
         },
         "resolve": {
-          "version": "1.1.7"
+          "version": "1.4.0"
         }
       }
     },
     "rollup-plugin-node-resolve": {
       "version": "3.0.0"
     },
+    "rollup-plugin-sourcemaps": {
+      "version": "0.4.2"
+    },
     "rollup-pluginutils": {
-      "version": "1.5.2"
+      "version": "2.0.1",
+      "dependencies": {
+        "micromatch": {
+          "version": "2.3.11"
+        }
+      }
     },
     "router": {
       "version": "1.3.1",
@@ -6980,6 +6994,9 @@
     "source-map": {
       "version": "0.5.6"
     },
+    "source-map-resolve": {
+      "version": "0.5.0"
+    },
     "source-map-support": {
       "version": "0.4.2",
       "dependencies": {
@@ -6993,6 +7010,9 @@
         }
       }
     },
+    "source-map-url": {
+      "version": "0.4.0"
+    },
     "sourcemap-codec": {
       "version": "1.3.0"
     },
@@ -7409,7 +7429,7 @@
       }
     },
     "tsickle": {
-      "version": "0.23.4"
+      "version": "0.23.6"
     },
     "tslib": {
       "version": "1.7.1"
@@ -7558,6 +7578,9 @@
     "upper-case-first": {
       "version": "1.1.2"
     },
+    "urix": {
+      "version": "0.1.0"
+    },
     "url": {
       "version": "0.10.3",
       "dependencies": {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 641f10ca15..d1419e69ab 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,28 +1,23 @@
 {
   "name": "angular-srcs",
-  "version": "5.0.0-beta.4",
+  "version": "5.0.0-beta.5",
   "dependencies": {
     "@bazel/typescript": {
       "version": "0.0.7",
-      "from": "@bazel/typescript@latest",
+      "from": "@bazel/typescript@0.0.7",
       "resolved": "https://registry.npmjs.org/@bazel/typescript/-/typescript-0.0.7.tgz",
       "dependencies": {
         "@types/node": {
           "version": "7.0.18",
           "from": "@types/node@7.0.18",
           "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.18.tgz"
-        },
-        "tsickle": {
-          "version": "0.23.6",
-          "from": "tsickle@0.23.6",
-          "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.23.6.tgz"
         }
       }
     },
     "@google-cloud/common": {
-      "version": "0.13.4",
+      "version": "0.13.5",
       "from": "@google-cloud/common@>=0.13.0 <0.14.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.4.tgz",
+      "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-0.13.5.tgz",
       "dependencies": {
         "array-uniq": {
           "version": "1.0.3",
@@ -61,12 +56,12 @@
         },
         "qs": {
           "version": "6.4.0",
-          "from": "qs@~6.4.0",
+          "from": "qs@>=6.4.0 <6.5.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"
         },
         "readable-stream": {
           "version": "2.3.3",
-          "from": "readable-stream@^2.1.5",
+          "from": "readable-stream@>=2.1.5 <3.0.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
           "dependencies": {
             "safe-buffer": {
@@ -78,7 +73,7 @@
         },
         "request": {
           "version": "2.81.0",
-          "from": "request@^2.79.0",
+          "from": "request@>=2.79.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
         },
         "string_decoder": {
@@ -395,7 +390,7 @@
       "dependencies": {
         "async": {
           "version": "2.5.0",
-          "from": "async@>=2.0.1 <3.0.0",
+          "from": "async@^2.0.1",
           "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz"
         },
         "inherits": {
@@ -415,7 +410,7 @@
         },
         "readable-stream": {
           "version": "2.3.3",
-          "from": "readable-stream@^2.1.5",
+          "from": "readable-stream@>=2.1.5 <3.0.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
         },
         "safe-buffer": {
@@ -775,6 +770,11 @@
       "from": "asynckit@>=0.4.0 <0.5.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
     },
+    "atob": {
+      "version": "2.0.3",
+      "from": "atob@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.0.3.tgz"
+    },
     "aws-sign2": {
       "version": "0.6.0",
       "from": "aws-sign2@>=0.6.0 <0.7.0",
@@ -2909,7 +2909,7 @@
     },
     "cldr-data-downloader": {
       "version": "0.3.2",
-      "from": "cldr-data-downloader@>=0.3.0 <0.4.0",
+      "from": "cldr-data-downloader@>=0.3.2 <0.4.0",
       "resolved": "https://registry.npmjs.org/cldr-data-downloader/-/cldr-data-downloader-0.3.2.tgz",
       "dependencies": {
         "adm-zip": {
@@ -2943,14 +2943,14 @@
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
         },
         "mime-db": {
-          "version": "1.27.0",
-          "from": "mime-db@>=1.27.0 <1.28.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"
+          "version": "1.29.0",
+          "from": "mime-db@>=1.29.0 <1.30.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"
         },
         "mime-types": {
-          "version": "2.1.15",
+          "version": "2.1.16",
           "from": "mime-types@>=2.1.7 <2.2.0",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz"
         },
         "minimist": {
           "version": "0.0.8",
@@ -2991,7 +2991,7 @@
     },
     "cldrjs": {
       "version": "0.5.0",
-      "from": "cldrjs@0.5.0",
+      "from": "cldrjs@>=0.5.0 <0.6.0",
       "resolved": "https://registry.npmjs.org/cldrjs/-/cldrjs-0.5.0.tgz"
     },
     "cli-boxes": {
@@ -3227,7 +3227,7 @@
       "dependencies": {
         "qs": {
           "version": "6.4.0",
-          "from": "qs@~6.4.0",
+          "from": "qs@>=6.4.0 <6.5.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"
         }
       }
@@ -3504,7 +3504,7 @@
         },
         "readable-stream": {
           "version": "2.0.6",
-          "from": "readable-stream@>=2.0.0 <2.1.0",
+          "from": "readable-stream@~2.0.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
         },
         "through2": {
@@ -3767,7 +3767,7 @@
       "dependencies": {
         "isarray": {
           "version": "1.0.0",
-          "from": "isarray@>=1.0.0 <1.1.0",
+          "from": "isarray@~1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
         },
         "readable-stream": {
@@ -3943,9 +3943,9 @@
           "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz"
         },
         "es5-ext": {
-          "version": "0.10.29",
+          "version": "0.10.30",
           "from": "es5-ext@>=0.10.14 <0.11.0",
-          "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.29.tgz"
+          "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz"
         },
         "es6-iterator": {
           "version": "2.0.1",
@@ -4007,9 +4007,9 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"
     },
     "estree-walker": {
-      "version": "0.2.1",
-      "from": "estree-walker@>=0.2.1 <0.3.0",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz"
+      "version": "0.3.1",
+      "from": "estree-walker@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.3.1.tgz"
     },
     "esutils": {
       "version": "1.1.6",
@@ -4494,7 +4494,7 @@
             },
             "readable-stream": {
               "version": "2.3.3",
-              "from": "readable-stream@^2.0.5",
+              "from": "readable-stream@>=2.0.5 <3.0.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
             },
             "string_decoder": {
@@ -4592,7 +4592,7 @@
         },
         "lodash": {
           "version": "4.17.4",
-          "from": "lodash@>=4.6.1 <5.0.0",
+          "from": "lodash@^4.6.1",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
         },
         "mime-db": {
@@ -4622,7 +4622,7 @@
         },
         "qs": {
           "version": "6.4.0",
-          "from": "qs@~6.4.0",
+          "from": "qs@>=6.4.0 <6.5.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"
         },
         "readable-stream": {
@@ -4672,7 +4672,7 @@
             },
             "readable-stream": {
               "version": "2.3.3",
-              "from": "readable-stream@^2.0.0",
+              "from": "readable-stream@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
             },
             "string_decoder": {
@@ -5600,12 +5600,12 @@
         },
         "mime-db": {
           "version": "1.29.0",
-          "from": "mime-db@>=1.29.0 <1.30.0",
+          "from": "mime-db@~1.29.0",
           "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"
         },
         "mime-types": {
           "version": "2.1.16",
-          "from": "mime-types@>=2.1.7 <2.2.0",
+          "from": "mime-types@~2.1.7",
           "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz"
         },
         "qs": {
@@ -5615,7 +5615,7 @@
         },
         "readable-stream": {
           "version": "2.3.3",
-          "from": "readable-stream@^2.1.5",
+          "from": "readable-stream@>=2.1.5 <3.0.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
           "dependencies": {
             "safe-buffer": {
@@ -5627,7 +5627,7 @@
         },
         "request": {
           "version": "2.81.0",
-          "from": "request@^2.81.0",
+          "from": "request@>=2.81.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
         },
         "retry-request": {
@@ -5654,7 +5654,7 @@
         },
         "tough-cookie": {
           "version": "2.3.2",
-          "from": "tough-cookie@>=2.3.0 <2.4.0",
+          "from": "tough-cookie@~2.3.0",
           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"
         },
         "tunnel-agent": {
@@ -5721,12 +5721,12 @@
         },
         "qs": {
           "version": "6.4.0",
-          "from": "qs@~6.4.0",
+          "from": "qs@>=6.4.0 <6.5.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"
         },
         "readable-stream": {
           "version": "2.3.3",
-          "from": "readable-stream@^2.1.5",
+          "from": "readable-stream@>=2.1.5 <3.0.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
           "dependencies": {
             "safe-buffer": {
@@ -5738,7 +5738,7 @@
         },
         "request": {
           "version": "2.81.0",
-          "from": "request@^2.81.0",
+          "from": "request@>=2.81.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
         },
         "signal-exit": {
@@ -6043,12 +6043,12 @@
         },
         "qs": {
           "version": "6.4.0",
-          "from": "qs@~6.4.0",
+          "from": "qs@>=6.4.0 <6.5.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"
         },
         "request": {
           "version": "2.81.0",
-          "from": "request@^2.74.0",
+          "from": "request@>=2.74.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
         },
         "tough-cookie": {
@@ -6105,12 +6105,12 @@
         },
         "qs": {
           "version": "6.4.0",
-          "from": "qs@~6.4.0",
+          "from": "qs@>=6.4.0 <6.5.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"
         },
         "request": {
           "version": "2.81.0",
-          "from": "request@^2.79.0",
+          "from": "request@>=2.79.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
         },
         "tough-cookie": {
@@ -6963,12 +6963,12 @@
         },
         "qs": {
           "version": "6.4.0",
-          "from": "qs@~6.4.0",
+          "from": "qs@>=6.4.0 <6.5.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"
         },
         "request": {
           "version": "2.81.0",
-          "from": "request@^2.72.0",
+          "from": "request@>=2.72.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
         },
         "tough-cookie": {
@@ -7305,7 +7305,7 @@
         },
         "readable-stream": {
           "version": "2.3.3",
-          "from": "readable-stream@^2.1.5",
+          "from": "readable-stream@>=2.1.5 <3.0.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
         },
         "safe-buffer": {
@@ -7781,9 +7781,9 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
         },
         "nan": {
-          "version": "2.6.2",
+          "version": "2.7.0",
           "from": "nan@>=2.6.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz"
         },
         "node-pre-gyp": {
           "version": "0.6.36",
@@ -9145,9 +9145,9 @@
       }
     },
     "magic-string": {
-      "version": "0.16.0",
-      "from": "magic-string@>=0.16.0 <0.17.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.16.0.tgz"
+      "version": "0.19.1",
+      "from": "magic-string@>=0.19.0 <0.20.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.19.1.tgz"
     },
     "make-dir": {
       "version": "1.0.0",
@@ -9510,7 +9510,7 @@
         },
         "qs": {
           "version": "6.4.0",
-          "from": "qs@~6.4.0",
+          "from": "qs@>=6.4.0 <6.5.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"
         },
         "rc": {
@@ -9520,7 +9520,7 @@
         },
         "request": {
           "version": "2.81.0",
-          "from": "request@^2.81.0",
+          "from": "request@>=2.81.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
         },
         "rimraf": {
@@ -9530,7 +9530,7 @@
         },
         "semver": {
           "version": "5.4.1",
-          "from": "semver@^5.3.0",
+          "from": "semver@>=5.3.0 <6.0.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"
         },
         "strip-json-comments": {
@@ -9920,6 +9920,11 @@
       "from": "path-key@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
     },
+    "path-parse": {
+      "version": "1.0.5",
+      "from": "path-parse@>=1.0.5 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"
+    },
     "path-to-regexp": {
       "version": "0.1.7",
       "from": "path-to-regexp@0.1.7",
@@ -10531,6 +10536,11 @@
       "from": "resolve@>=1.1.4 <2.0.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz"
     },
+    "resolve-url": {
+      "version": "0.2.1",
+      "from": "resolve-url@>=0.2.1 <0.3.0",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"
+    },
     "response-time": {
       "version": "2.3.1",
       "from": "response-time@>=2.3.1 <2.4.0",
@@ -10583,12 +10593,12 @@
         },
         "qs": {
           "version": "6.4.0",
-          "from": "qs@~6.4.0",
+          "from": "qs@>=6.4.0 <6.5.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"
         },
         "readable-stream": {
           "version": "2.3.3",
-          "from": "readable-stream@^2.1.5",
+          "from": "readable-stream@>=2.1.5 <3.0.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
           "dependencies": {
             "safe-buffer": {
@@ -10600,7 +10610,7 @@
         },
         "request": {
           "version": "2.81.0",
-          "from": "request@^2.81.0",
+          "from": "request@>=2.81.0 <3.0.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz"
         },
         "string_decoder": {
@@ -10685,24 +10695,24 @@
       "resolved": "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz"
     },
     "rollup": {
-      "version": "0.41.6",
-      "from": "rollup@0.41.6",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.41.6.tgz"
+      "version": "0.47.4",
+      "from": "rollup@0.47.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.47.4.tgz"
     },
     "rollup-plugin-commonjs": {
-      "version": "5.0.5",
-      "from": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-5.0.5.tgz",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-5.0.5.tgz",
+      "version": "8.1.0",
+      "from": "rollup-plugin-commonjs@8.1.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.1.0.tgz",
       "dependencies": {
         "acorn": {
-          "version": "4.0.3",
+          "version": "4.0.13",
           "from": "acorn@>=4.0.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz"
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"
         },
         "resolve": {
-          "version": "1.1.7",
+          "version": "1.4.0",
           "from": "resolve@>=1.1.7 <2.0.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz"
         }
       }
     },
@@ -10711,10 +10721,22 @@
       "from": "rollup-plugin-node-resolve@latest",
       "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz"
     },
+    "rollup-plugin-sourcemaps": {
+      "version": "0.4.2",
+      "from": "rollup-plugin-sourcemaps@0.4.2",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz"
+    },
     "rollup-pluginutils": {
-      "version": "1.5.2",
-      "from": "rollup-pluginutils@>=1.5.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz"
+      "version": "2.0.1",
+      "from": "rollup-pluginutils@>=2.0.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz",
+      "dependencies": {
+        "micromatch": {
+          "version": "2.3.11",
+          "from": "micromatch@>=2.3.11 <3.0.0",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"
+        }
+      }
     },
     "router": {
       "version": "1.3.1",
@@ -11052,7 +11074,7 @@
         },
         "readable-stream": {
           "version": "2.3.3",
-          "from": "readable-stream@^2.0.2",
+          "from": "readable-stream@>=2.0.2 <3.0.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"
         },
         "safe-buffer": {
@@ -11172,6 +11194,11 @@
       "from": "source-map@latest",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
     },
+    "source-map-resolve": {
+      "version": "0.5.0",
+      "from": "source-map-resolve@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.0.tgz"
+    },
     "source-map-support": {
       "version": "0.4.2",
       "from": "source-map-support@latest",
@@ -11191,6 +11218,11 @@
         }
       }
     },
+    "source-map-url": {
+      "version": "0.4.0",
+      "from": "source-map-url@>=0.4.0 <0.5.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"
+    },
     "sourcemap-codec": {
       "version": "1.3.0",
       "from": "sourcemap-codec@>=1.3.0 <2.0.0",
@@ -11665,7 +11697,7 @@
         },
         "readable-stream": {
           "version": "2.3.3",
-          "from": "readable-stream@^2.1.4",
+          "from": "readable-stream@>=2.1.4 <3.0.0",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
           "dependencies": {
             "inherits": {
@@ -11865,9 +11897,9 @@
       }
     },
     "tsickle": {
-      "version": "0.23.4",
-      "from": "tsickle@0.23.4",
-      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.23.4.tgz"
+      "version": "0.23.6",
+      "from": "tsickle@0.23.6",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.23.6.tgz"
     },
     "tslib": {
       "version": "1.7.1",
@@ -12106,6 +12138,11 @@
       "from": "upper-case-first@>=1.1.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz"
     },
+    "urix": {
+      "version": "0.1.0",
+      "from": "urix@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
+    },
     "url": {
       "version": "0.10.3",
       "from": "url@>=0.10.1 <0.11.0",
diff --git a/package.json b/package.json
index 76a7ce7453..e20fb47f26 100644
--- a/package.json
+++ b/package.json
@@ -87,9 +87,10 @@
     "react": "^0.14.0",
     "rewire": "^2.3.3",
     "rho": "^0.3.0",
-    "rollup": "^0.41.6",
-    "rollup-plugin-commonjs": "^5.0.5",
+    "rollup": "^0.47.4",
+    "rollup-plugin-commonjs": "^8.1.0",
     "rollup-plugin-node-resolve": "^3.0.0",
+    "rollup-plugin-sourcemaps": "^0.4.2",
     "selenium-webdriver": "^2.53.3",
     "semver": "^5.1.0",
     "sorcery": "^0.10.0",
@@ -97,7 +98,7 @@
     "source-map-support": "^0.4.2",
     "systemjs": "0.18.10",
     "ts-api-guardian": "^0.2.2",
-    "tsickle": "^0.23.4",
+    "tsickle": "^0.23.6",
     "tslint": "^4.1.1",
     "tslint-eslint-rules": "^3.1.0",
     "typescript": "^2.3.4",
diff --git a/packages/animations/browser/index.ts b/packages/animations/browser/index.ts
index ffe366afa1..05e6b19532 100644
--- a/packages/animations/browser/index.ts
+++ b/packages/animations/browser/index.ts
@@ -11,4 +11,4 @@
 // replaces this file with production index.ts when it rewrites private symbol
 // names.
 
-export * from './src/browser';
+export * from './public_api';
diff --git a/packages/animations/browser/package.json b/packages/animations/browser/package.json
index b9d1595a1f..85410894f5 100644
--- a/packages/animations/browser/package.json
+++ b/packages/animations/browser/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/animations/browser",
-  "typings": "../browser.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/animations-browser.umd.js",
-  "module": "../@angular/animations/browser.es5.js",
-  "es2015": "../@angular/animations/browser.js"
+  "module": "../esm5/browser/index.js",
+  "es2015": "../esm15/browser/index.js"
 }
diff --git a/packages/animations/browser/public_api.ts b/packages/animations/browser/public_api.ts
index 9275e0d9de..172ca60bd4 100644
--- a/packages/animations/browser/public_api.ts
+++ b/packages/animations/browser/public_api.ts
@@ -9,6 +9,6 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the animation package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/browser';
diff --git a/packages/animations/browser/rollup.config.js b/packages/animations/browser/rollup.config.js
index 736888fbff..94d4133ff1 100644
--- a/packages/animations/browser/rollup.config.js
+++ b/packages/animations/browser/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -15,12 +16,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../../dist/packages-dist/animations/@angular/animations/browser.es5.js',
+  entry: '../../../dist/packages-dist/animations/esm5/browser/index.js',
   dest: '../../../dist/packages-dist/animations/bundles/animations-browser.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.animations.browser',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/animations/browser/testing/index.ts b/packages/animations/browser/testing/index.ts
index 1bec069535..05e6b19532 100644
--- a/packages/animations/browser/testing/index.ts
+++ b/packages/animations/browser/testing/index.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the platform-browser/animations/testing package.
- */
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language serivce and during build for verifcation. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-export * from './src/testing';
+export * from './public_api';
diff --git a/packages/animations/browser/testing/package.json b/packages/animations/browser/testing/package.json
index 04ca9981ce..173b8c5a57 100644
--- a/packages/animations/browser/testing/package.json
+++ b/packages/animations/browser/testing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/animations/browser/testing",
-  "typings": "../testing.d.ts",
+  "typings": "./index.d.ts",
   "main": "../../bundles/platform-browser-animations-testing.umd.js",
-  "module": "../../@angular/platform-browser/animations/testing.es5.js",
-  "es2015": "../../@angular/platform-browser/animations/testing.js"
+  "module": "../../esm5/animations/testing/index.js",
+  "es2015": "../../esm15/animations/testing/index.js"
 }
diff --git a/packages/animations/browser/testing/public_api.ts b/packages/animations/browser/testing/public_api.ts
new file mode 100644
index 0000000000..fcc511dc6e
--- /dev/null
+++ b/packages/animations/browser/testing/public_api.ts
@@ -0,0 +1,14 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/testing';
diff --git a/packages/animations/browser/testing/rollup.config.js b/packages/animations/browser/testing/rollup.config.js
index 05795686c9..04864d6044 100644
--- a/packages/animations/browser/testing/rollup.config.js
+++ b/packages/animations/browser/testing/rollup.config.js
@@ -7,20 +7,22 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
+  '@angular/animations': 'ng.animations',
   'rxjs/Observable': 'Rx',
   'rxjs/Subject': 'Rx',
 };
 
 export default {
-  entry: '../../../../dist/packages-dist/animations/@angular/animations/browser/testing.es5.js',
+  entry: '../../../../dist/packages-dist/animations/esm5/browser/testing/index.js',
   dest: '../../../../dist/packages-dist/animations/bundles/animations-browser-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.animations.browser.testing',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/animations/browser/testing/tsconfig-build.json b/packages/animations/browser/testing/tsconfig-build.json
index fea449e67c..9d4e4b6f26 100644
--- a/packages/animations/browser/testing/tsconfig-build.json
+++ b/packages/animations/browser/testing/tsconfig-build.json
@@ -1,17 +1,26 @@
 {
-  "extends": "../../tsconfig-build",
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "../../",
     "paths": {
-      "@angular/animations": ["../../dist/packages/animations"]
-    }
+      "@angular/animations": ["../../../../dist/packages/animations"]
+    },
+    "outDir": "../../../../dist/packages/animations"
   },
+
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../../node_modules/@types/hammerjs/index.d.ts",
     "../../../../node_modules/@types/jasmine/index.d.ts",
     "../../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
+
   "angularCompilerOptions": {
-    "strictMetadataEmit": true
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/animations/browser/testing"
   }
 }
diff --git a/packages/animations/browser/tsconfig-build.json b/packages/animations/browser/tsconfig-build.json
index 769bd13ed6..5765900012 100644
--- a/packages/animations/browser/tsconfig-build.json
+++ b/packages/animations/browser/tsconfig-build.json
@@ -1,16 +1,21 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
 
   "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "@angular/animations": ["../../dist/packages/animations"]
-    }
+      "@angular/animations": ["../../../dist/packages/animations"]
+    },
+    "outDir": "../../../dist/packages/animations"
   },
+
   "files": [
     "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts",
     "../../system.d.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/animations/package.json b/packages/animations/package.json
index 3e45a0ab25..0de5289fc1 100644
--- a/packages/animations/package.json
+++ b/packages/animations/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - animations integration with web-animationss",
   "main": "./bundles/animations.umd.js",
-  "module": "./@angular/animations.es5.js",
-  "es2015": "./@angular/animations.js",
-  "typings": "./animations.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/animations/public_api.ts b/packages/animations/public_api.ts
index 698d901fbd..3ebc27ff03 100644
--- a/packages/animations/public_api.ts
+++ b/packages/animations/public_api.ts
@@ -9,6 +9,6 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the animation package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/animations';
diff --git a/packages/animations/rollup.config.js b/packages/animations/rollup.config.js
index 3aa92bc6e4..4807c7f73c 100644
--- a/packages/animations/rollup.config.js
+++ b/packages/animations/rollup.config.js
@@ -7,20 +7,22 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
+  '@angular/animations': 'ng.animations',
   'rxjs/Observable': 'Rx',
   'rxjs/Subject': 'Rx',
 };
 
 export default {
-  entry: '../../dist/packages-dist/animations/@angular/animations.es5.js',
+  entry: '../../dist/packages-dist/animations/esm5/index.js',
   dest: '../../dist/packages-dist/animations/bundles/animations.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.animations',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/animations/tsconfig-build.json b/packages/animations/tsconfig-build.json
index d7a6f6f347..4811cc8194 100644
--- a/packages/animations/tsconfig-build.json
+++ b/packages/animations/tsconfig-build.json
@@ -1,29 +1,19 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/animations",
-    "paths": {
-    },
     "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "lib": ["es2015", "dom"],
-    "skipLibCheck": true,
-    "strictNullChecks": true,
-    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": []
+    "paths": {},
+    "outDir": "../../dist/packages/animations"
   },
+
   "files": [
     "public_api.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts",
     "../system.d.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/benchpress/tsconfig-build.json b/packages/benchpress/tsconfig-build.json
index 0853d3c6ea..540553953e 100644
--- a/packages/benchpress/tsconfig-build.json
+++ b/packages/benchpress/tsconfig-build.json
@@ -1,23 +1,17 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "module": "commonjs",
-    "target": "es2015",
-    "lib": ["es6", "dom"],
-    "noImplicitAny": true,
-    "sourceMap": true,
     "baseUrl": ".",
-    "outDir": "../../dist/packages/benchpress",
+    "rootDir": ".",
+    "sourceRoot": ".",
     "paths": {
       "@angular/core": ["../../dist/packages/core"]
     },
-    "experimentalDecorators": true,
-    "rootDir": ".",
-    "sourceRoot": ".",
-    "declaration": true,
-    "skipLibCheck": true,
-    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": []
+    "outDir": "../../dist/packages/benchpress"
   },
+
   "files": [
     "index.ts",
     "../../node_modules/@types/node/index.d.ts",
diff --git a/packages/common/http/package.json b/packages/common/http/package.json
index 31a1d9572d..8377c622ac 100644
--- a/packages/common/http/package.json
+++ b/packages/common/http/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/common/http",
-  "typings": "../http.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/common-http.umd.js",
-  "module": "../@angular/common/http.es5.js",
-  "es2015": "../@angular/common/http.js"
+  "module": "../esm5/http/index.js",
+  "es2015": "../esm15/http/index.js"
 }
diff --git a/packages/common/http/rollup.config.js b/packages/common/http/rollup.config.js
index 1d33a207af..07dc144f2c 100644
--- a/packages/common/http/rollup.config.js
+++ b/packages/common/http/rollup.config.js
@@ -9,6 +9,7 @@
 const globals = {
   '@angular/core': 'ng.core',
   '@angular/platform-browser': 'ng.platformBrowser',
+  '@angular/common': 'ng.common',
   'rxjs/Observable': 'Rx',
   'rxjs/Subject': 'Rx',
 
@@ -20,7 +21,7 @@ const globals = {
 };
 
 export default {
-  entry: '../../../dist/packages-dist/common/@angular/common/http.es5.js',
+  entry: '../../../dist/packages-dist/common/esm5/http/index.js',
   dest: '../../../dist/packages-dist/common/bundles/common-http.umd.js',
   format: 'umd',
   exports: 'named',
diff --git a/packages/common/http/testing/package.json b/packages/common/http/testing/package.json
index 1d4ecfb152..4fd1762c30 100644
--- a/packages/common/http/testing/package.json
+++ b/packages/common/http/testing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/common/http/testing",
-  "typings": "../testing.d.ts",
+  "typings": "./index.d.ts",
   "main": "../../bundles/common-http-testing.umd.js",
-  "module": "../../@angular/common/http/testing.es5.js",
-  "es2015": "../../@angular/common/http/testing.js"
+  "module": "../../esm5/http/testing/index.js",
+  "es2015": "../../esm15/http/testing/index.js"
 }
diff --git a/packages/common/http/testing/rollup.config.js b/packages/common/http/testing/rollup.config.js
index d18c37fbfd..8d97a52294 100644
--- a/packages/common/http/testing/rollup.config.js
+++ b/packages/common/http/testing/rollup.config.js
@@ -7,10 +7,12 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
   '@angular/platform-browser': 'ng.platformBrowser',
+  '@angular/common': 'ng.common',
   '@angular/common/http': 'ng.common.http',
   'rxjs/Observable': 'Rx',
   'rxjs/ReplaySubject': 'Rx',
@@ -18,12 +20,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../../../dist/packages-dist/common/@angular/common/http/testing.es5.js',
+  entry: '../../../../dist/packages-dist/common/esm5/http/testing/index.js',
   dest: '../../../../dist/packages-dist/common/bundles/common-http-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.common.http.testing',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/common/http/testing/tsconfig-build.json b/packages/common/http/testing/tsconfig-build.json
index 11b17cf46d..9aa3342c06 100644
--- a/packages/common/http/testing/tsconfig-build.json
+++ b/packages/common/http/testing/tsconfig-build.json
@@ -1,28 +1,22 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../../../dist/packages/common/http/testing",
+    "rootDir": "../../",
     "paths": {
       "@angular/core": ["../../../../dist/packages/core"],
       "@angular/common": ["../../../../dist/packages/common"],
       "@angular/common/http": ["../../../../dist/packages/common/http"],
       "@angular/platform-browser": ["../../../../dist/packages/platform-browser"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "skipLibCheck": true,
-    "lib": ["es2015", "dom"]
+    "outDir": "../../../../dist/packages/common"
   },
+
   "files": [
     "public_api.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/common/http/tsconfig-build.json b/packages/common/http/tsconfig-build.json
index 5f47d1b51b..0607fea461 100644
--- a/packages/common/http/tsconfig-build.json
+++ b/packages/common/http/tsconfig-build.json
@@ -1,26 +1,20 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../../dist/packages/common/http",
+    "rootDir": "../",
     "paths": {
       "@angular/common": ["../../../dist/packages/common"],
       "@angular/core": ["../../../dist/packages/core"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "skipLibCheck": true,
-    "lib": ["es2015", "dom"]
+    "outDir": "../../../dist/packages/common"
   },
+
   "files": [
     "public_api.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/common/package.json b/packages/common/package.json
index ff6811f9ab..8e2bc97cd4 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - commonly needed directives and services",
   "main": "./bundles/common.umd.js",
-  "module": "./@angular/common.es5.js",
-  "es2015": "./@angular/common.js",
-  "typings": "./common.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/common/public_api.ts b/packages/common/public_api.ts
index a55ca93ed3..7dfd92837b 100644
--- a/packages/common/public_api.ts
+++ b/packages/common/public_api.ts
@@ -9,7 +9,7 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the common package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/common';
 
diff --git a/packages/common/rollup.config.js b/packages/common/rollup.config.js
index 42a7893875..a2b3c47dc8 100644
--- a/packages/common/rollup.config.js
+++ b/packages/common/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -15,12 +16,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../dist/packages-dist/common/@angular/common.es5.js',
+  entry: '../../dist/packages-dist/common/esm5/index.js',
   dest: '../../dist/packages-dist/common/bundles/common.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.common',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/common/testing/index.ts b/packages/common/testing/index.ts
index 4e8c99c410..e727e2e8a7 100644
--- a/packages/common/testing/index.ts
+++ b/packages/common/testing/index.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the core/testing package.
- */
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-export * from './src/testing';
+export * from './public_api';
diff --git a/packages/common/testing/package.json b/packages/common/testing/package.json
index 89e706fd7b..977b45fa0d 100644
--- a/packages/common/testing/package.json
+++ b/packages/common/testing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/common/testing",
-  "typings": "../testing.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/common-testing.umd.js",
-  "module": "../@angular/common/testing.es5.js",
-  "es2015": "../@angular/common/testing.js"
+  "module": "../esm5/testing/index.js",
+  "es2015": "../esm15/testing/index.js"
 }
diff --git a/packages/common/testing/public_api.ts b/packages/common/testing/public_api.ts
new file mode 100644
index 0000000000..e95d9f8ef0
--- /dev/null
+++ b/packages/common/testing/public_api.ts
@@ -0,0 +1,16 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/testing';
+
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/common/testing/rollup.config.js b/packages/common/testing/rollup.config.js
index 117103dc4c..c6f4faa7a2 100644
--- a/packages/common/testing/rollup.config.js
+++ b/packages/common/testing/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -16,12 +17,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../../dist/packages-dist/common/@angular/common/testing.es5.js',
+  entry: '../../../dist/packages-dist/common/esm5/testing/index.js',
   dest: '../../../dist/packages-dist/common/bundles/common-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.common.testing',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/common/testing/tsconfig-build.json b/packages/common/testing/tsconfig-build.json
index 8866cb5ab0..bf9446dac1 100644
--- a/packages/common/testing/tsconfig-build.json
+++ b/packages/common/testing/tsconfig-build.json
@@ -1,17 +1,25 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
 
   "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "@angular/core": ["../../dist/packages/core"],
-      "@angular/common": ["../../dist/packages/common"]
-    }
+      "@angular/core": ["../../../dist/packages/core"],
+      "@angular/common": ["../../../dist/packages/common"]
+    },
+    "outDir": "../../../dist/packages/common"
   },
+
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
+
   "angularCompilerOptions": {
-    "strictMetadataEmit": true
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/common/testing"
   }
 }
diff --git a/packages/common/tsconfig-build.json b/packages/common/tsconfig-build.json
index 4060df709f..e36be180bf 100644
--- a/packages/common/tsconfig-build.json
+++ b/packages/common/tsconfig-build.json
@@ -1,41 +1,24 @@
 {
+  "extends": "../tsconfig-build.json",
+
+  "compilerOptions": {
+    "rootDir": ".",
+    "baseUrl": ".",
+    "paths": {
+      "@angular/core": ["../../dist/packages/core"]
+    },
+    "outDir": "../../dist/packages/common"
+  },
+
+  "files": [
+    "public_api.ts",
+    "../../node_modules/zone.js/dist/zone.js.d.ts"
+  ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
     "flatModuleOutFile": "index.js",
     "flatModuleId": "@angular/common"
-  },
-
-  "compilerOptions": {
-    "stripInternal": true,
-    "strictNullChecks": true,
-    "noImplicitAny": true,
-    "noFallthroughCasesInSwitch": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "target": "es2015",
-    "skipLibCheck": true,
-    "lib": [ "es2015", "dom" ],
-    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": [],
-
-    /**
-     * The rest of the file is configuration that's overridden by bazel.
-     * It can be removed after we fully migrate.
-     */
-    "baseUrl": ".",
-    "declaration": true,
-    "experimentalDecorators": true,
-    "outDir": "../../dist/packages/common",
-    "paths": {
-      "@angular/core": ["../../dist/packages/core"]
-    },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true
-  },
-  "files": [
-    "public_api.ts",
-    "../../node_modules/zone.js/dist/zone.js.d.ts"
-  ]
+  }
 }
diff --git a/packages/compiler-cli/package.json b/packages/compiler-cli/package.json
index ed05d98bfe..795c5ae7f9 100644
--- a/packages/compiler-cli/package.json
+++ b/packages/compiler-cli/package.json
@@ -12,7 +12,7 @@
     "@angular/tsc-wrapped": "5.0.0-beta.5",
     "reflect-metadata": "^0.1.2",
     "minimist": "^1.2.0",
-    "tsickle": "^0.23.4",
+    "tsickle": "^0.23.6",
     "chokidar": "^1.4.2"
   },
   "peerDependencies": {
diff --git a/packages/compiler-cli/tsconfig-build.json b/packages/compiler-cli/tsconfig-build.json
index f3dc44bcaf..d474f82d9f 100644
--- a/packages/compiler-cli/tsconfig-build.json
+++ b/packages/compiler-cli/tsconfig-build.json
@@ -1,29 +1,23 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
-    "baseUrl": ".",
-    "declaration": true,
-    "experimentalDecorators": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
     "module": "commonjs",
-    "outDir": "../../dist/packages/compiler-cli",
+    "stripInternal": false,
+    "target": "es5",
+    "baseUrl": ".",
+    "rootDir": ".",
     "paths": {
       "@angular/compiler": ["../../dist/packages/compiler"],
       "@angular/tsc-wrapped": ["../../dist/packages-dist/tsc-wrapped"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es5",
-    "lib": [
-      "es6",
-      "dom"
-    ],
-    "skipLibCheck": true
+    "outDir": "../../dist/packages/compiler-cli"
   },
+
   "exclude": [
     "integrationtest"
   ],
+
   "files": [
     "index.ts",
     "ngtools2.ts",
diff --git a/packages/compiler/index.ts b/packages/compiler/index.ts
index 03a69b6aa6..e727e2e8a7 100644
--- a/packages/compiler/index.ts
+++ b/packages/compiler/index.ts
@@ -6,11 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the compiler package.
- */
-export * from './src/compiler';
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-// This file only reexports content of the `src` folder. Keep it that way.
+export * from './public_api';
diff --git a/packages/compiler/package.json b/packages/compiler/package.json
index 5232563993..9706f4ab7c 100644
--- a/packages/compiler/package.json
+++ b/packages/compiler/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the compiler library",
   "main": "./bundles/compiler.umd.js",
-  "module": "./@angular/compiler.es5.js",
-  "es2015": "./@angular/compiler.js",
-  "typings": "./compiler.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/compiler/public_api.ts b/packages/compiler/public_api.ts
new file mode 100644
index 0000000000..13abd58d26
--- /dev/null
+++ b/packages/compiler/public_api.ts
@@ -0,0 +1,16 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/compiler';
+
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/compiler/rollup.config.js b/packages/compiler/rollup.config.js
index 4fe314ceab..828c3672d6 100644
--- a/packages/compiler/rollup.config.js
+++ b/packages/compiler/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -15,12 +16,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../dist/packages-dist/compiler/@angular/compiler.es5.js',
+  entry: '../../dist/packages-dist/compiler/esm5/index.js',
   dest: '../../dist/packages-dist/compiler/bundles/compiler.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.compiler',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/compiler/testing/index.ts b/packages/compiler/testing/index.ts
index ff6c4f031f..e727e2e8a7 100644
--- a/packages/compiler/testing/index.ts
+++ b/packages/compiler/testing/index.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the compiler/testing package.
- */
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-export * from './src/testing';
+export * from './public_api';
diff --git a/packages/compiler/testing/package.json b/packages/compiler/testing/package.json
index 92f1be200e..b00581c39e 100644
--- a/packages/compiler/testing/package.json
+++ b/packages/compiler/testing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/compiler/testing",
-  "typings": "../testing.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/compiler-testing.umd.js",
-  "module": "../@angular/compiler/testing.es5.js",
-  "es2015": "../@angular/compiler/testing.js"
+  "module": "../esm5/testing/index.js",
+  "es2015": "../esm15/testing/index.js"
 }
diff --git a/packages/compiler/testing/public_api.ts b/packages/compiler/testing/public_api.ts
new file mode 100644
index 0000000000..e95d9f8ef0
--- /dev/null
+++ b/packages/compiler/testing/public_api.ts
@@ -0,0 +1,16 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/testing';
+
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/compiler/testing/rollup.config.js b/packages/compiler/testing/rollup.config.js
index d2b3ec95b2..c01eb041df 100644
--- a/packages/compiler/testing/rollup.config.js
+++ b/packages/compiler/testing/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -17,12 +18,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../../dist/packages-dist/compiler/@angular/compiler/testing.es5.js',
+  entry: '../../../dist/packages-dist/compiler/esm5/testing/index.js',
   dest: '../../../dist/packages-dist/compiler/bundles/compiler-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.compiler.testing',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/compiler/testing/tsconfig-build.json b/packages/compiler/testing/tsconfig-build.json
index ed9fcb4da6..0b905f6998 100644
--- a/packages/compiler/testing/tsconfig-build.json
+++ b/packages/compiler/testing/tsconfig-build.json
@@ -1,15 +1,23 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
 
   "compilerOptions": {
-    // Test that we rely on decorator downleveling
-    "emitDecoratorMetadata": false,
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "@angular/compiler": ["../../dist/packages/compiler"]
-    }
+      "@angular/compiler": ["../../../dist/packages/compiler"]
+    },
+    "outDir": "../../../dist/packages/compiler"
   },
+
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
-  ]
+  ],
+
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/compiler/testing"
+  }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
index acababdeaf..846b2a892b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the core framework",
   "main": "./bundles/core.umd.js",
-  "module": "./@angular/core.es5.js",
-  "es2015": "./@angular/core.js",
-  "typings": "./core.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/core/public_api.ts b/packages/core/public_api.ts
index ede0762054..2a53f74cdf 100644
--- a/packages/core/public_api.ts
+++ b/packages/core/public_api.ts
@@ -9,7 +9,7 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the core package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/core';
 
diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js
index eac596d330..01068dd574 100644
--- a/packages/core/rollup.config.js
+++ b/packages/core/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   'rxjs/Observable': 'Rx',
@@ -18,12 +19,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../dist/packages-dist/core/@angular/core.es5.js',
+  entry: '../../dist/packages-dist/core/esm5/index.js',
   dest: '../../dist/packages-dist/core/bundles/core.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.core',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/core/testing/index.ts b/packages/core/testing/index.ts
index 4e8c99c410..e727e2e8a7 100644
--- a/packages/core/testing/index.ts
+++ b/packages/core/testing/index.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the core/testing package.
- */
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-export * from './src/testing';
+export * from './public_api';
diff --git a/packages/core/testing/package.json b/packages/core/testing/package.json
index 3976e420ee..2a51fb65a1 100644
--- a/packages/core/testing/package.json
+++ b/packages/core/testing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/core/testing",
-  "typings": "../testing.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/core-testing.umd.js",
-  "module": "../@angular/core/testing.es5.js",
-  "es2015": "../@angular/core/testing.js"
+  "module": "../esm5/testing/index.js",
+  "es2015": "../esm15/testing/index.js"
 }
diff --git a/packages/core/testing/public_api.ts b/packages/core/testing/public_api.ts
new file mode 100644
index 0000000000..e95d9f8ef0
--- /dev/null
+++ b/packages/core/testing/public_api.ts
@@ -0,0 +1,16 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/testing';
+
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/core/testing/rollup.config.js b/packages/core/testing/rollup.config.js
index 6785eadfe7..c3800a361c 100644
--- a/packages/core/testing/rollup.config.js
+++ b/packages/core/testing/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -15,12 +16,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../../dist/packages-dist/core/@angular/core/testing.es5.js',
+  entry: '../../../dist/packages-dist/core/esm5/testing/index.js',
   dest: '../../../dist/packages-dist/core/bundles/core-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.core.testing',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/core/testing/tsconfig-build.json b/packages/core/testing/tsconfig-build.json
index 09d4e20483..ac8527d4c1 100644
--- a/packages/core/testing/tsconfig-build.json
+++ b/packages/core/testing/tsconfig-build.json
@@ -1,17 +1,25 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "rxjs/*": ["../../node_modules/rxjs/*"],
-      "@angular/core": ["../../dist/packages/core"]
-    }
+      "rxjs/*": ["../../../node_modules/rxjs/*"],
+      "@angular/core": ["../../../dist/packages/core"]
+    },
+    "outDir": "../../../dist/packages/core"
   },
+
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts",
     "../../system.d.ts"
   ],
+
   "angularCompilerOptions": {
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/core/testing"
   }
 }
diff --git a/packages/core/tsconfig-build.json b/packages/core/tsconfig-build.json
index 4f1db3e1b0..6339f97757 100644
--- a/packages/core/tsconfig-build.json
+++ b/packages/core/tsconfig-build.json
@@ -1,40 +1,25 @@
 {
+  "extends": "../tsconfig-build.json",
+
+  "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": ".",
+    "paths": {
+      "rxjs/*": ["../../node_modules/rxjs/*"]
+    },
+    "outDir": "../../dist/packages/core"
+  },
+
+  "files": [
+    "public_api.ts",
+    "../../node_modules/zone.js/dist/zone.js.d.ts",
+    "../system.d.ts"
+  ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
     "flatModuleOutFile": "index.js",
     "flatModuleId": "@angular/core"
-  },
-
-  "compilerOptions": {
-    "declaration": true,
-    "stripInternal": true,
-    "strictNullChecks": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "target": "es2015",
-    "lib": ["es2015", "dom"],
-    "skipLibCheck": true,
-    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": [],
-
-    /**
-     * The rest of the file is configuration that's overridden by bazel.
-     * It can be removed after we fully migrate.
-     */
-    "baseUrl": ".",
-    "experimentalDecorators": true,
-    "outDir": "../../dist/packages/core",
-    "paths": {
-      "rxjs/*": ["../../node_modules/rxjs/*"]
-    },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true
-  },
-  "files": [
-    "public_api.ts",
-    "../../node_modules/zone.js/dist/zone.js.d.ts",
-    "../system.d.ts"
-  ]
-}
+  }
+}
\ No newline at end of file
diff --git a/packages/examples/tsconfig-build.json b/packages/examples/tsconfig-build.json
index 773c830149..9fb861daf5 100644
--- a/packages/examples/tsconfig-build.json
+++ b/packages/examples/tsconfig-build.json
@@ -1,27 +1,19 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
-    "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "emitDecoratorMetadata": true,
     "module": "commonjs",
-    "moduleResolution": "node",
-    "outDir": "../../dist/examples",
+    "emitDecoratorMetadata": true,
+    "baseUrl": ".",
+    "rootDir": ".",
     "paths": {
       "@angular/*": ["../../dist/packages-dist/*"],
       "rxjs/*": ["../../node_modules/rxjs/*"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es5",
-    "lib": ["es2015", "dom"],
-    "skipLibCheck": true,
+    "outDir": "../../dist/examples",
     "types": ["jasmine", "node", "angularjs", "systemjs"]
   },
+
   "include": [
     "./**/*.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts",
diff --git a/packages/forms/package.json b/packages/forms/package.json
index e5d3e6e2cd..658c18603a 100644
--- a/packages/forms/package.json
+++ b/packages/forms/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - directives and services for creating forms",
   "main": "./bundles/forms.umd.js",
-  "module": "./@angular/forms.es5.js",
-  "es2015": "./@angular/forms.js",
-  "typings": "./forms.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/forms/public_api.ts b/packages/forms/public_api.ts
index 31f3a88598..eb91a3bb4f 100644
--- a/packages/forms/public_api.ts
+++ b/packages/forms/public_api.ts
@@ -9,7 +9,7 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the forms package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/forms';
 
diff --git a/packages/forms/rollup.config.js b/packages/forms/rollup.config.js
index 48b9319dc3..9e5edec6dc 100644
--- a/packages/forms/rollup.config.js
+++ b/packages/forms/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -21,12 +22,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../dist/packages-dist/forms/@angular/forms.es5.js',
+  entry: '../../dist/packages-dist/forms/esm5/index.js',
   dest: '../../dist/packages-dist/forms/bundles/forms.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.forms',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/forms/tsconfig-build.json b/packages/forms/tsconfig-build.json
index 8cfa4196f1..2a8dfb69bc 100644
--- a/packages/forms/tsconfig-build.json
+++ b/packages/forms/tsconfig-build.json
@@ -1,13 +1,9 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/forms",
+    "rootDir": ".",
     "paths": {
       "@angular/core": ["../../dist/packages/core"],
       "@angular/core/testing": ["../../dist/packages/core/testing"],
@@ -17,19 +13,14 @@
       "@angular/compiler/testing": ["../../dist/packages/compiler/testing"],
       "@angular/platform-browser": ["../../dist/packages/platform-browser"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "skipLibCheck": true,
-    "lib": ["es2015", "dom"],
-    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": []
+    "outDir": "../../dist/packages/forms"
   },
+
   "files": [
     "public_api.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/http/package.json b/packages/http/package.json
index 364d449b56..0175f4f574 100644
--- a/packages/http/package.json
+++ b/packages/http/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the http service",
   "main": "./bundles/http.umd.js",
-  "module": "./@angular/http.es5.js",
-  "es2015": "./@angular/http.js",
-  "typings": "./http.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/http/public_api.ts b/packages/http/public_api.ts
index 80106781e7..778427176d 100644
--- a/packages/http/public_api.ts
+++ b/packages/http/public_api.ts
@@ -9,7 +9,7 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the http package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/index';
 
diff --git a/packages/http/rollup.config.js b/packages/http/rollup.config.js
index afca6868a8..8561d1dd70 100644
--- a/packages/http/rollup.config.js
+++ b/packages/http/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -17,12 +18,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../dist/packages-dist/http/@angular/http.es5.js',
+  entry: '../../dist/packages-dist/http/esm5/index.js',
   dest: '../../dist/packages-dist/http/bundles/http.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.http',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/http/testing/index.ts b/packages/http/testing/index.ts
index 5b24c5aa06..7d009e7f45 100644
--- a/packages/http/testing/index.ts
+++ b/packages/http/testing/index.ts
@@ -12,4 +12,4 @@
  * Entry point for all public APIs of the http/testing package.
  */
 
-export * from './src/testing';
+export * from './public_api';
diff --git a/packages/http/testing/package.json b/packages/http/testing/package.json
index 8f4badeb1f..e1f897ca63 100644
--- a/packages/http/testing/package.json
+++ b/packages/http/testing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/http/testing",
-  "typings": "../testing.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/http-testing.umd.js",
-  "module": "../@angular/http/testing.es5.js",
-  "es2015": "../@angular/http/testing.js"
+  "module": "../esm5/testing/index.js",
+  "es2015": "../esm15/testing/index.js"
 }
diff --git a/packages/http/testing/public_api.ts b/packages/http/testing/public_api.ts
index 886eaecbc9..fcc511dc6e 100644
--- a/packages/http/testing/public_api.ts
+++ b/packages/http/testing/public_api.ts
@@ -9,6 +9,6 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the http testing package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/testing';
diff --git a/packages/http/testing/rollup.config.js b/packages/http/testing/rollup.config.js
index c15281ccf4..2b6a7b9841 100644
--- a/packages/http/testing/rollup.config.js
+++ b/packages/http/testing/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -20,12 +21,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../../dist/packages-dist/http/@angular/http/testing.es5.js',
+  entry: '../../../dist/packages-dist/http/esm5/testing/index.js',
   dest: '../../../dist/packages-dist/http/bundles/http-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.http.testing',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/http/testing/tsconfig-build.json b/packages/http/testing/tsconfig-build.json
index 5b991faa2f..70d365a6f7 100644
--- a/packages/http/testing/tsconfig-build.json
+++ b/packages/http/testing/tsconfig-build.json
@@ -1,16 +1,21 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
-    "strictNullChecks": true,
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "@angular/core": ["../../dist/packages/core"],
-      "@angular/http": ["../../dist/packages/http"],
-      "rxjs/*": ["../../node_modules/rxjs/*"]
-    }
+      "@angular/core": ["../../../dist/packages/core"],
+      "@angular/http": ["../../../dist/packages/http"],
+      "rxjs/*": ["../../../node_modules/rxjs/*"]
+    },
+    "outDir": "../../../dist/packages/http"
   },
+
   "files": [
     "public_api.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/http/tsconfig-build.json b/packages/http/tsconfig-build.json
index 23862fa523..e0736b5699 100644
--- a/packages/http/tsconfig-build.json
+++ b/packages/http/tsconfig-build.json
@@ -1,29 +1,22 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "strictNullChecks": true,
-    "experimentalDecorators": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/http",
+    "rootDir": ".",
     "paths": {
       "@angular/core": ["../../dist/packages/core"],
       "@angular/common": ["../../dist/packages/common"],
       "@angular/platform-browser": ["../../dist/packages/platform-browser"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "skipLibCheck": true,
-    "lib": ["es2015", "dom"]
+    "outDir": "../../dist/packages/http"
   },
+
   "files": [
     "public_api.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/language-service/package.json b/packages/language-service/package.json
index 122710099f..55f269d611 100644
--- a/packages/language-service/package.json
+++ b/packages/language-service/package.json
@@ -3,8 +3,8 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - language services",
   "main": "./bundles/language-service.umd.js",
-  "module": "./@angular/language-service.es5.js",
-  "typings": "./language-service.d.ts",
+  "module": "./esm5/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "repository": {
diff --git a/packages/language-service/rollup.config.js b/packages/language-service/rollup.config.js
index d1596f30bd..99e03e3590 100644
--- a/packages/language-service/rollup.config.js
+++ b/packages/language-service/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import commonjs from 'rollup-plugin-commonjs';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 import * as path from 'path';
 
 var m = /^\@angular\/((\w|\-)+)(\/(\w|\d|\/|\-)+)?$/;
@@ -39,7 +40,8 @@ function resolve(id, from) {
     var esm_suffix = esm_suffixes[packageName] || '';
     var loc = locations[packageName] || location;
     var r = loc !== location && (loc + esm_suffix + packageName + (match[3] || '/index') + '.js') ||
-        loc + packageName + '/@angular/' + packageName + '.es5.js';
+        loc + packageName + '/esm5/' +
+            'index.js';
     // console.log('** ANGULAR MAPPED **: ', r);
     return r;
   }
@@ -69,7 +71,7 @@ module.exports = function(provided) {
 `;
 
 export default {
-  entry: '../../dist/packages-dist/language-service/@angular/language-service.es5.js',
+  entry: '../../dist/packages-dist/language-service/esm5/index.js',
   dest: '../../dist/packages-dist/language-service/bundles/language-service.umd.js',
   format: 'amd',
   moduleName: 'ng.language_service',
@@ -85,5 +87,5 @@ export default {
     'fs': 'fs',
   },
   banner: banner,
-  plugins: [{resolveId: resolve}, commonjs()]
+  plugins: [{resolveId: resolve}, commonjs(), sourcemaps()]
 }
diff --git a/packages/language-service/tsconfig-build.json b/packages/language-service/tsconfig-build.json
index ad419575ff..0dcf035db5 100644
--- a/packages/language-service/tsconfig-build.json
+++ b/packages/language-service/tsconfig-build.json
@@ -1,14 +1,10 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
-    "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
     "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/language-service",
+    "baseUrl": ".",
+    "rootDir": ".",
     "paths": {
       "@angular/core": ["../../dist/packages/core"],
       "@angular/animation": ["../../dist/packages/animation"],
@@ -24,13 +20,9 @@
       "@angular/tsc-wrapped": ["../../dist/packages-dist/tsc-wrapped"],
       "@angular/tsc-wrapped/*": ["../../dist/packages-dist/tsc-wrapped/*"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es5",
-    "skipLibCheck": true,
-    "lib": ["es2015", "dom"]
+    "outDir": "../../dist/packages/language-service"
   },
+
   "files": [
     "index.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts",
diff --git a/packages/platform-browser-dynamic/index.ts b/packages/platform-browser-dynamic/index.ts
index ced57d28bf..e727e2e8a7 100644
--- a/packages/platform-browser-dynamic/index.ts
+++ b/packages/platform-browser-dynamic/index.ts
@@ -6,11 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the platform-browser-dynamic package.
- */
-export * from './src/platform-browser-dynamic';
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-// This file only reexports content of the `src` folder. Keep it that way.
+export * from './public_api';
diff --git a/packages/platform-browser-dynamic/package.json b/packages/platform-browser-dynamic/package.json
index 24c145de80..03d36e73d1 100644
--- a/packages/platform-browser-dynamic/package.json
+++ b/packages/platform-browser-dynamic/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in a web browser with JIT compilation",
   "main": "./bundles/platform-browser-dynamic.umd.js",
-  "module": "./@angular/platform-browser-dynamic.es5.js",
-  "es2015": "./@angular/platform-browser-dynamic.js",
-  "typings": "./platform-browser-dynamic.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/platform-browser-dynamic/public_api.ts b/packages/platform-browser-dynamic/public_api.ts
new file mode 100644
index 0000000000..165e7a0630
--- /dev/null
+++ b/packages/platform-browser-dynamic/public_api.ts
@@ -0,0 +1,16 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/platform-browser-dynamic';
+
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/platform-browser-dynamic/rollup.config.js b/packages/platform-browser-dynamic/rollup.config.js
index cea47db5ac..bbc85c62c8 100644
--- a/packages/platform-browser-dynamic/rollup.config.js
+++ b/packages/platform-browser-dynamic/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -16,13 +17,12 @@ const globals = {
 };
 
 export default {
-  entry:
-      '../../dist/packages-dist/platform-browser-dynamic/@angular/platform-browser-dynamic.es5.js',
+  entry: '../../dist/packages-dist/platform-browser-dynamic/esm5/index.js',
   dest: '../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformBrowserDynamic',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/platform-browser-dynamic/testing/index.ts b/packages/platform-browser-dynamic/testing/index.ts
index 18bad2a742..e727e2e8a7 100644
--- a/packages/platform-browser-dynamic/testing/index.ts
+++ b/packages/platform-browser-dynamic/testing/index.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the platform-browser-dynamic/testing package.
- */
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-export * from './src/testing';
+export * from './public_api';
diff --git a/packages/platform-browser-dynamic/testing/package.json b/packages/platform-browser-dynamic/testing/package.json
index d8fad54613..20df30f566 100644
--- a/packages/platform-browser-dynamic/testing/package.json
+++ b/packages/platform-browser-dynamic/testing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/platform-browser-dynamic/testing",
-  "typings": "../testing.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/platform-browser-dynamic-testing.umd.js",
-  "module": "../@angular/platform-browser-dynamic/testing.es5.js",
-  "es2015": "../@angular/platform-browser-dynamic/testing.js"
+  "module": "../esm5/testing/index.js",
+  "es2015": "../esm15/testing/index.js"
 }
diff --git a/packages/platform-browser-dynamic/testing/public_api.ts b/packages/platform-browser-dynamic/testing/public_api.ts
new file mode 100644
index 0000000000..fcc511dc6e
--- /dev/null
+++ b/packages/platform-browser-dynamic/testing/public_api.ts
@@ -0,0 +1,14 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/testing';
diff --git a/packages/platform-browser-dynamic/testing/rollup.config.js b/packages/platform-browser-dynamic/testing/rollup.config.js
index 1b110a53e4..7eedcafb50 100644
--- a/packages/platform-browser-dynamic/testing/rollup.config.js
+++ b/packages/platform-browser-dynamic/testing/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -20,14 +21,13 @@ const globals = {
 };
 
 export default {
-  entry:
-      '../../../dist/packages-dist/platform-browser-dynamic/@angular/platform-browser-dynamic/testing.es5.js',
+  entry: '../../../dist/packages-dist/platform-browser-dynamic/esm5/testing/index.js',
   dest:
       '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformBrowserDynamic.testing',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/platform-browser-dynamic/testing/tsconfig-build.json b/packages/platform-browser-dynamic/testing/tsconfig-build.json
index ffadaa85d2..6b46a19514 100644
--- a/packages/platform-browser-dynamic/testing/tsconfig-build.json
+++ b/packages/platform-browser-dynamic/testing/tsconfig-build.json
@@ -1,21 +1,33 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "@angular/core": ["../../dist/packages/core"],
-      "@angular/core/testing": ["../../dist/packages/core/testing"],
-      "@angular/common": ["../../dist/packages/common"],
-      "@angular/common/testing": ["../../dist/packages/common/testing"],
-      "@angular/compiler": ["../../dist/packages/compiler"],
-      "@angular/compiler/testing": ["../../dist/packages/compiler/testing"],
-      "@angular/platform-browser": ["../../dist/packages/platform-browser"],
-      "@angular/platform-browser/testing": ["../../dist/packages/platform-browser/testing"],
-      "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"]
-    }
+      "@angular/core": ["../../../dist/packages/core"],
+      "@angular/core/testing": ["../../../dist/packages/core/testing"],
+      "@angular/common": ["../../../dist/packages/common"],
+      "@angular/common/testing": ["../../../dist/packages/common/testing"],
+      "@angular/compiler": ["../../../dist/packages/compiler"],
+      "@angular/compiler/testing": ["../../../dist/packages/compiler/testing"],
+      "@angular/platform-browser": ["../../../dist/packages/platform-browser"],
+      "@angular/platform-browser/testing": ["../../../dist/packages/platform-browser/testing"],
+      "@angular/platform-browser-dynamic": ["../../../dist/packages/platform-browser-dynamic"]
+    },
+    "outDir": "../../../dist/packages/platform-browser-dynamic"
   },
+
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/@types/jasmine/index.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
-  ]
+  ],
+
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/platform-browser-dymamic/testing"
+  }
 }
diff --git a/packages/platform-browser-dynamic/tsconfig-build.json b/packages/platform-browser-dynamic/tsconfig-build.json
index 6970ccf9a7..5b541d4b48 100644
--- a/packages/platform-browser-dynamic/tsconfig-build.json
+++ b/packages/platform-browser-dynamic/tsconfig-build.json
@@ -1,13 +1,9 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/platform-browser-dynamic",
+    "rootDir": ".",
     "paths": {
       "@angular/core": ["../../dist/packages/core"],
       "@angular/core/testing": ["../../dist/packages/core/testing"],
@@ -18,18 +14,19 @@
       "@angular/platform-browser": ["../../dist/packages/platform-browser"],
       "@angular/platform-browser/testing": ["../../dist/packages/platform-browser/testing"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "skipLibCheck": true,
-    "lib": ["es2015", "dom"],
-    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": []
+    "outDir": "../../dist/packages/platform-browser-dynamic"
   },
+
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../node_modules/@types/jasmine/index.d.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts"
-  ]
+  ],
+
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/platform-browser-dynamic"
+  }
 }
diff --git a/packages/platform-browser/animations/package.json b/packages/platform-browser/animations/package.json
index 726b5ff68c..372f01a5f2 100644
--- a/packages/platform-browser/animations/package.json
+++ b/packages/platform-browser/animations/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/platform-browser/animations",
-  "typings": "../animations.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/platform-browser-animations.umd.js",
-  "module": "../@angular/platform-browser/animations.es5.js",
-  "es2015": "../@angular/platform-browser/animations.js"
+  "module": "../esm5/animations/index.js",
+  "es2015": "../esm15/animations/index.js"
 }
diff --git a/packages/platform-browser/animations/public_api.ts b/packages/platform-browser/animations/public_api.ts
index 698d901fbd..3ebc27ff03 100644
--- a/packages/platform-browser/animations/public_api.ts
+++ b/packages/platform-browser/animations/public_api.ts
@@ -9,6 +9,6 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the animation package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/animations';
diff --git a/packages/platform-browser/animations/rollup.config.js b/packages/platform-browser/animations/rollup.config.js
index e96c5664e8..a69c54c32e 100644
--- a/packages/platform-browser/animations/rollup.config.js
+++ b/packages/platform-browser/animations/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -17,12 +18,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../../dist/packages-dist/platform-browser/@angular/platform-browser/animations.es5.js',
+  entry: '../../../dist/packages-dist/platform-browser/esm5/animations/index.js',
   dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-animations.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformBrowser.animations',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/platform-browser/animations/tsconfig-build.json b/packages/platform-browser/animations/tsconfig-build.json
index b73d97145d..f3971a9ded 100644
--- a/packages/platform-browser/animations/tsconfig-build.json
+++ b/packages/platform-browser/animations/tsconfig-build.json
@@ -1,21 +1,26 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
 
   "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "rxjs/*": ["../../node_modules/rxjs/*"],
-      "@angular/core": ["../../dist/packages/core"],
-      "@angular/core/testing": ["../../dist/packages/core/testing"],
-      "@angular/animations": ["../../dist/packages/animations"],
-      "@angular/animations/browser": ["../../dist/packages/animations/browser"],
-      "@angular/platform-browser": ["../../dist/packages/platform-browser"]
-    }
+      "rxjs/*": ["../../../node_modules/rxjs/*"],
+      "@angular/core": ["../../../dist/packages/core"],
+      "@angular/core/testing": ["../../../dist/packages/core/testing"],
+      "@angular/animations": ["../../../dist/packages/animations"],
+      "@angular/animations/browser": ["../../../dist/packages/animations/browser"],
+      "@angular/platform-browser": ["../../../dist/packages/platform-browser"]
+    },
+    "outDir": "../../../dist/packages/platform-browser"
   },
+
   "files": [
     "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts",
     "../../system.d.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/platform-browser/package.json b/packages/platform-browser/package.json
index 4a1aab4ddd..26a6194517 100644
--- a/packages/platform-browser/package.json
+++ b/packages/platform-browser/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in a web browser",
   "main": "./bundles/platform-browser.umd.js",
-  "module": "./@angular/platform-browser.es5.js",
-  "es2015": "./@angular/platform-browser.js",
-  "typings": "./platform-browser.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/platform-browser/public_api.ts b/packages/platform-browser/public_api.ts
index a83ba2315d..2bc44797c2 100644
--- a/packages/platform-browser/public_api.ts
+++ b/packages/platform-browser/public_api.ts
@@ -9,7 +9,7 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the platform-browser package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/platform-browser';
 // This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/platform-browser/rollup.config.js b/packages/platform-browser/rollup.config.js
index aaaed0d227..e02965dd66 100644
--- a/packages/platform-browser/rollup.config.js
+++ b/packages/platform-browser/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -14,12 +15,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../dist/packages-dist/platform-browser/@angular/platform-browser.es5.js',
+  entry: '../../dist/packages-dist/platform-browser/esm5/index.js',
   dest: '../../dist/packages-dist/platform-browser/bundles/platform-browser.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformBrowser',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/platform-browser/testing/index.ts b/packages/platform-browser/testing/index.ts
index 4e8c99c410..e727e2e8a7 100644
--- a/packages/platform-browser/testing/index.ts
+++ b/packages/platform-browser/testing/index.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the core/testing package.
- */
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-export * from './src/testing';
+export * from './public_api';
diff --git a/packages/platform-browser/testing/package.json b/packages/platform-browser/testing/package.json
index c88189beea..8ba0ddc383 100644
--- a/packages/platform-browser/testing/package.json
+++ b/packages/platform-browser/testing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/platform-browser/testing",
-  "typings": "../testing.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/platform-browser-testing.umd.js",
-  "module": "../@angular/platform-browser/testing.es5.js",
-  "es2015": "../@angular/platform-browser/testing.js"
+  "module": "../esm5/testing/index.js",
+  "es2015": "../esm15/testing/index.js"
 }
diff --git a/packages/platform-browser/testing/public_api.ts b/packages/platform-browser/testing/public_api.ts
new file mode 100644
index 0000000000..fcc511dc6e
--- /dev/null
+++ b/packages/platform-browser/testing/public_api.ts
@@ -0,0 +1,14 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/testing';
diff --git a/packages/platform-browser/testing/rollup.config.js b/packages/platform-browser/testing/rollup.config.js
index 57702e8039..6ac995d3f5 100644
--- a/packages/platform-browser/testing/rollup.config.js
+++ b/packages/platform-browser/testing/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -15,12 +16,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../../dist/packages-dist/platform-browser/@angular/platform-browser/testing.es5.js',
+  entry: '../../../dist/packages-dist/platform-browser/esm5/testing/index.js',
   dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformBrowser.testing',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/platform-browser/testing/tsconfig-build.json b/packages/platform-browser/testing/tsconfig-build.json
index 174c61c679..daf21048a5 100644
--- a/packages/platform-browser/testing/tsconfig-build.json
+++ b/packages/platform-browser/testing/tsconfig-build.json
@@ -1,21 +1,30 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "@angular/core": ["../../dist/packages/core"],
-      "@angular/core/testing": ["../../dist/packages/core/testing"],
-      "@angular/common": ["../../dist/packages/common"],
-      "@angular/common/testing": ["../../dist/packages/common/testing"],
-      "@angular/platform-browser": ["../../dist/packages/platform-browser"]
-    }
+      "@angular/core": ["../../../dist/packages/core"],
+      "@angular/core/testing": ["../../../dist/packages/core/testing"],
+      "@angular/common": ["../../../dist/packages/common"],
+      "@angular/common/testing": ["../../../dist/packages/common/testing"],
+      "@angular/platform-browser": ["../../../dist/packages/platform-browser"]
+    },
+    "outDir": "../../../dist/packages/platform-browser"
   },
+
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/@types/hammerjs/index.d.ts",
     "../../../node_modules/@types/jasmine/index.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
+
   "angularCompilerOptions": {
-    "strictMetadataEmit": true
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/platform-browser/testing"
   }
 }
diff --git a/packages/platform-browser/tsconfig-build.json b/packages/platform-browser/tsconfig-build.json
index 2cf1daac46..fa09e65722 100644
--- a/packages/platform-browser/tsconfig-build.json
+++ b/packages/platform-browser/tsconfig-build.json
@@ -1,32 +1,23 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/platform-browser",
+    "rootDir": ".",
     "paths": {
       "@angular/core": ["../../dist/packages/core"],
       "@angular/platform-browser/animations": ["../../dist/packages/platform-browser/animations"],
       "@angular/common": ["../../dist/packages/common"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "skipLibCheck": true,
-    "lib": ["es2015", "dom"],
-    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": []
+    "outDir": "../../dist/packages/platform-browser"
   },
+
   "files": [
     "public_api.ts",
     "../../node_modules/@types/hammerjs/index.d.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/platform-server/package.json b/packages/platform-server/package.json
index 1e188a7ed1..2899a0afc1 100644
--- a/packages/platform-server/package.json
+++ b/packages/platform-server/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in Node.js",
   "main": "./bundles/platform-server.umd.js",
-  "module": "./@angular/platform-server.es5.js",
-  "es2015": "./@angular/platform-server.js",
-  "typings": "./platform-server.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/packages/platform-server/public_api.ts b/packages/platform-server/public_api.ts
index 405b49a6b5..13238d82bd 100644
--- a/packages/platform-server/public_api.ts
+++ b/packages/platform-server/public_api.ts
@@ -9,7 +9,7 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the platform-server package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/platform-server';
 
diff --git a/packages/platform-server/rollup.config.js b/packages/platform-server/rollup.config.js
index 49f285ed2c..ba9447319c 100644
--- a/packages/platform-server/rollup.config.js
+++ b/packages/platform-server/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -21,12 +22,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../dist/packages-dist/platform-server/@angular/platform-server.es5.js',
+  entry: '../../dist/packages-dist/platform-server/esm5/index.js',
   dest: '../../dist/packages-dist/platform-server/bundles/platform-server.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformServer',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/platform-server/testing/index.ts b/packages/platform-server/testing/index.ts
index dcd35409c3..e727e2e8a7 100644
--- a/packages/platform-server/testing/index.ts
+++ b/packages/platform-server/testing/index.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the platform-server/testing package.
- */
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-export * from './src/testing';
+export * from './public_api';
diff --git a/packages/platform-server/testing/package.json b/packages/platform-server/testing/package.json
index ee64997919..845de15bc2 100644
--- a/packages/platform-server/testing/package.json
+++ b/packages/platform-server/testing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/platform-server/testing",
-  "typings": "../testing.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/platform-server-testing.umd.js",
-  "module": "../@angular/platform-server/testing.es5.js",
-  "es2015": "../@angular/platform-server/testing.js"
+  "module": "../esm5/testing/index.js",
+  "es2015": "../esm15/testing/index.js"
 }
diff --git a/packages/platform-server/testing/public_api.ts b/packages/platform-server/testing/public_api.ts
new file mode 100644
index 0000000000..e95d9f8ef0
--- /dev/null
+++ b/packages/platform-server/testing/public_api.ts
@@ -0,0 +1,16 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/testing';
+
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/platform-server/testing/rollup.config.js b/packages/platform-server/testing/rollup.config.js
index 2e2287ce7c..a0db9f952f 100644
--- a/packages/platform-server/testing/rollup.config.js
+++ b/packages/platform-server/testing/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -19,12 +20,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../../dist/packages-dist/platform-server/@angular/platform-server/testing.es5.js',
+  entry: '../../../dist/packages-dist/platform-server/esm5/testing/index.js',
   dest: '../../../dist/packages-dist/platform-server/bundles/platform-server-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformServer.testing',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/platform-server/testing/tsconfig-build.json b/packages/platform-server/testing/tsconfig-build.json
index f31b22e9ef..d644b0eea4 100644
--- a/packages/platform-server/testing/tsconfig-build.json
+++ b/packages/platform-server/testing/tsconfig-build.json
@@ -1,29 +1,38 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "@angular/animations/browser": ["../../dist/packages/animations/browser"],
-      "@angular/core": ["../../dist/packages/core"],
-      "@angular/core/testing": ["../../dist/packages/core/testing"],
-      "@angular/common": ["../../dist/packages/common"],
-      "@angular/common/testing": ["../../dist/packages/common/testing"],
-      "@angular/compiler": ["../../dist/packages/compiler"],
-      "@angular/compiler/testing": ["../../dist/packages/compiler/testing"],
-      "@angular/platform-browser": ["../../dist/packages/platform-browser"],
-      "@angular/platform-browser/animations": ["../../dist/packages/platform-browser/animations"],
-      "@angular/platform-browser/testing": ["../../dist/packages/platform-browser/testing"],
-      "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"],
-      "@angular/platform-browser-dynamic/testing": ["../../dist/packages/platform-browser-dynamic/testing"],
-      "@angular/platform-server": ["../../dist/packages/platform-server"]
-    }
+      "@angular/animations/browser": ["../../../dist/packages/animations/browser"],
+      "@angular/core": ["../../../dist/packages/core"],
+      "@angular/core/testing": ["../../../dist/packages/core/testing"],
+      "@angular/common": ["../../../dist/packages/common"],
+      "@angular/common/testing": ["../../../dist/packages/common/testing"],
+      "@angular/compiler": ["../../../dist/packages/compiler"],
+      "@angular/compiler/testing": ["../../../dist/packages/compiler/testing"],
+      "@angular/platform-browser": ["../../../dist/packages/platform-browser"],
+      "@angular/platform-browser/animations": ["../../../dist/packages/platform-browser/animations"],
+      "@angular/platform-browser/testing": ["../../../dist/packages/platform-browser/testing"],
+      "@angular/platform-browser-dynamic": ["../../../dist/packages/platform-browser-dynamic"],
+      "@angular/platform-browser-dynamic/testing": ["../../../dist/packages/platform-browser-dynamic/testing"],
+      "@angular/platform-server": ["../../../dist/packages/platform-server"]
+    },
+    "outDir": "../../../dist/packages/platform-server"
   },
+
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/@types/jasmine/index.d.ts",
     "../../../node_modules/@types/node/index.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
+
   "angularCompilerOptions": {
-    "strictMetadataEmit": true
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/platform-server/testing"
   }
 }
diff --git a/packages/platform-server/tsconfig-build.json b/packages/platform-server/tsconfig-build.json
index 8269781de7..4580c4df35 100644
--- a/packages/platform-server/tsconfig-build.json
+++ b/packages/platform-server/tsconfig-build.json
@@ -1,13 +1,9 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/platform-server",
+    "rootDir": ".",
     "paths": {
       "@angular/animations/browser": ["../../dist/packages/animations/browser"],
       "@angular/core": ["../../dist/packages/core"],
@@ -19,20 +15,15 @@
       "@angular/platform-browser/animations": ["../../dist/packages/platform-browser/animations"],
       "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "skipLibCheck": true,
-    "lib": ["es2015", "dom"],
-    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": []
+    "outDir": "../../dist/packages/platform-server"
   },
+
   "files": [
     "public_api.ts",
     "../../node_modules/@types/node/index.d.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/platform-webworker-dynamic/index.ts b/packages/platform-webworker-dynamic/index.ts
index d470e489e3..e727e2e8a7 100644
--- a/packages/platform-webworker-dynamic/index.ts
+++ b/packages/platform-webworker-dynamic/index.ts
@@ -6,11 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the platform-browser-dynamic package.
- */
-export * from './src/platform-webworker-dynamic';
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-// This file only reexports content of the `src` folder. Keep it that way.
+export * from './public_api';
diff --git a/packages/platform-webworker-dynamic/package.json b/packages/platform-webworker-dynamic/package.json
index e9c0194969..668b56cb30 100644
--- a/packages/platform-webworker-dynamic/package.json
+++ b/packages/platform-webworker-dynamic/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in a web browser with web workers",
   "main": "./bundles/platform-webworker-dynamic.umd.js",
-  "module": "./@angular/platform-webworker-dynamic.es5.js",
-  "es2015": "./@angular/platform-webworker-dynamic.js",
-  "typings": "./platform-webworker-dynamic.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/platform-webworker-dynamic/public_api.ts b/packages/platform-webworker-dynamic/public_api.ts
new file mode 100644
index 0000000000..cf23ca699e
--- /dev/null
+++ b/packages/platform-webworker-dynamic/public_api.ts
@@ -0,0 +1,15 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/platform-webworker-dynamic';
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/platform-webworker-dynamic/rollup.config.js b/packages/platform-webworker-dynamic/rollup.config.js
index f2859feeb2..791c743f8b 100644
--- a/packages/platform-webworker-dynamic/rollup.config.js
+++ b/packages/platform-webworker-dynamic/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -18,14 +19,13 @@ const globals = {
 };
 
 export default {
-  entry:
-      '../../dist/packages-dist/platform-webworker-dynamic/@angular/platform-webworker-dynamic.es5.js',
+  entry: '../../dist/packages-dist/platform-webworker-dynamic/esm5/index.js',
   dest:
       '../../dist/packages-dist/platform-webworker-dynamic/bundles/platform-webworker-dynamic.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformWebworkerDynamic',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/platform-webworker-dynamic/tsconfig-build.json b/packages/platform-webworker-dynamic/tsconfig-build.json
index 590ef2b0d7..8e4b0f37b6 100644
--- a/packages/platform-webworker-dynamic/tsconfig-build.json
+++ b/packages/platform-webworker-dynamic/tsconfig-build.json
@@ -1,13 +1,9 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/platform-webworker-dynamic",
+    "rootDir": ".",
     "paths": {
       "@angular/core": ["../../dist/packages/core"],
       "@angular/common": ["../../dist/packages/common"],
@@ -16,17 +12,18 @@
       "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"],
       "@angular/platform-webworker": ["../../dist/packages/platform-webworker"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "skipLibCheck": true,
-    "lib": ["es2015", "dom"],
-    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": []
+    "outDir": "../../dist/packages/platform-webworker-dynamic"
   },
+
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts"
-  ]
+  ],
+
+  "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/platform-webworker-dynamic"
+  }
 }
diff --git a/packages/platform-webworker/package.json b/packages/platform-webworker/package.json
index afdff73142..4efb426d10 100644
--- a/packages/platform-webworker/package.json
+++ b/packages/platform-webworker/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in a web browser with web workers",
   "main": "./bundles/platform-webworker.umd.js",
-  "module": "./@angular/platform-webworker.es5.js",
-  "es2015": "./@angular/platform-webworker.js",
-  "typings": "./platform-webworker.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/platform-webworker/public_api.ts b/packages/platform-webworker/public_api.ts
index 2ab5a8a8fc..f9db0bde68 100644
--- a/packages/platform-webworker/public_api.ts
+++ b/packages/platform-webworker/public_api.ts
@@ -9,7 +9,7 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the platform-browser package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/platform-webworker';
 // This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/platform-webworker/rollup.config.js b/packages/platform-webworker/rollup.config.js
index 997068acae..458dbc3844 100644
--- a/packages/platform-webworker/rollup.config.js
+++ b/packages/platform-webworker/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -17,12 +18,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../dist/packages-dist/platform-webworker/@angular/platform-webworker.es5.js',
+  entry: '../../dist/packages-dist/platform-webworker/esm5/index.js',
   dest: '../../dist/packages-dist/platform-webworker/bundles/platform-webworker.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.platformWebworker',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/platform-webworker/tsconfig-build.json b/packages/platform-webworker/tsconfig-build.json
index 93b01d11ce..07d0bee6f3 100644
--- a/packages/platform-webworker/tsconfig-build.json
+++ b/packages/platform-webworker/tsconfig-build.json
@@ -1,31 +1,22 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/platform-webworker",
+    "rootDir": ".",
     "paths": {
       "@angular/core": ["../../dist/packages/core"],
       "@angular/common": ["../../dist/packages/common"],
       "@angular/platform-browser": ["../../dist/packages/platform-browser"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "skipLibCheck": true,
-    "lib": ["es2015", "dom"],
-    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": []
+    "outDir": "../../dist/packages/platform-webworker"
   },
+
   "files": [
     "public_api.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/rollup.config.js b/packages/rollup.config.js
new file mode 100644
index 0000000000..9b5a41c52b
--- /dev/null
+++ b/packages/rollup.config.js
@@ -0,0 +1,11 @@
+/**
+ * @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
+ */
+
+import sourcemaps from 'rollup-plugin-sourcemaps';
+
+export default {plugins: [sourcemaps()]};
diff --git a/packages/router/package.json b/packages/router/package.json
index e8fa5bfeae..248697d3d3 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the routing library",
   "main": "./bundles/router.umd.js",
-  "module": "./@angular/router.es5.js",
-  "es2015": "./@angular/router.js",
-  "typings": "./router.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "keywords": [
     "angular",
     "router"
diff --git a/packages/router/public_api.ts b/packages/router/public_api.ts
index ca4239ecf2..778427176d 100644
--- a/packages/router/public_api.ts
+++ b/packages/router/public_api.ts
@@ -9,7 +9,7 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the router package.
+ * Entry point for all public APIs of this package.
  */
 export * from './src/index';
 
diff --git a/packages/router/rollup.config.js b/packages/router/rollup.config.js
index f020839ecc..1289487f08 100644
--- a/packages/router/rollup.config.js
+++ b/packages/router/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -39,12 +40,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../dist/packages-dist/router/@angular/router.es5.js',
+  entry: '../../dist/packages-dist/router/esm5/index.js',
   dest: '../../dist/packages-dist/router/bundles/router.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.router',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/router/testing/index.ts b/packages/router/testing/index.ts
index 31e1e65bf1..e727e2e8a7 100644
--- a/packages/router/testing/index.ts
+++ b/packages/router/testing/index.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the router/testing package.
- */
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-export * from './src/testing';
+export * from './public_api';
diff --git a/packages/router/testing/package.json b/packages/router/testing/package.json
index e34ffa7c15..c9b461a5dd 100644
--- a/packages/router/testing/package.json
+++ b/packages/router/testing/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/router/testing",
-  "typings": "../testing.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/router-testing.umd.js",
-  "module": "../@angular/router/testing.es5.js",
-  "es2015": "../@angular/router/testing.js"
+  "module": "../esm5/testing/index.js",
+  "es2015": "../esm15/testing/index.js"
 }
diff --git a/packages/router/testing/public_api.ts b/packages/router/testing/public_api.ts
new file mode 100644
index 0000000000..e95d9f8ef0
--- /dev/null
+++ b/packages/router/testing/public_api.ts
@@ -0,0 +1,16 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/testing';
+
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/router/testing/rollup.config.js b/packages/router/testing/rollup.config.js
index 37123bf13c..53962e114f 100644
--- a/packages/router/testing/rollup.config.js
+++ b/packages/router/testing/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -17,12 +18,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../../dist/packages-dist/router/@angular/router/testing.es5.js',
+  entry: '../../../dist/packages-dist/router/esm5/testing/index.js',
   dest: '../../../dist/packages-dist/router/bundles/router-testing.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.router.testing',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/router/testing/tsconfig-build.json b/packages/router/testing/tsconfig-build.json
index 075945d344..c34bed8f75 100644
--- a/packages/router/testing/tsconfig-build.json
+++ b/packages/router/testing/tsconfig-build.json
@@ -1,18 +1,27 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "@angular/core": ["../../dist/packages/core"],
-      "@angular/common": ["../../dist/packages/common"],
-      "@angular/common/testing": ["../../dist/packages/common/testing"],
-      "@angular/platform-browser": ["../../dist/packages/platform-browser"],
-      "@angular/router": ["../../dist/packages/router"]
-    }
+      "@angular/core": ["../../../dist/packages/core"],
+      "@angular/common": ["../../../dist/packages/common"],
+      "@angular/common/testing": ["../../../dist/packages/common/testing"],
+      "@angular/platform-browser": ["../../../dist/packages/platform-browser"],
+      "@angular/router": ["../../../dist/packages/router"]
+    },
+    "outDir": "../../../dist/packages/router"
   },
+
   "files": [
-    "index.ts"
+    "public_api.ts"
   ],
+
   "angularCompilerOptions": {
-    "strictMetadataEmit": true
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/router/testing"
   }
 }
diff --git a/packages/router/tsconfig-build.json b/packages/router/tsconfig-build.json
index 5cca1d6c13..42c94892ba 100644
--- a/packages/router/tsconfig-build.json
+++ b/packages/router/tsconfig-build.json
@@ -1,32 +1,22 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
+    "rootDir": ".",
     "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "noEmitOnError": false,
-    "noImplicitAny": true,
-    "noImplicitReturns": true,
-    "strictNullChecks": true,
-    "outDir": "../../dist/packages/router",
     "paths": {
       "@angular/core": ["../../dist/packages/core"],
       "@angular/common": ["../../dist/packages/common"],
       "@angular/platform-browser": ["../../dist/packages/platform-browser"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "lib": ["es2015", "dom"],
-    "target": "es2015",
-    "skipLibCheck": true
+    "outDir": "../../dist/packages/router"
   },
+
   "files": [
     "public_api.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/packages/router/upgrade/index.ts b/packages/router/upgrade/index.ts
index 2ac1fa27c4..e727e2e8a7 100644
--- a/packages/router/upgrade/index.ts
+++ b/packages/router/upgrade/index.ts
@@ -6,10 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the router/upgrade package.
- */
+// This file is not used to build this module. It is only used during editing
+// by the TypeScript language service and during build for verification. `ngc`
+// replaces this file with production index.ts when it rewrites private symbol
+// names.
 
-export * from './src/upgrade';
+export * from './public_api';
diff --git a/packages/router/upgrade/package.json b/packages/router/upgrade/package.json
index 16fe0819aa..053c8a8d24 100644
--- a/packages/router/upgrade/package.json
+++ b/packages/router/upgrade/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/router/upgrade",
-  "typings": "../upgrade.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/router-upgrade.umd.js",
-  "module": "../@angular/router/upgrade.es5.js",
-  "es2015": "../@angular/router/upgrade.js"
+  "module": "../esm5/upgrade/index.js",
+  "es2015": "../esm15/upgrade/index.js"
 }
diff --git a/packages/router/upgrade/public_api.ts b/packages/router/upgrade/public_api.ts
new file mode 100644
index 0000000000..3cdf8ae42f
--- /dev/null
+++ b/packages/router/upgrade/public_api.ts
@@ -0,0 +1,16 @@
+/**
+ * @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
+ */
+
+/**
+ * @module
+ * @description
+ * Entry point for all public APIs of this package.
+ */
+export * from './src/upgrade';
+
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/packages/router/upgrade/rollup.config.js b/packages/router/upgrade/rollup.config.js
index 565e9cadde..dcd7452dda 100644
--- a/packages/router/upgrade/rollup.config.js
+++ b/packages/router/upgrade/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -16,12 +17,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../../dist/packages-dist/router/@angular/router/upgrade.es5.js',
+  entry: '../../../dist/packages-dist/router/esm5/upgrade/index.js',
   dest: '../../../dist/packages-dist/router/bundles/router-upgrade.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.router.upgrade',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/router/upgrade/tsconfig-build.json b/packages/router/upgrade/tsconfig-build.json
index 120c343b10..97b228bbea 100644
--- a/packages/router/upgrade/tsconfig-build.json
+++ b/packages/router/upgrade/tsconfig-build.json
@@ -1,17 +1,25 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
   "compilerOptions": {
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "@angular/core": ["../../dist/packages/core"],
-      "@angular/platform-browser": ["../../dist/packages/platform-browser"],
-      "@angular/router": ["../../dist/packages/router"],
-      "@angular/upgrade/static": ["../../dist/packages/upgrade/static"]
-    }
+      "@angular/core": ["../../../dist/packages/core"],
+      "@angular/platform-browser": ["../../../dist/packages/platform-browser"],
+      "@angular/router": ["../../../dist/packages/router"],
+      "@angular/upgrade/static": ["../../../dist/packages/upgrade/static"]
+    },
+    "outDir": "../../../dist/packages/router"
   },
+
   "files": [
-    "index.ts"
+    "public_api.ts"
   ],
+
   "angularCompilerOptions": {
-    "strictMetadataEmit": true
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "index.js",
+    "flatModuleId": "@angular/router/upgrade"
   }
 }
diff --git a/packages/tsc-wrapped/package.json b/packages/tsc-wrapped/package.json
index 7000d99cd4..8da541829c 100644
--- a/packages/tsc-wrapped/package.json
+++ b/packages/tsc-wrapped/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "repository": {"type":"git","url":"https://github.com/angular/angular.git"},
   "dependencies": {
-    "tsickle": "^0.21.0"
+    "tsickle": "^0.23.5"
   },
   "peerDependencies": {
     "typescript": "^2.1.5"
diff --git a/packages/tsc-wrapped/src/main.ts b/packages/tsc-wrapped/src/main.ts
index d2882da481..9c208860b3 100644
--- a/packages/tsc-wrapped/src/main.ts
+++ b/packages/tsc-wrapped/src/main.ts
@@ -111,7 +111,7 @@ export function main(
     }
 
     const tsickleCompilerHostOptions:
-        tsickle.Options = {googmodule: false, untyped: true, convertIndexImportShorthand: true};
+        tsickle.Options = {googmodule: false, untyped: true, convertIndexImportShorthand: false};
 
     const tsickleHost: tsickle.TsickleHost = {
       shouldSkipTsickleProcessing: (fileName) => /\.d\.ts$/.test(fileName),
diff --git a/packages/tsc-wrapped/test/main_spec.ts b/packages/tsc-wrapped/test/main_spec.ts
index 8cfa7c2ab3..204651f7fc 100644
--- a/packages/tsc-wrapped/test/main_spec.ts
+++ b/packages/tsc-wrapped/test/main_spec.ts
@@ -75,7 +75,7 @@ describe('tsc-wrapped', () => {
           // No helpers since decorators were lowered
           expect(out).not.toContain('__decorate');
           // Expand `export *` and fix index import
-          expect(out).toContain(`export { A, B } from './dep/index'`);
+          expect(out).toContain(`export { A, B } from './dep'`);
           // Annotated for Closure compiler
           expect(out).toContain('* @param {?} x');
           // Comments should stay multi-line
@@ -112,7 +112,7 @@ describe('tsc-wrapped', () => {
         .then(() => {
           const out = readOut('js');
           // Expand `export *` and fix index import
-          expect(out).toContain(`export { A, B } from './dep/index'`);
+          expect(out).toContain(`export { A, B } from './dep'`);
           // Annotated for Closure compiler
           expect(out).toContain('* @param {?} x');
           done();
@@ -387,13 +387,13 @@ describe('tsc-wrapped', () => {
     main(basePath, {basePath})
         .then(() => {
           const fileOutput = readOut('js');
-          expect(fileOutput).toContain(`export { A, B } from './dep/index'`);
+          expect(fileOutput).toContain(`export { A, B } from './dep'`);
           done();
         })
         .catch(e => done.fail(e));
   });
 
-  it('should expand shorthand imports for ES5 CommonJS modules', (done) => {
+  it('should not expand shorthand imports for ES5 CommonJS modules', (done) => {
     write('tsconfig.json', `{
       "compilerOptions": {
         "experimentalDecorators": true,
@@ -413,7 +413,7 @@ describe('tsc-wrapped', () => {
     main(basePath, {basePath})
         .then(() => {
           const fileOutput = readOut('js');
-          expect(fileOutput).toContain(`var index_1 = require("./dep/index");`);
+          expect(fileOutput).toContain(`var dep_1 = require("./dep");`);
           done();
         })
         .catch(e => done.fail(e));
diff --git a/packages/tsconfig-build.json b/packages/tsconfig-build.json
new file mode 100644
index 0000000000..edd797f5d0
--- /dev/null
+++ b/packages/tsconfig-build.json
@@ -0,0 +1,24 @@
+/**
+ * Root tsconfig file for use building all Angular packages. Note there is no rootDir
+ * and therefore any tsconfig in the package directory will need to define its own
+ * rootDir.
+ */
+{
+  "compilerOptions": {
+    "declaration": true,
+    "stripInternal": true,
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "noFallthroughCasesInSwitch": true,
+    "moduleResolution": "node",
+    "module": "es2015",
+    "target": "es2015",
+    "lib": ["es2015", "dom"],
+    "skipLibCheck": true,
+    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
+    "types": [],
+    "experimentalDecorators": true,
+    "sourceMap": true,
+    "inlineSources": true
+  }
+}
diff --git a/packages/upgrade/package.json b/packages/upgrade/package.json
index 25a6c63499..0a2cc3105f 100644
--- a/packages/upgrade/package.json
+++ b/packages/upgrade/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the library for easing update from v1 to v2",
   "main": "./bundles/upgrade.umd.js",
-  "module": "./@angular/upgrade.es5.js",
-  "es2015": "./@angular/upgrade.js",
-  "typings": "./upgrade.d.ts",
+  "module": "./esm5/index.js",
+  "es2015": "./esm15/index.js",
+  "typings": "./index.d.ts",
   "author": "angular",
   "license": "MIT",
   "dependencies": {
diff --git a/packages/upgrade/public_api.ts b/packages/upgrade/public_api.ts
index 67db97dff7..0d6125fe1d 100644
--- a/packages/upgrade/public_api.ts
+++ b/packages/upgrade/public_api.ts
@@ -9,7 +9,7 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the upgrade/dynamic package, allowing
+ * Entry point for all public APIs of this package. allowing
  * Angular 1 and Angular 2+ to run side by side in the same application.
  */
 export {VERSION} from './src/common/version';
diff --git a/packages/upgrade/rollup.config.js b/packages/upgrade/rollup.config.js
index 9c4d5773b9..461b43d6e8 100644
--- a/packages/upgrade/rollup.config.js
+++ b/packages/upgrade/rollup.config.js
@@ -7,6 +7,7 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core',
@@ -22,12 +23,12 @@ const globals = {
 };
 
 export default {
-  entry: '../../dist/packages-dist/upgrade/@angular/upgrade.es5.js',
+  entry: '../../dist/packages-dist/upgrade/esm5/index.js',
   dest: '../../dist/packages-dist/upgrade/bundles/upgrade.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.upgrade',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/upgrade/static/package.json b/packages/upgrade/static/package.json
index bb511938fc..d5f0a87022 100644
--- a/packages/upgrade/static/package.json
+++ b/packages/upgrade/static/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@angular/upgrade/static",
-  "typings": "../static.d.ts",
+  "typings": "./index.d.ts",
   "main": "../bundles/upgrade-static.umd.js",
-  "module": "../@angular/upgrade/static.es5.js",
-  "es2015": "../@angular/upgrade/static.js"
+  "module": "../esm5/static/index.js",
+  "es2015": "../esm15/static/index.js"
 }
diff --git a/packages/upgrade/static/public_api.ts b/packages/upgrade/static/public_api.ts
index b8057bb535..536890d321 100644
--- a/packages/upgrade/static/public_api.ts
+++ b/packages/upgrade/static/public_api.ts
@@ -9,7 +9,7 @@
 /**
  * @module
  * @description
- * Entry point for all public APIs of the upgrade/static package, allowing
+ * Entry point for all public APIs of this package. allowing
  * Angular 1 and Angular 2+ to run side by side in the same application.
  */
 export {getAngularLib, setAngularLib} from './src/common/angular1';
diff --git a/packages/upgrade/static/rollup.config.js b/packages/upgrade/static/rollup.config.js
index 9ac5551d39..bb1a1a8aeb 100644
--- a/packages/upgrade/static/rollup.config.js
+++ b/packages/upgrade/static/rollup.config.js
@@ -7,18 +7,19 @@
  */
 
 import resolve from 'rollup-plugin-node-resolve';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 const globals = {
   '@angular/core': 'ng.core'
 };
 
 export default {
-  entry: '../../../dist/packages-dist/upgrade/@angular/upgrade/static.es5.js',
+  entry: '../../../dist/packages-dist/upgrade/esm5/static/index.js',
   dest: '../../../dist/packages-dist/upgrade/bundles/upgrade-static.umd.js',
   format: 'umd',
   exports: 'named',
   moduleName: 'ng.upgrade.static',
-  plugins: [resolve()],
+  plugins: [resolve(), sourcemaps()],
   external: Object.keys(globals),
   globals: globals
 };
diff --git a/packages/upgrade/static/tsconfig-build.json b/packages/upgrade/static/tsconfig-build.json
index 114f01499c..b940afeb64 100644
--- a/packages/upgrade/static/tsconfig-build.json
+++ b/packages/upgrade/static/tsconfig-build.json
@@ -1,18 +1,23 @@
 {
-  "extends": "../tsconfig-build",
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
-    "target": "es5",
+    "baseUrl": ".",
+    "rootDir": "../",
     "paths": {
-      "@angular/core": ["../../dist/packages/core"],
-      "@angular/common": ["../../dist/packages/common"],
-      "@angular/platform-browser": ["../../dist/packages/platform-browser"],
-      "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"]
-    }
+      "@angular/core": ["../../../dist/packages/core"],
+      "@angular/common": ["../../../dist/packages/common"],
+      "@angular/platform-browser": ["../../../dist/packages/platform-browser"],
+      "@angular/platform-browser-dynamic": ["../../../dist/packages/platform-browser-dynamic"]
+    },
+    "outDir": "../../../dist/packages/upgrade"
   },
+
   "files": [
     "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
+
   "angularCompilerOptions": {
     "flatModuleOutFile": "index.js",
     "flatModuleId": "@angular/upgrade/static"
diff --git a/packages/upgrade/tsconfig-build.json b/packages/upgrade/tsconfig-build.json
index a2a64dd6c7..016f264747 100644
--- a/packages/upgrade/tsconfig-build.json
+++ b/packages/upgrade/tsconfig-build.json
@@ -1,13 +1,9 @@
 {
+  "extends": "../tsconfig-build.json",
+
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../dist/packages/upgrade",
+    "rootDir": ".",
     "paths": {
       "@angular/core": ["../../dist/packages/core"],
       "@angular/common": ["../../dist/packages/common"],
@@ -15,19 +11,14 @@
       "@angular/platform-browser": ["../../dist/packages/platform-browser"],
       "@angular/platform-browser-dynamic": ["../../dist/packages/platform-browser-dynamic"]
     },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "skipLibCheck": true,
-    "lib": [ "es2015", "dom" ],
-    // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-    "types": []
+    "outDir": "../../dist/packages/upgrade"
   },
+
   "files": [
     "public_api.ts",
     "../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
+
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
diff --git a/scripts/build/map_sources.js b/scripts/build/map_sources.js
deleted file mode 100644
index 993c414754..0000000000
--- a/scripts/build/map_sources.js
+++ /dev/null
@@ -1,13 +0,0 @@
-
-var path = require('path');
-var sorcery = require('sorcery');
-var yargs = require('yargs');
-
-var argv = require('yargs')
-  .alias('f', 'file')
-  .argv;
-
-
-sorcery.load(argv.file).then(function(chain) {
-  chain.write();
-});
diff --git a/scripts/ci/env.sh b/scripts/ci/env.sh
index 528f263c54..5a40060b66 100755
--- a/scripts/ci/env.sh
+++ b/scripts/ci/env.sh
@@ -38,7 +38,7 @@ setEnvVar NODE_VERSION 6.9.5
 setEnvVar NPM_VERSION 3.10.7 # do not upgrade to >3.10.8 unless https://github.com/npm/npm/issues/14042 is resolved
 setEnvVar YARN_VERSION 0.24.6
 setEnvVar SAUCE_CONNECT_VERSION 4.3.11
-setEnvVar ANGULAR_CLI_VERSION 1.3.2
+setEnvVar ANGULAR_CLI_VERSION 1.4.0-rc.2
 setEnvVar PROJECT_ROOT $(cd ${thisDir}/../..; pwd)
 
 if [[ ${TRAVIS:-} ]]; then
diff --git a/tools/gulp-tasks/format.js b/tools/gulp-tasks/format.js
index 51ec44c1e6..afd22a8a6e 100644
--- a/tools/gulp-tasks/format.js
+++ b/tools/gulp-tasks/format.js
@@ -17,6 +17,9 @@ const srcsToFmt = [
   'tools/**/*.{js,ts}',
   '!tools/public_api_guard/**/*.d.ts',
   './*.{js,ts}',
+  '!**/node_modules/**',
+  '!**/dist/**',
+  '!**/built/**',
   '!shims_for_IE.js',
   `!${I18N_DATA_FOLDER}/**/*.{js,ts}`,
   `!${I18N_FOLDER}/available_locales.ts`,
diff --git a/tools/gulp-tasks/public-api.js b/tools/gulp-tasks/public-api.js
index 6d14f929f2..e4f2fa41ff 100644
--- a/tools/gulp-tasks/public-api.js
+++ b/tools/gulp-tasks/public-api.js
@@ -1,22 +1,22 @@
 const entrypoints = [
-  'dist/packages-dist/core/core.d.ts', 'dist/packages-dist/core/testing.d.ts',
-  'dist/packages-dist/common/common.d.ts', 'dist/packages-dist/common/testing.d.ts',
+  'dist/packages-dist/core/index.d.ts', 'dist/packages-dist/core/testing.d.ts',
+  'dist/packages-dist/common/index.d.ts', 'dist/packages-dist/common/testing.d.ts',
   'dist/packages-dist/common/http.d.ts', 'dist/packages-dist/common/http/testing.d.ts',
   // The API surface of the compiler is currently unstable - all of the important APIs are exposed
   // via @angular/core, @angular/platform-browser or @angular/platform-browser-dynamic instead.
   //'dist/packages-dist/compiler/index.d.ts',
   //'dist/packages-dist/compiler/testing.d.ts',
-  'dist/packages-dist/upgrade/upgrade.d.ts', 'dist/packages-dist/upgrade/static.d.ts',
-  'dist/packages-dist/platform-browser/platform-browser.d.ts',
+  'dist/packages-dist/upgrade/index.d.ts', 'dist/packages-dist/upgrade/static.d.ts',
+  'dist/packages-dist/platform-browser/index.d.ts',
   'dist/packages-dist/platform-browser/testing.d.ts',
-  'dist/packages-dist/platform-browser-dynamic/platform-browser-dynamic.d.ts',
+  'dist/packages-dist/platform-browser-dynamic/index.d.ts',
   'dist/packages-dist/platform-browser-dynamic/testing.d.ts',
-  'dist/packages-dist/platform-webworker/platform-webworker.d.ts',
-  'dist/packages-dist/platform-webworker-dynamic/platform-webworker-dynamic.d.ts',
-  'dist/packages-dist/platform-server/platform-server.d.ts',
-  'dist/packages-dist/platform-server/testing.d.ts', 'dist/packages-dist/http/http.d.ts',
-  'dist/packages-dist/http/testing.d.ts', 'dist/packages-dist/forms/forms.d.ts',
-  'dist/packages-dist/router/router.d.ts', 'dist/packages-dist/animations/animations.d.ts',
+  'dist/packages-dist/platform-webworker/index.d.ts',
+  'dist/packages-dist/platform-webworker-dynamic/index.d.ts',
+  'dist/packages-dist/platform-server/index.d.ts',
+  'dist/packages-dist/platform-server/testing.d.ts', 'dist/packages-dist/http/index.d.ts',
+  'dist/packages-dist/http/testing.d.ts', 'dist/packages-dist/forms/index.d.ts',
+  'dist/packages-dist/router/index.d.ts', 'dist/packages-dist/animations/index.d.ts',
   'dist/packages-dist/animations/browser.d.ts',
   'dist/packages-dist/animations/browser/testing.d.ts',
   'dist/packages-dist/platform-browser/animations.d.ts'
diff --git a/tools/public_api_guard/animations/animations.d.ts b/tools/public_api_guard/animations/index.d.ts
similarity index 100%
rename from tools/public_api_guard/animations/animations.d.ts
rename to tools/public_api_guard/animations/index.d.ts
diff --git a/tools/public_api_guard/common/common.d.ts b/tools/public_api_guard/common/index.d.ts
similarity index 100%
rename from tools/public_api_guard/common/common.d.ts
rename to tools/public_api_guard/common/index.d.ts
diff --git a/tools/public_api_guard/compiler/compiler.d.ts b/tools/public_api_guard/compiler/index.d.ts
similarity index 100%
rename from tools/public_api_guard/compiler/compiler.d.ts
rename to tools/public_api_guard/compiler/index.d.ts
diff --git a/tools/public_api_guard/core/core.d.ts b/tools/public_api_guard/core/index.d.ts
similarity index 100%
rename from tools/public_api_guard/core/core.d.ts
rename to tools/public_api_guard/core/index.d.ts
diff --git a/tools/public_api_guard/forms/forms.d.ts b/tools/public_api_guard/forms/index.d.ts
similarity index 100%
rename from tools/public_api_guard/forms/forms.d.ts
rename to tools/public_api_guard/forms/index.d.ts
diff --git a/tools/public_api_guard/http/http.d.ts b/tools/public_api_guard/http/index.d.ts
similarity index 100%
rename from tools/public_api_guard/http/http.d.ts
rename to tools/public_api_guard/http/index.d.ts
diff --git a/tools/public_api_guard/platform-browser-dynamic/platform-browser-dynamic.d.ts b/tools/public_api_guard/platform-browser-dynamic/index.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-browser-dynamic/platform-browser-dynamic.d.ts
rename to tools/public_api_guard/platform-browser-dynamic/index.d.ts
diff --git a/tools/public_api_guard/platform-browser/platform-browser.d.ts b/tools/public_api_guard/platform-browser/index.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-browser/platform-browser.d.ts
rename to tools/public_api_guard/platform-browser/index.d.ts
diff --git a/tools/public_api_guard/platform-server/platform-server.d.ts b/tools/public_api_guard/platform-server/index.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-server/platform-server.d.ts
rename to tools/public_api_guard/platform-server/index.d.ts
diff --git a/tools/public_api_guard/platform-webworker-dynamic/platform-webworker-dynamic.d.ts b/tools/public_api_guard/platform-webworker-dynamic/index.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-webworker-dynamic/platform-webworker-dynamic.d.ts
rename to tools/public_api_guard/platform-webworker-dynamic/index.d.ts
diff --git a/tools/public_api_guard/platform-webworker/platform-webworker.d.ts b/tools/public_api_guard/platform-webworker/index.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-webworker/platform-webworker.d.ts
rename to tools/public_api_guard/platform-webworker/index.d.ts
diff --git a/tools/public_api_guard/router/router.d.ts b/tools/public_api_guard/router/index.d.ts
similarity index 100%
rename from tools/public_api_guard/router/router.d.ts
rename to tools/public_api_guard/router/index.d.ts
diff --git a/tools/public_api_guard/upgrade/upgrade.d.ts b/tools/public_api_guard/upgrade/index.d.ts
similarity index 100%
rename from tools/public_api_guard/upgrade/upgrade.d.ts
rename to tools/public_api_guard/upgrade/index.d.ts