diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000000..a170d0cd8c
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,4 @@
+{
+  "plugins": ["transform-es2015-modules-umd"],
+  "presets": ["es2015"]
+}
diff --git a/.travis.yml b/.travis.yml
index d5898085b1..ab6808b40e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ env:
     - secure: "MPx3UM77o5IlhT75PKHL0FXoB5tSXDc3vnCXCd1sRy4XUTZ9vjcV6nNuyqEf+SOw659bGbC1FI4mACGx1Q+z7MQDR85b1mcA9uSgHDkh+IR82CnCVdaX9d1RXafdJIArahxfmorbiiPPLyPIKggo7ituRm+2c+iraoCkE/pXxYg="
   matrix:
     # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
-    - CI_MODE=e2e EXPERIMENTAL_ES2015_DISTRO=1
+    - CI_MODE=e2e
     - CI_MODE=js
     - CI_MODE=saucelabs_required
     - CI_MODE=browserstack_required
diff --git a/build.sh b/build.sh
index 1b3f7ebfdb..99501d448d 100755
--- a/build.sh
+++ b/build.sh
@@ -20,12 +20,14 @@ PACKAGES=(core
   compiler-cli
   language-service
   benchpress)
+
 BUILD_ALL=true
 BUNDLE=true
 VERSION_PREFIX=$(node -p "require('./package.json').version")
 VERSION_SUFFIX="-$(git log --oneline -1 | awk '{print $1}')"
 ROUTER_VERSION_PREFIX=$(node -p "require('./package.json').version.replace(/^2/, '3')")
 REMOVE_BENCHPRESS=false
+BUILD_EXAMPLES=true
 
 for ARG in "$@"; do
   case "$ARG" in
@@ -41,6 +43,9 @@ for ARG in "$@"; do
       VERSION_SUFFIX=""
       REMOVE_BENCHPRESS=true
       ;;
+    --examples=*)
+      BUILD_EXAMPLES=${ARG#--examples=}
+      ;;
     *)
       echo "Unknown option $ARG."
       exit 1
@@ -48,6 +53,34 @@ for ARG in "$@"; do
   esac
 done
 
+getPackageContents() {
+  echo "{\"typings\": \"../typings/${2}/${2}.d.ts\", \"main\": \"../bundles/${1}-${2}.umd.js\", \"module\": \"../@angular/${1}/${2}.es5.js\", \"es2015\": \"../@angular/${1}/${2}.js\"}"
+}
+
+containsElement () {
+  local e
+  for e in "${@:2}"; do
+    [[ "$e" == "$1" ]] && return 0;
+  done
+  return 1
+}
+
+NON_MODULE=(
+  platform-browser
+)
+
+moveTypings() {
+  # $1 == Source copy root (/src or /testing)
+  # $2 == Final destination directory
+  rsync -a --exclude=*.js* ${1} ${2}
+}
+
+cleanTypings() {
+  # $1 == Source root (where index.d.ts file is, for instance)
+  # $2 == Source copy root (/src or /typings)
+  rm -f ${1}/index.*
+  rm -rf ${2}
+}
 VERSION="${VERSION_PREFIX}${VERSION_SUFFIX}"
 ROUTER_VERSION="${ROUTER_VERSION_PREFIX}${VERSION_SUFFIX}"
 echo "====== BUILDING: Version ${VERSION} (Router ${ROUTER_VERSION})"
@@ -55,6 +88,8 @@ echo "====== BUILDING: Version ${VERSION} (Router ${ROUTER_VERSION})"
 export NODE_PATH=${NODE_PATH}:$(pwd)/dist/all:$(pwd)/dist/tools
 TSC="node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main"
 UGLIFYJS=`pwd`/node_modules/.bin/uglifyjs
+BABELJS=`pwd`/node_modules/.bin/babel
+BABILI=`pwd`/node_modules/.bin/babili
 TSCONFIG=./tools/tsconfig.json
 echo "====== (tools)COMPILING: \$(npm bin)/tsc -p ${TSCONFIG} ====="
 rm -rf ./dist/tools/
@@ -111,16 +146,30 @@ fi
 for PACKAGE in ${PACKAGES[@]}
 do
   PWD=`pwd`
+  ROOTDIR=${PWD}/modules/@angular
   SRCDIR=${PWD}/modules/@angular/${PACKAGE}
   DESTDIR=${PWD}/dist/packages-dist/${PACKAGE}
-  ES2015_DESTDIR=${PWD}/dist/packages-dist-es2015/${PACKAGE}
-  UMD_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.js
-  UMD_TESTING_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}-testing.umd.js
-  UMD_STATIC_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}-static.umd.js
-  UMD_UPGRADE_ES5_PATH=${DESTDIR}/bundles/${PACKAGE}-upgrade.umd.js
-  UMD_ES5_MIN_PATH=${DESTDIR}/bundles/${PACKAGE}.umd.min.js
-  UMD_STATIC_ES5_MIN_PATH=${DESTDIR}/bundles/${PACKAGE}-static.umd.min.js
-  UMD_UPGRADE_ES5_MIN_PATH=${DESTDIR}/bundles/${PACKAGE}-upgrade.umd.min.js
+  DEST_MODULE=${DESTDIR}/@angular
+  DEST_BUNDLES=${DESTDIR}/bundles
+
+  # ESM/ES6
+  JS_PATH=${DEST_MODULE}/${PACKAGE}.js
+  JS_PATH_ES5=${DEST_MODULE}/${PACKAGE}.es5.js
+  JS_TESTING_PATH=${DEST_MODULE}/${PACKAGE}/testing.js
+  JS_TESTING_PATH_ES5=${DEST_MODULE}/${PACKAGE}/testing.es5.js
+  JS_STATIC_PATH=${DEST_MODULE}/${PACKAGE}/static.js
+  JS_STATIC_PATH_ES5=${DEST_MODULE}/${PACKAGE}/static.es5.js
+  JS_UPGRADE_PATH=${DEST_MODULE}/${PACKAGE}/upgrade.js
+  JS_UPGRADE_PATH_ES5=${DEST_MODULE}/${PACKAGE}/upgrade.es5.js
+
+  # UMD/ES5
+  UMD_ES5_PATH=${DEST_BUNDLES}/${PACKAGE}.umd.js
+  UMD_TESTING_ES5_PATH=${DEST_BUNDLES}/${PACKAGE}-testing.umd.js
+  UMD_STATIC_ES5_PATH=${DEST_BUNDLES}/${PACKAGE}-static.umd.js
+  UMD_UPGRADE_ES5_PATH=${DEST_BUNDLES}/${PACKAGE}-upgrade.umd.js
+  UMD_ES5_MIN_PATH=${DEST_BUNDLES}/${PACKAGE}.umd.min.js
+  UMD_STATIC_ES5_MIN_PATH=${DEST_BUNDLES}/${PACKAGE}-static.umd.min.js
+  UMD_UPGRADE_ES5_MIN_PATH=${DEST_BUNDLES}/${PACKAGE}-upgrade.umd.min.js
 
   if [[ ${PACKAGE} != router ]]; then
     LICENSE_BANNER=${PWD}/modules/@angular/license-banner.txt
@@ -131,34 +180,51 @@ do
 
   rm -rf ${DESTDIR}
 
-  echo "======      COMPILING: ${TSC} -p ${SRCDIR}/tsconfig-build.json        ====="
-  $TSC -p ${SRCDIR}/tsconfig-build.json
-  # ES2015 distro is not ready yet; don't slow down all builds for it
-  # TODO(alexeagle,igorminar): figure out ES2015 story and enable
-  if [[ -n "${EXPERIMENTAL_ES2015_DISTRO}" ]]; then
-    $TSC -p ${SRCDIR}/tsconfig-build.json --target es2015 --outDir ${ES2015_DESTDIR}
-    cp ${SRCDIR}/package.json ${ES2015_DESTDIR}/
-    cp ${PWD}/modules/@angular/README.md ${ES2015_DESTDIR}/
+  echo "======      [${PACKAGE}]: COMPILING: ${TSC} --skipImportRename -p ${SRCDIR}/tsconfig-build.json"
+  if [[ -e ${SRCDIR}/.babelrc || ${PACKAGE} == "compiler" ]]; then
+    $TSC --skipImportRename -p ${SRCDIR}/tsconfig-build.json -outDir ${DEST_MODULE}
+  else
+    $TSC --skipImportRename -p ${SRCDIR}/tsconfig-build.json
   fi
 
-  if [[ -e ${SRCDIR}/tsconfig-upgrade.json ]]; then
-    echo "======      COMPILING: ${TSC} -p ${SRCDIR}/tsconfig-upgrade.json        ====="
-    $TSC -p ${SRCDIR}/tsconfig-upgrade.json
+  echo "======        Move ${PACKAGE} typings"
+  if [[ -e ${SRCDIR}/.babelrc || -d ${DEST_MODULE} ]]; then
+    rsync -a --exclude=*.js --exclude=*.js.map ${DEST_MODULE}/ ${DESTDIR}/typings
+    mv ${DESTDIR}/typings/index.d.ts ${DESTDIR}/typings/${PACKAGE}.d.ts
+    mv ${DESTDIR}/typings/index.metadata.json ${DESTDIR}/typings/${PACKAGE}.metadata.json
+  else
+    rsync -a --exclude=*.js --exclude=*.js.map ${DESTDIR}/ ${DESTDIR}/typings
+    find ${DESTDIR} -name "*.d.ts" -not -path "${DESTDIR}/typings/*" -exec rm -f {} \;
+  fi
+
+  if [[ -e ${SRCDIR}/tsconfig-es5.json ]]; then
+    echo "======      [${PACKAGE}]: COMPILING (ES5): ${TSC} -p ${SRCDIR}/tsconfig-es5.json"
+    $TSC -p ${SRCDIR}/tsconfig-es5.json
   fi
 
   cp ${SRCDIR}/package.json ${DESTDIR}/
+  if [[ -e ${SRCDIR}/.babelrc ]]; then
+    cp ${SRCDIR}/.babelrc ${DESTDIR}/
+  fi
   cp ${PWD}/modules/@angular/README.md ${DESTDIR}/
 
+  if [[ -e ${SRCDIR}/tsconfig-upgrade.json ]]; then
+    echo "======      [${PACKAGE}]: COMPILING (UPGRADE): ${TSC} -p ${SRCDIR}/tsconfig-upgrade.json"
+    $TSC -p ${SRCDIR}/tsconfig-upgrade.json
+  fi
+
   if [[ -e ${SRCDIR}/tsconfig-testing.json ]]; then
-    echo "======      COMPILING TESTING: ${TSC} -p ${SRCDIR}/tsconfig-testing.json"
+    echo "======      [${PACKAGE}]: COMPILING (TESTING): ${TSC} -p ${SRCDIR}/tsconfig-testing.json"
     $TSC -p ${SRCDIR}/tsconfig-testing.json
-    if [[ -n "${EXPERIMENTAL_ES2015_DISTRO}" ]]; then
-      $TSC -p ${SRCDIR}/tsconfig-testing.json --target es2015 --outDir ${ES2015_DESTDIR}
-    fi
+  fi
+
+  if [[ -e ${SRCDIR}/tsconfig-static.json ]]; then
+    echo "======      [${PACKAGE}]: COMPILING (STATIC): ${TSC} -p ${SRCDIR}/tsconfig-static.json"
+    $TSC -p ${SRCDIR}/tsconfig-static.json
   fi
 
   if [[ -e ${SRCDIR}/tsconfig-2015.json ]]; then
-    echo "======      COMPILING ESM: ${TSC} -p ${SRCDIR}/tsconfig-2015.json"
+    echo "======      [${PACKAGE}]: COMPILING (ES2015): ${TSC} -p ${SRCDIR}/tsconfig-2015.json"
     ${TSC} -p ${SRCDIR}/tsconfig-2015.json
   fi
 
@@ -170,44 +236,122 @@ do
   if [[ ${BUNDLE} == true && ${PACKAGE} != compiler-cli && ${PACKAGE} != benchpress ]]; then
 
     echo "======      BUNDLING: ${SRCDIR} ====="
-    mkdir ${DESTDIR}/bundles
+    mkdir ${DEST_BUNDLES}
 
     (
       cd  ${SRCDIR}
       echo "======         Rollup ${PACKAGE} index"
-      ../../../node_modules/.bin/rollup -c rollup.config.js
-      cat ${LICENSE_BANNER} > ${UMD_ES5_PATH}.tmp
-      cat ${UMD_ES5_PATH} >> ${UMD_ES5_PATH}.tmp
-      mv ${UMD_ES5_PATH}.tmp ${UMD_ES5_PATH}
-      $UGLIFYJS -c --screw-ie8 --comments -o ${UMD_ES5_MIN_PATH} ${UMD_ES5_PATH}
+      ../../../node_modules/.bin/rollup -i ${DEST_MODULE}/index.js -o ${JS_PATH}
+      cat ${LICENSE_BANNER} > ${JS_PATH}.tmp
+      cat ${JS_PATH} >> ${JS_PATH}.tmp
+      mv ${JS_PATH}.tmp ${JS_PATH}
 
-      if [[ -e rollup-testing.config.js ]]; then
+      if ! [[ ${PACKAGE} == 'benchpress' ]]; then
+        cleanTypings ${DEST_MODULE} ${DEST_MODULE}/src
+      fi
+
+      if [[ -e ${DESTDIR}/.babelrc ]]; then
+
+        echo "======         Downleveling ${PACKAGE} to ES5/UMD"
+        $BABELJS ${JS_PATH} -o ${UMD_ES5_PATH}
+
+        ### Minification ###
+        echo "======         Minifying JavaScript"
+        $BABILI ${JS_PATH} -o ${UMD_ES5_MIN_PATH}
+        echo "======         Downleveling min JavaScript to ES5/UMD"
+        $BABELJS ${UMD_ES5_MIN_PATH} -o ${UMD_ES5_MIN_PATH}
+
+        echo "======         Minifying ${PACKAGE}"
+        $UGLIFYJS -c --screw-ie8 --comments -o ${UMD_ES5_MIN_PATH} ${UMD_ES5_MIN_PATH}
+        ### END Minification ###
+      else
+        # For packages not running through babel, use the es5/umd config
+        echo "======         Rollup ${PACKAGE} index to UMD"
+        ../../../node_modules/.bin/rollup -c rollup-umd.config.js
+        [[ -d ${DESTDIR}/es5 ]] && rm -rf ${DESTDIR}/es5
+        echo "======         Minifying UMD ${PACKAGE}"
+        $UGLIFYJS -c --screw-ie8 --comments -o ${UMD_ES5_MIN_PATH} ${UMD_ES5_PATH}
+      fi
+
+      rm -f ${DISTDIR}/.babelrc
+      cp ${ROOTDIR}/.babelrc ${DEST_MODULE}/.babelrc
+      $BABELJS ${JS_PATH} -o ${JS_PATH_ES5}
+
+      if [[ -d testing ]]; then
         echo "======         Rollup ${PACKAGE} testing"
-        ../../../node_modules/.bin/rollup -c rollup-testing.config.js
-        echo "{\"main\": \"../bundles/${PACKAGE}-testing.umd.js\"}" > ${DESTDIR}/testing/package.json
+        ../../../node_modules/.bin/rollup -i ${DESTDIR}/testing/index.js -o ${DESTDIR}/testing.tmp.js
+
+        echo "======         Downleveling ${PACKAGE} TESTING to ES5/UMD"
+        [[ -e ${SRCDIR}/.babelrc-testing ]] && cp ${SRCDIR}/.babelrc-testing ${DESTDIR}/.babelrc
+        $BABELJS ${DESTDIR}/testing.tmp.js -o ${UMD_TESTING_ES5_PATH}
+        rm -f ${DESTDIR}/.babelrc
+
+        echo "======         Move ${PACKAGE} testing typings"
+        rsync -a --exclude=*.js --exclude=*.js.map ${DESTDIR}/testing/ ${DESTDIR}/typings/testing
+        mv ${DESTDIR}/typings/testing/index.d.ts ${DESTDIR}/typings/testing/testing.d.ts
+        mv ${DESTDIR}/typings/testing/index.metadata.json ${DESTDIR}/typings/testing/testing.metadata.json
+
+        rm -rf ${DESTDIR}/testing
+
+        mkdir ${DESTDIR}/testing && [[ -d ${DEST_MODULE}/${PACKAGE} ]] || mkdir ${DEST_MODULE}/${PACKAGE}
+
+        getPackageContents "${PACKAGE}" "testing" > ${DESTDIR}/testing/package.json
+
+        mv ${DESTDIR}/testing.tmp.js ${JS_TESTING_PATH}
+        $BABELJS ${JS_TESTING_PATH} -o ${JS_TESTING_PATH_ES5}
         cat ${LICENSE_BANNER} > ${UMD_TESTING_ES5_PATH}.tmp
         cat ${UMD_TESTING_ES5_PATH} >> ${UMD_TESTING_ES5_PATH}.tmp
         mv ${UMD_TESTING_ES5_PATH}.tmp ${UMD_TESTING_ES5_PATH}
       fi
 
-      if [[ -e rollup-static.config.js ]]; then
+      if [[ -e static.ts ]]; then
         echo "======         Rollup ${PACKAGE} static"
-        ../../../node_modules/.bin/rollup -c rollup-static.config.js
-        # create dir because it doesn't exist yet, we should move the src code here and remove this line
-        mkdir ${DESTDIR}/static
-        echo "{\"main\": \"../bundles/${PACKAGE}-static.umd.js\"}" > ${DESTDIR}/static/package.json
+        rm -f ${DEST_MODULE}/static.*
+        ../../../node_modules/.bin/rollup -i ${DESTDIR}/static/static.js -o ${DESTDIR}/static.tmp.js
+
+        echo "======         Downleveling ${PACKAGE} STATIC to ES5/UMD"
+        [[ -e ${SRCDIR}/.babelrc-static ]] && cp ${SRCDIR}/.babelrc-static ${DESTDIR}/.babelrc
+        $BABELJS ${DESTDIR}/static.tmp.js -o ${UMD_STATIC_ES5_PATH}
+        rm -f ${DESTDIR}/.babelrc
+
+        echo "======         Move ${PACKAGE} static typings"
+        rsync -a --exclude=*.js ${DESTDIR}/static/ ${DESTDIR}/typings/static
+        rm -f ${DESTDIR}/typings/static/index.d.ts
+        rm -rf ${DESTDIR}/static
+
+        mkdir ${DESTDIR}/static && [[ -d ${DEST_MODULE}/${PACKAGE} ]] || mkdir ${DEST_MODULE}/${PACKAGE}
+
+        getPackageContents "${PACKAGE}" "static"> ${DESTDIR}/static/package.json
+
+        mv ${DESTDIR}/static.tmp.js ${JS_STATIC_PATH}
+        $BABELJS ${JS_STATIC_PATH} -o ${JS_STATIC_PATH_ES5}
         cat ${LICENSE_BANNER} > ${UMD_STATIC_ES5_PATH}.tmp
         cat ${UMD_STATIC_ES5_PATH} >> ${UMD_STATIC_ES5_PATH}.tmp
         mv ${UMD_STATIC_ES5_PATH}.tmp ${UMD_STATIC_ES5_PATH}
         $UGLIFYJS -c --screw-ie8 --comments -o ${UMD_STATIC_ES5_MIN_PATH} ${UMD_STATIC_ES5_PATH}
       fi
 
-      if [[ -e rollup-upgrade.config.js ]]; then
+      if [[ -e upgrade.ts ]]; then
         echo "======         Rollup ${PACKAGE} upgrade"
-        ../../../node_modules/.bin/rollup -c rollup-upgrade.config.js
-        # create dir because it doesn't exist yet, we should move the src code here and remove this line
-        mkdir ${DESTDIR}/upgrade
-        echo "{\"main\": \"../bundles/${PACKAGE}-upgrade.umd.js\"}" > ${DESTDIR}/upgrade/package.json
+        rm -f ${DEST_MODULE}/upgrade.*
+        ../../../node_modules/.bin/rollup -i ${DESTDIR}/upgrade/upgrade.js -o ${DESTDIR}/upgrade.tmp.js
+
+        echo "======         Downleveling ${PACKAGE} UPGRADE to ES5/UMD"
+        [[ -e ${SRCDIR}/.babelrc-upgrade ]] && cp ${SRCDIR}/.babelrc-upgrade ${DESTDIR}/.babelrc
+        $BABELJS ${DESTDIR}/upgrade.tmp.js -o ${UMD_UPGRADE_ES5_PATH}
+        rm -f ${DESTDIR}/.babelrc
+
+        echo "======         Move ${PACKAGE} upgrade typings"
+        rsync -a --exclude=*.js ${DESTDIR}/upgrade/ ${DESTDIR}/typings/upgrade
+        rm -f ${DESTDIR}/typings/upgrade/index.d.ts
+        rm -rf ${DESTDIR}/upgrade
+
+        mkdir ${DESTDIR}/upgrade && [[ -d ${DEST_MODULE}/${PACKAGE} ]] || mkdir ${DEST_MODULE}/${PACKAGE}
+
+        getPackageContents "${PACKAGE}" "upgrade" > ${DESTDIR}/upgrade/package.json
+
+        mv ${DESTDIR}/upgrade.tmp.js ${JS_UPGRADE_PATH}
+        $BABELJS ${JS_UPGRADE_PATH} -o ${JS_UPGRADE_PATH_ES5}
         cat ${LICENSE_BANNER} > ${UMD_UPGRADE_ES5_PATH}.tmp
         cat ${UMD_UPGRADE_ES5_PATH} >> ${UMD_UPGRADE_ES5_PATH}.tmp
         mv ${UMD_UPGRADE_ES5_PATH}.tmp ${UMD_UPGRADE_ES5_PATH}
@@ -215,14 +359,15 @@ do
       fi
     ) 2>&1 | grep -v "as external dependency"
 
-    if [[ -n "${EXPERIMENTAL_ES2015_DISTRO}" ]]; then
-      cp -prv ${DESTDIR}/bundles ${ES2015_DESTDIR}
-    fi
   fi
 
   (
     echo "======      VERSION: Updating version references"
-    cd ${DESTDIR}
+    if [[ -e ${SRCDIR}/.babelrc ]]; then
+      cd ${DEST_MODULE}
+    else
+      cd ${DESTDIR}
+    fi
     echo "======       EXECUTE: perl -p -i -e \"s/0\.0\.0\-PLACEHOLDER/${VERSION}/g\" $""(grep -ril 0\.0\.0\-PLACEHOLDER .)"
     perl -p -i -e "s/0\.0\.0\-PLACEHOLDER/${VERSION}/g" $(grep -ril 0\.0\.0\-PLACEHOLDER .) < /dev/null 2> /dev/null
     echo "======       EXECUTE: perl -p -i -e \"s/0\.0\.0\-ROUTERPLACEHOLDER/${ROUTER_VERSION}/g\" $""(grep -ril 0\.0\.0\-ROUTERPLACEHOLDER .)"
@@ -230,9 +375,11 @@ do
   )
 done
 
-echo ""
-echo "====== Building examples: ./modules/@angular/examples/build.sh ====="
-./modules/@angular/examples/build.sh
+if [[ ${BUILD_EXAMPLES} == true ]]; then
+  echo ""
+  echo "====== Building examples: ./modules/@angular/examples/build.sh ====="
+  ./modules/@angular/examples/build.sh
+fi
 
 if [[ ${REMOVE_BENCHPRESS} == true ]]; then
   echo ""
diff --git a/integration/.gitignore b/integration/.gitignore
index 8f47dddf6b..58e631984a 100644
--- a/integration/.gitignore
+++ b/integration/.gitignore
@@ -7,3 +7,4 @@ vendor/
 **/*.ngfactory.ts
 **/*.ngsummary.json
 */yarn*
+*/.yarn_local_cache*
diff --git a/integration/README.md b/integration/README.md
index 2314f71738..19a11b70f4 100644
--- a/integration/README.md
+++ b/integration/README.md
@@ -35,7 +35,6 @@ Angular's `node_modules` is installed.
 The first time you run the tests, you'll need some setup:
 
 ```shell
-$ EXPERIMENTAL_ES2015_DISTRO=1 ./build.sh
 $ ./integration/build_rxjs_es6.sh
 ```
 
@@ -44,7 +43,7 @@ See the `package.json` of the test(s) you're debugging, to see which dist/ folde
 Then run the right `tsc --watch` command to keep those dist folders up-to-date, for example:
 
 ```
-$ ./node_modules/.bin/tsc -p modules/@angular/core/tsconfig-build.json --target es2015 --outDir dist/packages-dist-es2015/core --watch
+$ ./node_modules/.bin/tsc -p modules/@angular/core/tsconfig-build.json --outDir dist/packages-dist/core --watch
 ```
 
 Now you can run the integration test, it will re-install from the dist/ folder on each run.
diff --git a/integration/hello_world__closure/bundle.sh b/integration/hello_world__closure/bundle.sh
index 62383ec9b1..0b4771698d 100755
--- a/integration/hello_world__closure/bundle.sh
+++ b/integration/hello_world__closure/bundle.sh
@@ -25,7 +25,10 @@ CLOSURE_ARGS=(
   "--rewrite_polyfills=false"
 
   # List of path prefixes to be removed from ES6 & CommonJS modules.
-  "--js_module_root=node_modules"
+  "--js_module_root=node_modules/@angular/core"
+  "--js_module_root=node_modules/@angular/common"
+  "--js_module_root=node_modules/@angular/compiler"
+  "--js_module_root=node_modules/@angular/platform-browser"
   "--js_module_root=vendor"
 
   # Uncomment for easier debugging
@@ -34,9 +37,10 @@ CLOSURE_ARGS=(
   e2e/testability.externs.js
   node_modules/zone.js/dist/zone.js
   $(find -L vendor/rxjs -name *.js)
-  node_modules/@angular/{core,common,compiler,platform-browser}/index.js
-  node_modules/@angular/{core,common}/public_api.js
-  $(find node_modules/@angular/{core,common,compiler,platform-browser}/src -name *.js)
+  node_modules/@angular/core/@angular/core.js
+  node_modules/@angular/common/@angular/common.js
+  node_modules/@angular/compiler/@angular/compiler.js
+  node_modules/@angular/platform-browser/@angular/platform-browser.js
   "built/src/*.js"
   "--entry_point=./built/src/main"
 )
diff --git a/integration/hello_world__closure/package.json b/integration/hello_world__closure/package.json
index 6db7b71bde..e47eb9fc42 100644
--- a/integration/hello_world__closure/package.json
+++ b/integration/hello_world__closure/package.json
@@ -3,12 +3,12 @@
   "version": "0.0.0",
   "license": "MIT",
   "dependencies": {
-    "@angular/common": "file:../../dist/packages-dist-es2015/common",
-    "@angular/compiler": "file:../../dist/packages-dist-es2015/compiler",
-    "@angular/compiler-cli": "file:../../dist/packages-dist-es2015/compiler-cli",
-    "@angular/core": "file:../../dist/packages-dist-es2015/core",
-    "@angular/platform-browser": "file:../../dist/packages-dist-es2015/platform-browser",
-    "@angular/platform-server": "file:../../dist/packages-dist-es2015/platform-server",
+    "@angular/common": "file:../../dist/packages-dist/common",
+    "@angular/compiler": "file:../../dist/packages-dist/compiler",
+    "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
+    "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
     "@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
     "google-closure-compiler": "20161201.0.0",
     "rxjs": "file:../../node_modules/rxjs",
diff --git a/integration/run_tests.sh b/integration/run_tests.sh
index 1165f75ef1..1d37ff1f3c 100755
--- a/integration/run_tests.sh
+++ b/integration/run_tests.sh
@@ -10,12 +10,6 @@ if [ ! -d "rxjs/dist/es6" ]; then
   exit 1
 fi
 
-if [ ! -d "../dist/packages-dist-es2015" ]; then
-  echo "You must build the ES2015 distro for some tests:"
-  echo "EXPERIMENTAL_ES2015_DISTRO=1 ./build.sh"
-  exit 1
-fi
-
 # Workaround https://github.com/yarnpkg/yarn/issues/2165
 # Yarn will cache file://dist URIs and not update Angular code
 readonly cache=.yarn_local_cache
diff --git a/modules/@angular/.babelrc b/modules/@angular/.babelrc
new file mode 100755
index 0000000000..9897749da4
--- /dev/null
+++ b/modules/@angular/.babelrc
@@ -0,0 +1,5 @@
+{
+  "presets": [
+    ["es2015", { "modules": false }]
+  ]
+}
diff --git a/modules/@angular/animation/.babelrc b/modules/@angular/animation/.babelrc
new file mode 100644
index 0000000000..fdaee566fe
--- /dev/null
+++ b/modules/@angular/animation/.babelrc
@@ -0,0 +1,14 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/animation": "ng.animation",
+      "rxjs/Observable": "Rx",
+      "rxjs/Subject": "Rx"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/animation"
+}
diff --git a/modules/@angular/animation/.babelrc-testing b/modules/@angular/animation/.babelrc-testing
new file mode 100644
index 0000000000..12997b861c
--- /dev/null
+++ b/modules/@angular/animation/.babelrc-testing
@@ -0,0 +1,15 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/animation": "ng.animation",
+      "@angular/animation/testing": "ng.animation.testing",
+      "rxjs/Observable": "Rx",
+      "rxjs/Subject": "Rx"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/animation/testing"
+}
diff --git a/modules/@angular/animation/index.ts b/modules/@angular/animation/index.ts
index 05e6b19532..e727e2e8a7 100644
--- a/modules/@angular/animation/index.ts
+++ b/modules/@angular/animation/index.ts
@@ -7,7 +7,7 @@
  */
 
 // 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`
+// by the TypeScript language service and during build for verification. `ngc`
 // replaces this file with production index.ts when it rewrites private symbol
 // names.
 
diff --git a/modules/@angular/animation/package.json b/modules/@angular/animation/package.json
index 96fe66eb8f..d0fec906d9 100644
--- a/modules/@angular/animation/package.json
+++ b/modules/@angular/animation/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/animation",
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - animation integration with web-animations",
-  "main": "bundles/animation.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/animation.umd.js",
+  "module": "./@angular/animation.es5.js",
+  "es2015": "./@angular/animation.js",
+  "typings": "./typings/animation.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/animation/rollup-testing.config.js b/modules/@angular/animation/rollup-testing.config.js
deleted file mode 100644
index 3c37bc8f76..0000000000
--- a/modules/@angular/animation/rollup-testing.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/animation/testing/index.js',
-  dest: '../../../dist/packages-dist/animation/bundles/animation-testing.umd.js',
-  format: 'umd',
-  moduleName: 'ng.animation.testing',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/animation': 'ng.animation',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
-  }
-};
diff --git a/modules/@angular/animation/rollup.config.js b/modules/@angular/animation/rollup.config.js
deleted file mode 100644
index 9ecbc1047a..0000000000
--- a/modules/@angular/animation/rollup.config.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/animation/index.js',
-  dest: '../../../dist/packages-dist/animation/bundles/animation.umd.js',
-  format: 'umd',
-  moduleName: 'ng.animation',
-  globals: {
-    '@angular/core': 'ng.core',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx',
-  }
-};
diff --git a/modules/@angular/animation/src/engine/web_animations/web_animations_player.ts b/modules/@angular/animation/src/engine/web_animations/web_animations_player.ts
index 28deb7a51e..51f3b796d4 100644
--- a/modules/@angular/animation/src/engine/web_animations/web_animations_player.ts
+++ b/modules/@angular/animation/src/engine/web_animations/web_animations_player.ts
@@ -80,9 +80,13 @@ export class WebAnimationsPlayer implements AnimationPlayer {
       });
 
       if (missingStyleProps.length) {
-        for (let i = 1; i < keyframes.length; i++) {
+        const self = this;
+        // tslint:disable-next-line
+        for (var i = 1; i < keyframes.length; i++) {
           let kf = keyframes[i];
-          missingStyleProps.forEach(prop => { kf[prop] = _computeStyle(this.element, prop); });
+          missingStyleProps.forEach(function(prop) {
+            kf[prop] = _computeStyle(self.element, prop);
+          });
         }
       }
     }
diff --git a/modules/@angular/animation/tsconfig-build.json b/modules/@angular/animation/tsconfig-build.json
index c6e81e351c..5746833ae1 100644
--- a/modules/@angular/animation/tsconfig-build.json
+++ b/modules/@angular/animation/tsconfig-build.json
@@ -13,7 +13,7 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "lib": ["es2015", "dom"],
     "skipLibCheck": true,
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
diff --git a/modules/@angular/animation/tsconfig-testing.json b/modules/@angular/animation/tsconfig-testing.json
index 1e45966672..00e85e5b55 100644
--- a/modules/@angular/animation/tsconfig-testing.json
+++ b/modules/@angular/animation/tsconfig-testing.json
@@ -1,22 +1,12 @@
 {
+  "extends": "./tsconfig-build",
+
   "compilerOptions": {
-    "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": true,
-    "experimentalDecorators": true,
-    "module": "es2015",
-    "moduleResolution": "node",
-    "outDir": "../../../dist/packages-dist/animation/",
+    "outDir": "../../../dist/packages-dist/animation",
     "paths": {
       "@angular/core": ["../../../dist/packages-dist/core/"],
       "@angular/animation": ["../../../dist/packages-dist/animation/"]
-    },
-    "rootDir": ".",
-    "sourceMap": true,
-    "inlineSources": true,
-    "lib": ["es6", "dom"],
-    "target": "es5",
-    "skipLibCheck": true
+    }
   },
   "files": [
     "testing/index.ts",
diff --git a/modules/@angular/benchpress/package.json b/modules/@angular/benchpress/package.json
index 5f8de1630e..8de049631a 100644
--- a/modules/@angular/benchpress/package.json
+++ b/modules/@angular/benchpress/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "description": "Benchpress - a framework for e2e performance tests",
   "main": "index.js",
-  "typings": "index.d.ts",
+  "typings": "./typings/index.d.ts",
   "dependencies": {
     "@angular/core": "^2.0.0-rc.7",
     "reflect-metadata": "^0.1.2",
diff --git a/modules/@angular/benchpress/tsconfig-build.json b/modules/@angular/benchpress/tsconfig-build.json
index b8a1a3cc0d..d38ab2450a 100644
--- a/modules/@angular/benchpress/tsconfig-build.json
+++ b/modules/@angular/benchpress/tsconfig-build.json
@@ -1,28 +1,28 @@
 {
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es5",
-        "lib": ["es6", "dom"],
-        "noImplicitAny": true,
-        "sourceMap": true,
-        "baseUrl": ".",
-        "paths": {
-          "@angular/core": ["../../../dist/packages-dist/core"]
-        },
-        "experimentalDecorators": true,
-        "rootDir": ".",
-        "sourceRoot": ".",
-        "outDir": "../../../dist/packages-dist/benchpress",
-        "declaration": true,
-        "skipLibCheck": true,
-        // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
-        "types": []
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es2015",
+    "lib": ["es6", "dom"],
+    "noImplicitAny": true,
+    "sourceMap": true,
+    "baseUrl": ".",
+    "outDir": "../../../dist/packages-dist/benchpress",
+    "paths": {
+      "@angular/core": ["../../../dist/packages-dist/core"]
     },
-    "exclude": ["integrationtest"],
-    "files": [
-        "index.ts",
-        "../../../node_modules/@types/node/index.d.ts",
-        "../../../node_modules/@types/jasmine/index.d.ts",
-        "../../../node_modules/zone.js/dist/zone.js.d.ts"
-    ]
+    "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": []
+  },
+  "exclude": ["integrationtest"],
+  "files": [
+    "index.ts",
+    "../../../node_modules/@types/node/index.d.ts",
+    "../../../node_modules/@types/jasmine/index.d.ts",
+    "../../../node_modules/zone.js/dist/zone.js.d.ts"
+  ]
 }
diff --git a/modules/@angular/common/.babelrc b/modules/@angular/common/.babelrc
new file mode 100644
index 0000000000..1a645b60dd
--- /dev/null
+++ b/modules/@angular/common/.babelrc
@@ -0,0 +1,13 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/common": "ng.common",
+      "@angular/core": "ng.core",
+      "rxjs/Subject": "Rx"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/common"
+}
diff --git a/modules/@angular/common/.babelrc-testing b/modules/@angular/common/.babelrc-testing
new file mode 100644
index 0000000000..aef20179e9
--- /dev/null
+++ b/modules/@angular/common/.babelrc-testing
@@ -0,0 +1,14 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/common": "ng.common",
+      "@angular/common/testing": "ng.common.testing",
+      "@angular/core": "ng.core",
+      "rxjs/Subject": "Rx"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/common/testing"
+}
diff --git a/modules/@angular/common/index.ts b/modules/@angular/common/index.ts
index 05e6b19532..e727e2e8a7 100644
--- a/modules/@angular/common/index.ts
+++ b/modules/@angular/common/index.ts
@@ -7,7 +7,7 @@
  */
 
 // 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`
+// by the TypeScript language service and during build for verification. `ngc`
 // replaces this file with production index.ts when it rewrites private symbol
 // names.
 
diff --git a/modules/@angular/common/package.json b/modules/@angular/common/package.json
index 39f24035ee..448b0285db 100644
--- a/modules/@angular/common/package.json
+++ b/modules/@angular/common/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/common",
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - commonly needed directives and services",
-  "main": "bundles/common.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/common.umd.js",
+  "module": "./@angular/common.es5.js",
+  "es2015": "./@angular/common.js",
+  "typings": "./typings/common.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/common/rollup-testing.config.js b/modules/@angular/common/rollup-testing.config.js
deleted file mode 100644
index 8c0e1d7618..0000000000
--- a/modules/@angular/common/rollup-testing.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/common/testing/index.js',
-  dest: '../../../dist/packages-dist/common/bundles/common-testing.umd.js',
-  format: 'umd',
-  moduleName: 'ng.common.testing',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
-  }
-};
diff --git a/modules/@angular/common/rollup.config.js b/modules/@angular/common/rollup.config.js
deleted file mode 100644
index 1e6b494fc8..0000000000
--- a/modules/@angular/common/rollup.config.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/common/index.js',
-  dest: '../../../dist/packages-dist/common/bundles/common.umd.js',
-  format: 'umd',
-  moduleName: 'ng.common',
-  globals: {
-    '@angular/core': 'ng.core',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx',
-  }
-};
diff --git a/modules/@angular/common/tsconfig-build.json b/modules/@angular/common/tsconfig-build.json
index cfac872df3..773a22e1d3 100644
--- a/modules/@angular/common/tsconfig-build.json
+++ b/modules/@angular/common/tsconfig-build.json
@@ -13,7 +13,7 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "lib": [ "es2015", "dom" ],
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
diff --git a/modules/@angular/common/tsconfig-testing.json b/modules/@angular/common/tsconfig-testing.json
index 53755ba011..46e5ab960f 100644
--- a/modules/@angular/common/tsconfig-testing.json
+++ b/modules/@angular/common/tsconfig-testing.json
@@ -2,11 +2,11 @@
   "extends": "./tsconfig-build",
 
   "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/common",
     "paths": {
       "@angular/core": ["../../../dist/packages-dist/core/"],
       "@angular/common": ["../../../dist/packages-dist/common"]
-    },
-    "target": "es5"
+    }
   },
   "files": [
     "testing/index.ts",
diff --git a/modules/@angular/compiler-cli/README.md b/modules/@angular/compiler-cli/README.md
index e36ba0e25a..0c345f3fde 100644
--- a/modules/@angular/compiler-cli/README.md
+++ b/modules/@angular/compiler-cli/README.md
@@ -106,7 +106,7 @@ This CLI is intended for demos, prototyping, or for users with simple build syst
 that run bare `tsc`.
 
 Users with a build system should expect an Angular template plugin. Such a plugin would be
-based on the `index.ts` in this directory, but should share the TypeScript compiler instance
+based on the `public_api.ts` in this directory, but should share the TypeScript compiler instance
 with the one already used in the plugin for TypeScript typechecking and emit.
 
 ## Design
diff --git a/modules/@angular/compiler-cli/integrationtest/webpack.config.js b/modules/@angular/compiler-cli/integrationtest/webpack.config.js
index 90d348e286..cdee03eda2 100644
--- a/modules/@angular/compiler-cli/integrationtest/webpack.config.js
+++ b/modules/@angular/compiler-cli/integrationtest/webpack.config.js
@@ -11,4 +11,5 @@ module.exports = {
   entry: './test/all_spec.js',
   output: {filename: './all_spec.js'},
   resolve: {extensions: ['.js']},
+
 };
diff --git a/modules/@angular/compiler-cli/package.json b/modules/@angular/compiler-cli/package.json
index c855f72a2d..7b590845bb 100644
--- a/modules/@angular/compiler-cli/package.json
+++ b/modules/@angular/compiler-cli/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the compiler CLI for Node.js",
   "main": "index.js",
-  "typings": "index.d.ts",
+  "typings": "./typings/index.d.ts",
   "bin": {
     "ngc": "./src/main.js",
     "ng-xi18n": "./src/extract_i18n.js"
diff --git a/modules/@angular/compiler-cli/src/compiler_host.ts b/modules/@angular/compiler-cli/src/compiler_host.ts
index 43e767080c..a875688513 100644
--- a/modules/@angular/compiler-cli/src/compiler_host.ts
+++ b/modules/@angular/compiler-cli/src/compiler_host.ts
@@ -18,7 +18,7 @@ const NODE_MODULES = '/node_modules/';
 const IS_GENERATED = /\.(ngfactory|ngstyle)$/;
 const GENERATED_FILES = /\.ngfactory\.ts$|\.ngstyle\.ts$/;
 const GENERATED_OR_DTS_FILES = /\.d\.ts$|\.ngfactory\.ts$|\.ngstyle\.ts$/;
-const SHALLOW_IMPORT = /^(\w+|(\@\w+\/\w+))$/;
+const SHALLOW_IMPORT = /^((\w|-)+|(@(\w|-)+\/(\w|-)+))$/;
 
 export interface CompilerHostContext extends ts.ModuleResolutionHost {
   readResource(fileName: string): Promise<string>;
diff --git a/modules/@angular/compiler/.babelrc-testing b/modules/@angular/compiler/.babelrc-testing
new file mode 100644
index 0000000000..01b2a56822
--- /dev/null
+++ b/modules/@angular/compiler/.babelrc-testing
@@ -0,0 +1,15 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/core/testing": "ng.core.testing",
+      "@angular/compiler": "ng.compiler",
+      "rxjs/Observable": "Rx",
+      "rxjs/Subject": "Rx"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/core/testing"
+}
diff --git a/modules/@angular/compiler/index.ts b/modules/@angular/compiler/index.ts
index 34feab50a4..03a69b6aa6 100644
--- a/modules/@angular/compiler/index.ts
+++ b/modules/@angular/compiler/index.ts
@@ -9,59 +9,8 @@
 /**
  * @module
  * @description
- * Entry point for all APIs of the compiler package.
- *
- * <div class="callout is-critical">
- *   <header>Unstable APIs</header>
- *   <p>
- *     All compiler apis are currently considered experimental and private!
- *   </p>
- *   <p>
- *     We expect the APIs in this package to keep on changing. Do not rely on them.
- *   </p>
- * </div>
+ * Entry point for all public APIs of the compiler package.
  */
-export {VERSION} from './src/version';
-export * from './src/template_parser/template_ast';
-export {TEMPLATE_TRANSFORMS} from './src/template_parser/template_parser';
-export {CompilerConfig, RenderTypes} from './src/config';
-export * from './src/compile_metadata';
-export * from './src/aot/compiler_factory';
-export * from './src/aot/compiler';
-export * from './src/aot/compiler_options';
-export * from './src/aot/compiler_host';
-export * from './src/aot/static_reflector';
-export * from './src/aot/static_reflection_capabilities';
-export * from './src/aot/static_symbol';
-export * from './src/aot/static_symbol_resolver';
-export * from './src/aot/summary_resolver';
-export * from './src/summary_resolver';
-export {JitCompiler} from './src/jit/compiler';
-export * from './src/jit/compiler_factory';
-export * from './src/url_resolver';
-export * from './src/resource_loader';
-export {DirectiveResolver} from './src/directive_resolver';
-export {PipeResolver} from './src/pipe_resolver';
-export {NgModuleResolver} from './src/ng_module_resolver';
-export {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from './src/ml_parser/interpolation_config';
-export * from './src/schema/element_schema_registry';
-export * from './src/i18n/index';
-export * from './src/directive_normalizer';
-export * from './src/expression_parser/lexer';
-export * from './src/expression_parser/parser';
-export * from './src/metadata_resolver';
-export * from './src/ml_parser/html_parser';
-export * from './src/ml_parser/interpolation_config';
-export {NgModuleCompiler} from './src/ng_module_compiler';
-export {DirectiveWrapperCompiler} from './src/directive_wrapper_compiler';
-export * from './src/output/path_util';
-export * from './src/output/ts_emitter';
-export * from './src/parse_util';
-export * from './src/schema/dom_element_schema_registry';
-export * from './src/selector';
-export * from './src/style_compiler';
-export * from './src/template_parser/template_parser';
-export {ViewCompiler} from './src/view_compiler/view_compiler';
-export {AnimationParser} from './src/animation/animation_parser';
-export {isSyntaxError, syntaxError} from './src/util';
+export * from './src/compiler';
+
 // This file only reexports content of the `src` folder. Keep it that way.
diff --git a/modules/@angular/compiler/package.json b/modules/@angular/compiler/package.json
index c8534846b3..72e6de1a38 100644
--- a/modules/@angular/compiler/package.json
+++ b/modules/@angular/compiler/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/compiler",
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the compiler library",
-  "main": "bundles/compiler.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/compiler.umd.js",
+  "module": "./@angular/compiler.es5.js",
+  "es2015": "./@angular/compiler.js",
+  "typings": "./typings/compiler.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/compiler/rollup-testing.config.js b/modules/@angular/compiler/rollup-testing.config.js
deleted file mode 100644
index 8772530d02..0000000000
--- a/modules/@angular/compiler/rollup-testing.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/compiler/testing/index.js',
-  dest: '../../../dist/packages-dist/compiler/bundles/compiler-testing.umd.js',
-  format: 'umd',
-  moduleName: 'ng.compiler.testing',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/core/testing': 'ng.core.testing',
-    '@angular/compiler': 'ng.compiler',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
-  }
-};
diff --git a/modules/@angular/compiler/rollup.config.js b/modules/@angular/compiler/rollup-umd.config.js
similarity index 89%
rename from modules/@angular/compiler/rollup.config.js
rename to modules/@angular/compiler/rollup-umd.config.js
index 4aa5777651..8227119479 100644
--- a/modules/@angular/compiler/rollup.config.js
+++ b/modules/@angular/compiler/rollup-umd.config.js
@@ -7,7 +7,7 @@
  */
 
 export default {
-  entry: '../../../dist/packages-dist/compiler/index.js',
+  entry: '../../../dist/packages-dist/compiler/es5/index.js',
   dest: '../../../dist/packages-dist/compiler/bundles/compiler.umd.js',
   format: 'umd',
   moduleName: 'ng.compiler',
diff --git a/modules/@angular/compiler/src/compile_metadata.ts b/modules/@angular/compiler/src/compile_metadata.ts
index a1f4e26994..1dd59751e3 100644
--- a/modules/@angular/compiler/src/compile_metadata.ts
+++ b/modules/@angular/compiler/src/compile_metadata.ts
@@ -6,7 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectionStrategy, ComponentFactory, ComponentRenderTypeV2, SchemaMetadata, Type, ViewEncapsulation, ɵLifecycleHooks, ɵreflector} from '@angular/core';
+import {
+  ChangeDetectionStrategy, ComponentFactory, SchemaMetadata, Type, ViewEncapsulation, ɵLifecycleHooks, ɵreflector,
+  RendererTypeV2
+} from '@angular/core';
 
 import {StaticSymbol} from './aot/static_symbol';
 import {ListWrapper} from './facade/collection';
diff --git a/modules/@angular/compiler/src/compiler.ts b/modules/@angular/compiler/src/compiler.ts
new file mode 100644
index 0000000000..b89d0f8c4d
--- /dev/null
+++ b/modules/@angular/compiler/src/compiler.ts
@@ -0,0 +1,70 @@
+/**
+ * @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 APIs of the compiler package.
+ *
+ * <div class="callout is-critical">
+ *   <header>Unstable APIs</header>
+ *   <p>
+ *     All compiler apis are currently considered experimental and private!
+ *   </p>
+ *   <p>
+ *     We expect the APIs in this package to keep on changing. Do not rely on them.
+ *   </p>
+ * </div>
+ */
+export {VERSION} from './version';
+export * from './template_parser/template_ast';
+export {TEMPLATE_TRANSFORMS} from './template_parser/template_parser';
+export {CompilerConfig, RenderTypes} from './config';
+export * from './compile_metadata';
+export * from './aot/compiler_factory';
+export * from './aot/compiler';
+export * from './aot/compiler_host';
+export * from './aot/static_reflector';
+export * from './aot/static_reflection_capabilities';
+export * from './aot/static_symbol';
+export * from './aot/static_symbol_resolver';
+export * from './aot/summary_resolver';
+export * from './summary_resolver';
+export {JitCompiler} from './jit/compiler';
+export * from './jit/compiler_factory';
+export * from './url_resolver';
+export * from './resource_loader';
+export {DirectiveResolver} from './directive_resolver';
+export {PipeResolver} from './pipe_resolver';
+export {NgModuleResolver} from './ng_module_resolver';
+export {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from './ml_parser/interpolation_config';
+export * from './schema/element_schema_registry';
+export * from './i18n/index';
+export * from './directive_normalizer';
+export * from './expression_parser/ast';
+export * from './expression_parser/lexer';
+export * from './expression_parser/parser';
+export * from './metadata_resolver';
+export * from './ml_parser/ast';
+export * from './ml_parser/html_parser';
+export * from './ml_parser/html_tags';
+export * from './ml_parser/interpolation_config';
+export * from './ml_parser/tags';
+export {NgModuleCompiler} from './ng_module_compiler';
+export {DirectiveWrapperCompiler} from './directive_wrapper_compiler';
+export * from './output/path_util';
+export * from './output/ts_emitter';
+export * from './parse_util';
+export * from './schema/dom_element_schema_registry';
+export * from './selector';
+export * from './style_compiler';
+export * from './template_parser/template_parser';
+export {ViewCompiler} from './view_compiler/view_compiler';
+export {AnimationParser} from './animation/animation_parser';
+export {isSyntaxError, syntaxError} from './util';
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/modules/@angular/compiler/src/identifiers.ts b/modules/@angular/compiler/src/identifiers.ts
index 06b021ff1e..520acd41d0 100644
--- a/modules/@angular/compiler/src/identifiers.ts
+++ b/modules/@angular/compiler/src/identifiers.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ANALYZE_FOR_ENTRY_COMPONENTS, ChangeDetectionStrategy, ChangeDetectorRef, ComponentFactory, ComponentFactoryResolver, ComponentRef, ElementRef, Injector, LOCALE_ID, NgModuleFactory, QueryList, RenderComponentType, Renderer, RendererTypeV2, SecurityContext, SimpleChange, TRANSLATIONS_FORMAT, TemplateRef, ViewContainerRef, ViewEncapsulation, ɵAnimationGroupPlayer, ɵAnimationKeyframe, ɵAnimationSequencePlayer, ɵAnimationStyles, ɵAnimationTransition, ɵAppView, ɵChangeDetectorStatus, ɵCodegenComponentFactoryResolver, ɵComponentRef_, ɵDebugAppView, ɵDebugContext, ɵNgModuleInjector, ɵNoOpAnimationPlayer, ɵStaticNodeDebugInfo, ɵTemplateRef_, ɵValueUnwrapper, ɵViewContainer, ɵViewType, ɵbalanceAnimationKeyframes, ɵclearStyles, ɵcollectAndResolveStyles, ɵdevModeEqual, ɵprepareFinalAnimationStyles, ɵreflector, ɵregisterModuleFactory, ɵrenderStyles, ɵviewEngine, ɵview_utils} from '@angular/core';
+import {ANALYZE_FOR_ENTRY_COMPONENTS, ChangeDetectionStrategy, ChangeDetectorRef, ComponentFactory, ComponentFactoryResolver, ComponentRef, ElementRef, Injector, LOCALE_ID, NgModuleFactory, QueryList, RenderComponentType, Renderer, SecurityContext, SimpleChange, TRANSLATIONS_FORMAT, TemplateRef, ViewContainerRef, ViewEncapsulation, ɵAnimationGroupPlayer, ɵAnimationKeyframe, ɵAnimationSequencePlayer, ɵAnimationStyles, ɵAnimationTransition, ɵAppView, ɵChangeDetectorStatus, ɵCodegenComponentFactoryResolver, ɵComponentRef_, ɵDebugAppView, ɵDebugContext, ɵEMPTY_ARRAY, ɵEMPTY_INLINE_ARRAY, ɵEMPTY_MAP, ɵInlineArray16, ɵInlineArray2, ɵInlineArray4, ɵInlineArray8, ɵInlineArrayDynamic, ɵNgModuleInjector, ɵNoOpAnimationPlayer, ɵStaticNodeDebugInfo, ɵTemplateRef_, ɵValueUnwrapper, ɵViewContainer, ɵViewType, ɵViewUtils, ɵanchorDef, ɵbalanceAnimationKeyframes, ɵcastByValue, ɵcheckBinding, ɵcheckBindingChange, ɵcheckRenderAttribute, ɵcheckRenderClass, ɵcheckRenderProperty, ɵcheckRenderStyle, ɵcheckRenderText, ɵclearStyles, ɵcollectAndResolveStyles, ɵcreateRendererTypeV2, ɵcreateRenderComponentType, ɵcreateRenderElement, ɵdevModeEqual, ɵdirectiveDef, ɵelementDef, ɵinlineInterpolate, ɵinterpolate, ɵngContentDef, ɵnodeValue, ɵnoop, ɵpipeDef, ɵprepareFinalAnimationStyles, ɵproviderDef, ɵpureArrayDef, ɵpureObjectDef, ɵpurePipeDef, ɵpureProxy1, ɵpureProxy10, ɵpureProxy2, ɵpureProxy3, ɵpureProxy4, ɵpureProxy5, ɵpureProxy6, ɵpureProxy7, ɵpureProxy8, ɵpureProxy9, ɵqueryDef, ɵreflector, ɵregisterModuleFactory, ɵrenderStyles, ɵselectOrCreateRenderHostElement, ɵsetBindingDebugInfo, ɵsetBindingDebugInfoForChanges, ɵsubscribeToRenderElement, ɵtextDef, ɵunwrapValue, ɵviewDef} from '@angular/core';
 
 import {CompileIdentifierMetadata, CompileTokenMetadata} from './compile_metadata';
 
@@ -16,7 +16,6 @@ const VIEW_UTILS_MODULE_URL = assetUrl('core', 'linker/view_utils');
 export interface IdentifierSpec {
   name: string;
   moduleUrl: string;
-  member?: string;
   runtime: any;
 }
 
@@ -26,8 +25,7 @@ export class Identifiers {
     moduleUrl: CORE,
     runtime: ANALYZE_FOR_ENTRY_COMPONENTS
   };
-  static ViewUtils: IdentifierSpec =
-      {name: 'ɵview_utils', moduleUrl: CORE, member: 'ViewUtils', runtime: ɵview_utils.ViewUtils};
+  static ViewUtils: IdentifierSpec = {name: 'ɵViewUtils', moduleUrl: CORE, runtime: ɵViewUtils};
   static AppView: IdentifierSpec = {name: 'ɵAppView', moduleUrl: CORE, runtime: ɵAppView};
   static DebugAppView:
       IdentifierSpec = {name: 'ɵDebugAppView', moduleUrl: CORE, runtime: ɵDebugAppView};
@@ -101,100 +99,59 @@ export class Identifiers {
     moduleUrl: CORE,
     runtime: ɵChangeDetectorStatus
   };
-  static checkBinding: IdentifierSpec = {
-    name: 'ɵview_utils',
-    moduleUrl: CORE,
-    member: 'checkBinding',
-    runtime: ɵview_utils.checkBinding
-  };
-  static checkBindingChange: IdentifierSpec = {
-    name: 'ɵview_utils',
-    moduleUrl: CORE,
-    member: 'checkBindingChange',
-    runtime: ɵview_utils.checkBindingChange
-  };
-  static checkRenderText: IdentifierSpec = {
-    name: 'ɵview_utils',
-    moduleUrl: CORE,
-    member: 'checkRenderText',
-    runtime: ɵview_utils.checkRenderText
-  };
+  static checkBinding:
+      IdentifierSpec = {name: 'ɵcheckBinding', moduleUrl: CORE, runtime: ɵcheckBinding};
+  static checkBindingChange:
+      IdentifierSpec = {name: 'ɵcheckBindingChange', moduleUrl: CORE, runtime: ɵcheckBindingChange};
+  static checkRenderText:
+      IdentifierSpec = {name: 'ɵcheckRenderText', moduleUrl: CORE, runtime: ɵcheckRenderText};
   static checkRenderProperty: IdentifierSpec = {
-    name: 'ɵview_utils',
+    name: 'ɵcheckRenderProperty',
     moduleUrl: CORE,
-    member: 'checkRenderProperty',
-    runtime: ɵview_utils.checkRenderProperty
+    runtime: ɵcheckRenderProperty
   };
   static checkRenderAttribute: IdentifierSpec = {
-    name: 'ɵview_utils',
+    name: 'ɵcheckRenderAttribute',
     moduleUrl: CORE,
-    member: 'checkRenderAttribute',
-    runtime: ɵview_utils.checkRenderAttribute
-  };
-  static checkRenderClass: IdentifierSpec = {
-    name: 'ɵview_utils',
-    moduleUrl: CORE,
-    member: 'checkRenderClass',
-    runtime: ɵview_utils.checkRenderClass
-  };
-  static checkRenderStyle: IdentifierSpec = {
-    name: 'ɵview_utils',
-    moduleUrl: CORE,
-    member: 'checkRenderStyle',
-    runtime: ɵview_utils.checkRenderStyle
+    runtime: ɵcheckRenderAttribute
   };
+  static checkRenderClass:
+      IdentifierSpec = {name: 'ɵcheckRenderClass', moduleUrl: CORE, runtime: ɵcheckRenderClass};
+  static checkRenderStyle:
+      IdentifierSpec = {name: 'ɵcheckRenderStyle', moduleUrl: CORE, runtime: ɵcheckRenderStyle};
   static devModeEqual:
       IdentifierSpec = {name: 'ɵdevModeEqual', moduleUrl: CORE, runtime: ɵdevModeEqual};
-  static inlineInterpolate: IdentifierSpec = {
-    name: 'ɵview_utils',
-    moduleUrl: CORE,
-    member: 'inlineInterpolate',
-    runtime: ɵview_utils.inlineInterpolate
-  };
-  static interpolate: IdentifierSpec = {
-    name: 'ɵview_utils',
-    moduleUrl: CORE,
-    member: 'interpolate',
-    runtime: ɵview_utils.interpolate
-  };
-  static castByValue: IdentifierSpec = {
-    name: 'ɵview_utils',
-    moduleUrl: CORE,
-    member: 'castByValue',
-    runtime: ɵview_utils.castByValue
-  };
-  static EMPTY_ARRAY: IdentifierSpec = {
-    name: 'ɵview_utils',
-    moduleUrl: CORE,
-    member: 'EMPTY_ARRAY',
-    runtime: ɵview_utils.EMPTY_ARRAY
-  };
-  static EMPTY_MAP: IdentifierSpec =
-      {name: 'ɵview_utils', moduleUrl: CORE, member: 'EMPTY_MAP', runtime: ɵview_utils.EMPTY_MAP};
+  static inlineInterpolate:
+      IdentifierSpec = {name: 'ɵinlineInterpolate', moduleUrl: CORE, runtime: ɵinlineInterpolate};
+  static interpolate:
+      IdentifierSpec = {name: 'ɵinterpolate', moduleUrl: CORE, runtime: ɵinterpolate};
+  static castByValue:
+      IdentifierSpec = {name: 'ɵcastByValue', moduleUrl: CORE, runtime: ɵcastByValue};
+  static EMPTY_ARRAY:
+      IdentifierSpec = {name: 'ɵEMPTY_ARRAY', moduleUrl: CORE, runtime: ɵEMPTY_ARRAY};
+  static EMPTY_MAP: IdentifierSpec = {name: 'ɵEMPTY_MAP', moduleUrl: CORE, runtime: ɵEMPTY_MAP};
   static createRenderElement: IdentifierSpec = {
-    name: 'ɵview_utils',
+    name: 'ɵcreateRenderElement',
     moduleUrl: CORE,
-    member: 'createRenderElement',
-    runtime: ɵview_utils.createRenderElement
+    runtime: ɵcreateRenderElement
   };
   static selectOrCreateRenderHostElement: IdentifierSpec = {
-    name: 'ɵview_utils',
+    name: 'ɵselectOrCreateRenderHostElement',
     moduleUrl: CORE,
-    member: 'selectOrCreateRenderHostElement',
-    runtime: ɵview_utils.selectOrCreateRenderHostElement
+    runtime: ɵselectOrCreateRenderHostElement
   };
   static pureProxies: IdentifierSpec[] = [
     null,
-    {name: 'ɵview_utils', moduleUrl: CORE, member: 'pureProxy1', runtime: ɵview_utils.pureProxy1},
-    {name: 'ɵview_utils', moduleUrl: CORE, member: 'pureProxy2', runtime: ɵview_utils.pureProxy2},
-    {name: 'ɵview_utils', moduleUrl: CORE, member: 'pureProxy3', runtime: ɵview_utils.pureProxy3},
-    {name: 'ɵview_utils', moduleUrl: CORE, member: 'pureProxy4', runtime: ɵview_utils.pureProxy4},
-    {name: 'ɵview_utils', moduleUrl: CORE, member: 'pureProxy5', runtime: ɵview_utils.pureProxy5},
-    {name: 'ɵview_utils', moduleUrl: CORE, member: 'pureProxy6', runtime: ɵview_utils.pureProxy6},
-    {name: 'ɵview_utils', moduleUrl: CORE, member: 'pureProxy7', runtime: ɵview_utils.pureProxy7},
-    {name: 'ɵview_utils', moduleUrl: CORE, member: 'pureProxy8', runtime: ɵview_utils.pureProxy8},
-    {name: 'ɵview_utils', moduleUrl: CORE, member: 'pureProxy9', runtime: ɵview_utils.pureProxy9},
-    {name: 'ɵview_utils', moduleUrl: CORE, member: 'pureProxy10', runtime: ɵview_utils.pureProxy10},
+    {name: 'ɵpureProxy1', moduleUrl: CORE, runtime: ɵpureProxy1},
+    {name: 'ɵpureProxy2', moduleUrl: CORE, runtime: ɵpureProxy2},
+    {name: 'ɵpureProxy3', moduleUrl: CORE, runtime: ɵpureProxy3},
+    {name: 'ɵpureProxy4', moduleUrl: CORE, runtime: ɵpureProxy4},
+    {name: 'ɵpureProxy5', moduleUrl: CORE, runtime: ɵpureProxy5},
+    {name: 'ɵpureProxy6', moduleUrl: CORE, runtime: ɵpureProxy6},
+    {name: 'ɵpureProxy7', moduleUrl: CORE, runtime: ɵpureProxy7},
+    {name: 'ɵpureProxy8', moduleUrl: CORE, runtime: ɵpureProxy8},
+    {name: 'ɵpureProxy9', moduleUrl: CORE, runtime: ɵpureProxy9},
+    {name: 'ɵpureProxy10', moduleUrl: CORE, runtime: ɵpureProxy10},
   ];
   static SecurityContext: IdentifierSpec = {
     name: 'SecurityContext',
@@ -243,16 +200,14 @@ export class Identifiers {
   static TRANSLATIONS_FORMAT:
       IdentifierSpec = {name: 'TRANSLATIONS_FORMAT', moduleUrl: CORE, runtime: TRANSLATIONS_FORMAT};
   static setBindingDebugInfo: IdentifierSpec = {
-    name: 'ɵview_utils',
+    name: 'ɵsetBindingDebugInfo',
     moduleUrl: CORE,
-    member: 'setBindingDebugInfo',
-    runtime: ɵview_utils.setBindingDebugInfo
+    runtime: ɵsetBindingDebugInfo
   };
   static setBindingDebugInfoForChanges: IdentifierSpec = {
-    name: 'ɵview_utils',
+    name: 'ɵsetBindingDebugInfoForChanges',
     moduleUrl: CORE,
-    member: 'setBindingDebugInfoForChanges',
-    runtime: ɵview_utils.setBindingDebugInfoForChanges
+    runtime: ɵsetBindingDebugInfoForChanges
   };
   static AnimationTransition: IdentifierSpec = {
     name: 'ɵAnimationTransition',
@@ -264,127 +219,55 @@ export class Identifiers {
   static InlineArray:
       IdentifierSpec = {name: 'InlineArray', moduleUrl: VIEW_UTILS_MODULE_URL, runtime: null};
   static inlineArrays: IdentifierSpec[] = [
-    {
-      name: 'ɵview_utils',
-      moduleUrl: CORE,
-      member: 'InlineArray2',
-      runtime: ɵview_utils.InlineArray2
-    },
-    {
-      name: 'ɵview_utils',
-      moduleUrl: CORE,
-      member: 'InlineArray2',
-      runtime: ɵview_utils.InlineArray2
-    },
-    {
-      name: 'ɵview_utils',
-      moduleUrl: CORE,
-      member: 'InlineArray4',
-      runtime: ɵview_utils.InlineArray4
-    },
-    {
-      name: 'ɵview_utils',
-      moduleUrl: CORE,
-      member: 'InlineArray8',
-      runtime: ɵview_utils.InlineArray8
-    },
-    {
-      name: 'ɵview_utils',
-      moduleUrl: CORE,
-      member: 'InlineArray16',
-      runtime: ɵview_utils.InlineArray16
-    },
+    {name: 'ɵInlineArray2', moduleUrl: CORE, runtime: ɵInlineArray2},
+    {name: 'ɵInlineArray2', moduleUrl: CORE, runtime: ɵInlineArray2},
+    {name: 'ɵInlineArray4', moduleUrl: CORE, runtime: ɵInlineArray4},
+    {name: 'ɵInlineArray8', moduleUrl: CORE, runtime: ɵInlineArray8},
+    {name: 'ɵInlineArray16', moduleUrl: CORE, runtime: ɵInlineArray16},
   ];
-  static EMPTY_INLINE_ARRAY: IdentifierSpec = {
-    name: 'ɵview_utils',
-    moduleUrl: CORE,
-    member: 'EMPTY_INLINE_ARRAY',
-    runtime: ɵview_utils.EMPTY_INLINE_ARRAY
-  };
-  static InlineArrayDynamic: IdentifierSpec = {
-    name: 'ɵview_utils',
-    moduleUrl: CORE,
-    member: 'InlineArrayDynamic',
-    runtime: ɵview_utils.InlineArrayDynamic
-  };
+  static EMPTY_INLINE_ARRAY:
+      IdentifierSpec = {name: 'ɵEMPTY_INLINE_ARRAY', moduleUrl: CORE, runtime: ɵEMPTY_INLINE_ARRAY};
+  static InlineArrayDynamic:
+      IdentifierSpec = {name: 'ɵInlineArrayDynamic', moduleUrl: CORE, runtime: ɵInlineArrayDynamic};
   static subscribeToRenderElement: IdentifierSpec = {
-    name: 'ɵview_utils',
+    name: 'ɵsubscribeToRenderElement',
     moduleUrl: CORE,
-    member: 'subscribeToRenderElement',
-    runtime: ɵview_utils.subscribeToRenderElement
+    runtime: ɵsubscribeToRenderElement
   };
   static createRenderComponentType: IdentifierSpec = {
-    name: 'ɵview_utils',
+    name: 'ɵcreateRenderComponentType',
     moduleUrl: CORE,
-    member: 'createRenderComponentType',
-    runtime: ɵview_utils.createRenderComponentType
+    runtime: ɵcreateRenderComponentType
   };
 
 
-  static noop: IdentifierSpec =
-      {name: 'ɵview_utils', moduleUrl: CORE, member: 'noop', runtime: ɵview_utils.noop};
+  static noop: IdentifierSpec = {name: 'ɵnoop', moduleUrl: CORE, runtime: ɵnoop};
 
-  static viewDef: IdentifierSpec =
-      {name: 'ɵviewEngine', moduleUrl: CORE, member: 'viewDef', runtime: ɵviewEngine.viewDef};
-  static elementDef: IdentifierSpec =
-      {name: 'ɵviewEngine', moduleUrl: CORE, member: 'elementDef', runtime: ɵviewEngine.elementDef};
-  static anchorDef: IdentifierSpec =
-      {name: 'ɵviewEngine', moduleUrl: CORE, member: 'anchorDef', runtime: ɵviewEngine.anchorDef};
-  static textDef: IdentifierSpec =
-      {name: 'ɵviewEngine', moduleUrl: CORE, member: 'textDef', runtime: ɵviewEngine.textDef};
-  static directiveDef: IdentifierSpec = {
-    name: 'ɵviewEngine',
-    moduleUrl: CORE,
-    member: 'directiveDef',
-    runtime: ɵviewEngine.directiveDef
-  };
-  static providerDef: IdentifierSpec = {
-    name: 'ɵviewEngine',
-    moduleUrl: CORE,
-    member: 'providerDef',
-    runtime: ɵviewEngine.providerDef
-  };
-  static queryDef: IdentifierSpec =
-      {name: 'ɵviewEngine', moduleUrl: CORE, member: 'queryDef', runtime: ɵviewEngine.queryDef};
-  static pureArrayDef: IdentifierSpec = {
-    name: 'ɵviewEngine',
-    moduleUrl: CORE,
-    member: 'pureArrayDef',
-    runtime: ɵviewEngine.pureArrayDef
-  };
-  static pureObjectDef: IdentifierSpec = {
-    name: 'ɵviewEngine',
-    moduleUrl: CORE,
-    member: 'pureObjectDef',
-    runtime: ɵviewEngine.pureObjectDef
-  };
-  static purePipeDef: IdentifierSpec = {
-    name: 'ɵviewEngine',
-    moduleUrl: CORE,
-    member: 'purePipeDef',
-    runtime: ɵviewEngine.purePipeDef
-  };
-  static pipeDef: IdentifierSpec =
-      {name: 'ɵviewEngine', moduleUrl: CORE, member: 'pipeDef', runtime: ɵviewEngine.pipeDef};
-  static nodeValue: IdentifierSpec =
-      {name: 'ɵviewEngine', moduleUrl: CORE, member: 'nodeValue', runtime: ɵviewEngine.nodeValue};
-  static ngContentDef: IdentifierSpec = {
-    name: 'ɵviewEngine',
-    moduleUrl: CORE,
-    member: 'ngContentDef',
-    runtime: ɵviewEngine.ngContentDef
-  };
-  static unwrapValue: IdentifierSpec = {
-    name: 'ɵviewEngine',
-    moduleUrl: CORE,
-    member: 'unwrapValue',
-    runtime: ɵviewEngine.unwrapValue
-  };
+  static viewDef: IdentifierSpec = {name: 'ɵviewDef', moduleUrl: CORE, runtime: ɵviewDef};
+  static elementDef: IdentifierSpec = {name: 'ɵelementDef', moduleUrl: CORE, runtime: ɵelementDef};
+  static anchorDef: IdentifierSpec = {name: 'ɵanchorDef', moduleUrl: CORE, runtime: ɵanchorDef};
+  static textDef: IdentifierSpec = {name: 'ɵtextDef', moduleUrl: CORE, runtime: ɵtextDef};
+  static directiveDef:
+      IdentifierSpec = {name: 'ɵdirectiveDef', moduleUrl: CORE, runtime: ɵdirectiveDef};
+  static providerDef:
+      IdentifierSpec = {name: 'ɵproviderDef', moduleUrl: CORE, runtime: ɵproviderDef};
+  static queryDef: IdentifierSpec = {name: 'ɵqueryDef', moduleUrl: CORE, runtime: ɵqueryDef};
+  static pureArrayDef:
+      IdentifierSpec = {name: 'ɵpureArrayDef', moduleUrl: CORE, runtime: ɵpureArrayDef};
+  static pureObjectDef:
+      IdentifierSpec = {name: 'ɵpureObjectRef', moduleUrl: CORE, runtime: ɵpureObjectDef};
+  static purePipeDef:
+      IdentifierSpec = {name: 'ɵpurePipeDef', moduleUrl: CORE, runtime: ɵpurePipeDef};
+  static pipeDef: IdentifierSpec = {name: 'ɵpipeDef', moduleUrl: CORE, runtime: ɵpipeDef};
+  static nodeValue: IdentifierSpec = {name: 'ɵnodeValue', moduleUrl: CORE, runtime: ɵnodeValue};
+  static ngContentDef:
+      IdentifierSpec = {name: 'ɵngContentDef', moduleUrl: CORE, runtime: ɵngContentDef};
+  static unwrapValue:
+      IdentifierSpec = {name: 'ɵunwrapValue', moduleUrl: CORE, runtime: ɵunwrapValue};
   static createRendererTypeV2: IdentifierSpec = {
-    name: 'ɵviewEngine',
+    name: 'ɵcreateRendererTypeV2',
     moduleUrl: CORE,
-    member: 'createRendererTypeV2',
-    runtime: ɵviewEngine.createRendererTypeV2
+    runtime: ɵcreateRendererTypeV2
   };
   static RendererTypeV2: IdentifierSpec = {
     name: 'RendererTypeV2',
@@ -417,8 +300,7 @@ export function assetUrl(pkg: string, path: string = null, type: string = 'src')
 
 export function resolveIdentifier(identifier: IdentifierSpec) {
   let name = identifier.name;
-  let members = identifier.member && [identifier.member];
-  return ɵreflector.resolveIdentifier(name, identifier.moduleUrl, members, identifier.runtime);
+  return ɵreflector.resolveIdentifier(name, identifier.moduleUrl, null, identifier.runtime);
 }
 
 export function createIdentifier(identifier: IdentifierSpec): CompileIdentifierMetadata {
diff --git a/modules/@angular/compiler/src/injectable.ts b/modules/@angular/compiler/src/injectable.ts
index 59b94d13a1..b5dcb4ec2e 100644
--- a/modules/@angular/compiler/src/injectable.ts
+++ b/modules/@angular/compiler/src/injectable.ts
@@ -10,6 +10,7 @@
  * A replacement for @Injectable to be used in the compiler, so that
  * we don't try to evaluate the metadata in the compiler during AoT.
  * This decorator is enough to make the compiler work with the ReflectiveInjector though.
+ * @Annotation
  */
 export function CompilerInjectable(): (data: any) => any {
   return (x) => x;
diff --git a/modules/@angular/compiler/src/jit/compiler.ts b/modules/@angular/compiler/src/jit/compiler.ts
index 42b247f805..d9d702263d 100644
--- a/modules/@angular/compiler/src/jit/compiler.ts
+++ b/modules/@angular/compiler/src/jit/compiler.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Compiler, ComponentFactory, ComponentRenderTypeV2, Inject, Injector, ModuleWithComponentFactories, NgModuleFactory, Type, ɵview_utils as view_utils} from '@angular/core';
+import {Compiler, ComponentFactory, Inject, Injector, ModuleWithComponentFactories, NgModuleFactory, Type, ɵgetComponentFactoryViewClass as getComponentFactoryViewClass} from '@angular/core';
 
 import {AnimationCompiler} from '../animation/animation_compiler';
 import {AnimationParser} from '../animation/animation_parser';
@@ -221,7 +221,7 @@ export class JitCompiler implements Compiler {
       const componentFactory = <ComponentFactory<any>>compMeta.componentFactory;
       const hostClass = this._metadataResolver.getHostComponentType(compType);
       const hostMeta = createHostComponentMeta(
-          hostClass, compMeta, <any>view_utils.getComponentFactoryViewClass(componentFactory));
+          hostClass, compMeta, <any>getComponentFactoryViewClass(componentFactory));
       compiledTemplate =
           new CompiledTemplate(true, compMeta.type, hostMeta, ngModule, [compMeta.type]);
       this._compiledHostTemplateCache.set(compType, compiledTemplate);
diff --git a/modules/@angular/compiler/src/metadata_resolver.ts b/modules/@angular/compiler/src/metadata_resolver.ts
index 40c84e71bf..b5b6b08036 100644
--- a/modules/@angular/compiler/src/metadata_resolver.ts
+++ b/modules/@angular/compiler/src/metadata_resolver.ts
@@ -6,7 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AnimationAnimateMetadata, AnimationEntryMetadata, AnimationGroupMetadata, AnimationKeyframesSequenceMetadata, AnimationMetadata, AnimationStateDeclarationMetadata, AnimationStateMetadata, AnimationStateTransitionMetadata, AnimationStyleMetadata, AnimationWithStepsMetadata, Attribute, ChangeDetectionStrategy, Component, ComponentFactory, ComponentRenderTypeV2, Directive, Host, Inject, Injectable, InjectionToken, ModuleWithProviders, Optional, Provider, Query, SchemaMetadata, Self, SkipSelf, Type, resolveForwardRef, ɵERROR_COMPONENT_TYPE, ɵLIFECYCLE_HOOKS_VALUES, ɵReflectorReader, ɵreflector, ɵviewEngine} from '@angular/core';
+import {
+  AnimationAnimateMetadata, AnimationEntryMetadata, AnimationGroupMetadata, AnimationKeyframesSequenceMetadata,
+  AnimationMetadata, AnimationStateDeclarationMetadata, AnimationStateMetadata, AnimationStateTransitionMetadata,
+  AnimationStyleMetadata, AnimationWithStepsMetadata, Attribute, ChangeDetectionStrategy, Component, ComponentFactory,
+  Directive, Host, Inject, Injectable, InjectionToken, ModuleWithProviders, Optional, Provider, Query, SchemaMetadata,
+  Self, SkipSelf, Type, resolveForwardRef, ɵERROR_COMPONENT_TYPE, ɵLIFECYCLE_HOOKS_VALUES, ɵReflectorReader,
+  ɵcreateComponentFactory as createComponentFactory, ɵreflector, RendererTypeV2
+} from '@angular/core';
 
 import {StaticSymbol, StaticSymbolCache} from './aot/static_symbol';
 import {ngfactoryFilePath} from './aot/util';
@@ -151,7 +158,7 @@ export class CompileMetadataResolver {
     } else {
       const hostView = this.getHostComponentViewClass(dirType);
       if (this._config.useViewEngine) {
-        return ɵviewEngine.createComponentFactory(selector, dirType, <any>hostView);
+        return createComponentFactory(selector, dirType, <any>hostView);
       } else {
         return new ComponentFactory(selector, <any>hostView, dirType);
       }
diff --git a/modules/@angular/compiler/src/view_compiler_next/view_compiler.ts b/modules/@angular/compiler/src/view_compiler_next/view_compiler.ts
index f5d5a57a9a..f6efbd27ed 100644
--- a/modules/@angular/compiler/src/view_compiler_next/view_compiler.ts
+++ b/modules/@angular/compiler/src/view_compiler_next/view_compiler.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChangeDetectionStrategy, ViewEncapsulation, ɵLifecycleHooks as LifecycleHooks, ɵviewEngine as viewEngine} from '@angular/core';
+import {ChangeDetectionStrategy, ViewEncapsulation, ɵArgumentType as ArgumentType, ɵBindingType as BindingType, ɵDepFlags as DepFlags, ɵLifecycleHooks as LifecycleHooks, ɵNodeFlags as NodeFlags, ɵProviderType as ProviderType, ɵQueryBindingType as QueryBindingType, ɵQueryValueType as QueryValueType, ɵViewFlags as ViewFlags, ɵelementEventFullName as elementEventFullName} from '@angular/core';
 
 import {AnimationEntryCompileResult} from '../animation/animation_compiler';
 import {CompileDiDependencyMetadata, CompileDirectiveMetadata, CompileDirectiveSummary, CompilePipeSummary, CompileProviderMetadata, CompileTokenMetadata, CompileTypeMetadata, identifierModuleUrl, identifierName, rendererTypeName, tokenReference, viewClassName} from '../compile_metadata';
@@ -130,12 +130,12 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
         // Note: queries start with id 1 so we can use the number in a Bloom filter!
         const queryId = queryIndex + 1;
         const bindingType =
-            query.first ? viewEngine.QueryBindingType.First : viewEngine.QueryBindingType.All;
-        let flags = viewEngine.NodeFlags.HasViewQuery;
+            query.first ? QueryBindingType.First : QueryBindingType.All;
+        let flags = NodeFlags.HasViewQuery;
         if (queryIds.staticQueryIds.has(queryId)) {
-          flags |= viewEngine.NodeFlags.HasStaticQuery;
+          flags |= NodeFlags.HasStaticQuery;
         } else {
-          flags |= viewEngine.NodeFlags.HasDynamicQuery;
+          flags |= NodeFlags.HasDynamicQuery;
         }
         this.nodeDefs.push(() => o.importExpr(createIdentifier(Identifiers.queryDef)).callFn([
           o.literal(flags), o.literal(queryId),
@@ -149,7 +149,7 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
       // if the view is empty, or an embedded view has a view container as last root nde,
       // create an additional root node.
       this.nodeDefs.push(() => o.importExpr(createIdentifier(Identifiers.anchorDef)).callFn([
-        o.literal(viewEngine.NodeFlags.None), o.NULL_EXPR, o.NULL_EXPR, o.literal(0)
+        o.literal(NodeFlags.None), o.NULL_EXPR, o.NULL_EXPR, o.literal(0)
       ]));
     }
   }
@@ -161,9 +161,9 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
     const updateRendererFn = this._createUpdateFn(this.updateRendererExpressions);
 
 
-    let viewFlags = viewEngine.ViewFlags.None;
+    let viewFlags = ViewFlags.None;
     if (!this.parent && this.component.changeDetection === ChangeDetectionStrategy.OnPush) {
-      viewFlags |= viewEngine.ViewFlags.OnPush;
+      viewFlags |= ViewFlags.OnPush;
     }
     const viewFactory = new o.DeclareFunctionStmt(
         this.viewName, [],
@@ -342,19 +342,17 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
     hostBindings: {value: AST, context: o.Expression}[],
     hostEvents: {context: o.Expression, eventAst: BoundEventAst}[],
   } {
-    let flags = viewEngine.NodeFlags.None;
+    let flags = NodeFlags.None;
     if (ast.hasViewContainer) {
-      flags |= viewEngine.NodeFlags.HasEmbeddedViews;
+      flags |= NodeFlags.HasEmbeddedViews;
     }
     const usedEvents = new Map<string, [string, string]>();
     ast.outputs.forEach((event) => {
-      usedEvents.set(
-          viewEngine.elementEventFullName(event.target, event.name), [event.target, event.name]);
+      usedEvents.set(elementEventFullName(event.target, event.name), [event.target, event.name]);
     });
     ast.directives.forEach((dirAst) => {
       dirAst.hostEvents.forEach((event) => {
-        usedEvents.set(
-            viewEngine.elementEventFullName(event.target, event.name), [event.target, event.name]);
+        usedEvents.set(elementEventFullName(event.target, event.name), [event.target, event.name]);
       });
     });
     const hostBindings: {value: AST, context: o.Expression}[] = [];
@@ -388,11 +386,11 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
     ast.queryMatches.forEach((match) => {
       let valueType: number;
       if (tokenReference(match.value) === resolveIdentifier(Identifiers.ElementRef)) {
-        valueType = viewEngine.QueryValueType.ElementRef;
+        valueType = QueryValueType.ElementRef;
       } else if (tokenReference(match.value) === resolveIdentifier(Identifiers.ViewContainerRef)) {
-        valueType = viewEngine.QueryValueType.ViewContainerRef;
+        valueType = QueryValueType.ViewContainerRef;
       } else if (tokenReference(match.value) === resolveIdentifier(Identifiers.TemplateRef)) {
-        valueType = viewEngine.QueryValueType.TemplateRef;
+        valueType = QueryValueType.TemplateRef;
       }
       if (valueType != null) {
         queryMatchExprs.push(o.literalArr([o.literal(match.queryId), o.literal(valueType)]));
@@ -401,9 +399,9 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
     ast.references.forEach((ref) => {
       let valueType: number;
       if (!ref.value) {
-        valueType = viewEngine.QueryValueType.RenderElement;
+        valueType = QueryValueType.RenderElement;
       } else if (tokenReference(ref.value) === resolveIdentifier(Identifiers.TemplateRef)) {
-        valueType = viewEngine.QueryValueType.TemplateRef;
+        valueType = QueryValueType.TemplateRef;
       }
       if (valueType != null) {
         this.refNodeIndices[ref.name] = nodeIndex;
@@ -434,15 +432,15 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
     this.nodeDefs.push(null);
 
     directiveAst.directive.queries.forEach((query, queryIndex) => {
-      let flags = viewEngine.NodeFlags.HasContentQuery;
+      let flags = NodeFlags.HasContentQuery;
       const queryId = directiveAst.contentQueryStartId + queryIndex;
       if (queryIds.staticQueryIds.has(queryId)) {
-        flags |= viewEngine.NodeFlags.HasStaticQuery;
+        flags |= NodeFlags.HasStaticQuery;
       } else {
-        flags |= viewEngine.NodeFlags.HasDynamicQuery;
+        flags |= NodeFlags.HasDynamicQuery;
       }
       const bindingType =
-          query.first ? viewEngine.QueryBindingType.First : viewEngine.QueryBindingType.All;
+          query.first ? QueryBindingType.First : QueryBindingType.All;
       this.nodeDefs.push(() => o.importExpr(createIdentifier(Identifiers.queryDef)).callFn([
         o.literal(flags), o.literal(queryId),
         new o.LiteralMapExpr([new o.LiteralMapEntry(query.propertyName, o.literal(bindingType))])
@@ -462,7 +460,7 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
       if (ref.value && tokenReference(ref.value) === tokenReference(providerAst.token)) {
         this.refNodeIndices[ref.name] = nodeIndex;
         queryMatchExprs.push(
-            o.literalArr([o.literal(ref.name), o.literal(viewEngine.QueryValueType.Provider)]));
+            o.literalArr([o.literal(ref.name), o.literal(QueryValueType.Provider)]));
       }
     });
 
@@ -489,7 +487,7 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
       }
     });
     if (directiveAst.inputs.length ||
-        (flags & (viewEngine.NodeFlags.DoCheck | viewEngine.NodeFlags.OnInit)) > 0) {
+        (flags & (NodeFlags.DoCheck | NodeFlags.OnInit)) > 0) {
       this._addUpdateExpressions(
           nodeIndex,
           directiveAst.inputs.map((input) => { return {context: COMP_VAR, value: input.value}; }),
@@ -551,12 +549,12 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
     providerType: number,
     depsExpr: o.Expression
   } {
-    let flags = viewEngine.NodeFlags.None;
+    let flags = NodeFlags.None;
     if (!providerAst.eager) {
-      flags |= viewEngine.NodeFlags.LazyProvider;
+      flags |= NodeFlags.LazyProvider;
     }
     if (providerAst.providerType === ProviderAstType.PrivateService) {
-      flags |= viewEngine.NodeFlags.PrivateProvider;
+      flags |= NodeFlags.PrivateProvider;
     }
     providerAst.lifecycleHooks.forEach((lifecycleHook) => {
       // for regular providers, we only support ngOnDestroy
@@ -570,8 +568,8 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
 
     queryMatches.forEach((match) => {
       if (tokenReference(match.value) === tokenReference(providerAst.token)) {
-        queryMatchExprs.push(o.literalArr(
-            [o.literal(match.queryId), o.literal(viewEngine.QueryValueType.Provider)]));
+        queryMatchExprs.push(
+            o.literalArr([o.literal(match.queryId), o.literal(QueryValueType.Provider)]));
       }
     });
     const {providerExpr, providerType, depsExpr} = providerDef(providerAst);
@@ -672,7 +670,7 @@ class ViewBuilder implements TemplateAstVisitor, LocalResolver, BuiltinConverter
 
   private _createPipe(pipe: CompilePipeSummary): number {
     const nodeIndex = this.nodeDefs.length;
-    let flags = viewEngine.NodeFlags.None;
+    let flags = NodeFlags.None;
     pipe.type.lifecycleHooks.forEach((lifecycleHook) => {
       // for pipes, we only support ngOnDestroy
       if (lifecycleHook === LifecycleHooks.OnDestroy) {
@@ -782,7 +780,7 @@ function multiProviderDef(providers: CompileProviderMetadata[]):
       o.fn(allParams, [new o.ReturnStatement(o.literalArr(exprs))], o.INFERRED_TYPE);
   return {
     providerExpr,
-    providerType: viewEngine.ProviderType.Factory,
+    providerType: ProviderType.Factory,
     depsExpr: o.literalArr(allDepDefs)
   };
 
@@ -803,19 +801,19 @@ function singleProviderDef(providerMeta: CompileProviderMetadata):
   let deps: CompileDiDependencyMetadata[];
   if (providerMeta.useClass) {
     providerExpr = o.importExpr(providerMeta.useClass);
-    providerType = viewEngine.ProviderType.Class;
+    providerType = ProviderType.Class;
     deps = providerMeta.deps || providerMeta.useClass.diDeps;
   } else if (providerMeta.useFactory) {
     providerExpr = o.importExpr(providerMeta.useFactory);
-    providerType = viewEngine.ProviderType.Factory;
+    providerType = ProviderType.Factory;
     deps = providerMeta.deps || providerMeta.useFactory.diDeps;
   } else if (providerMeta.useExisting) {
     providerExpr = o.NULL_EXPR;
-    providerType = viewEngine.ProviderType.UseExisting;
+    providerType = ProviderType.UseExisting;
     deps = [{token: providerMeta.useExisting}];
   } else {
     providerExpr = convertValueToOutputAst(providerMeta.useValue);
-    providerType = viewEngine.ProviderType.Value;
+    providerType = ProviderType.Value;
     deps = [];
   }
   const depsExpr = o.literalArr(deps.map(dep => depDef(dep)));
@@ -830,17 +828,17 @@ function depDef(dep: CompileDiDependencyMetadata): o.Expression {
   // Note: the following fields have already been normalized out by provider_analyzer:
   // - isAttribute, isSelf, isHost
   const expr = dep.isValue ? convertValueToOutputAst(dep.value) : tokenExpr(dep.token);
-  let flags = viewEngine.DepFlags.None;
+  let flags = DepFlags.None;
   if (dep.isSkipSelf) {
-    flags |= viewEngine.DepFlags.SkipSelf;
+    flags |= DepFlags.SkipSelf;
   }
   if (dep.isOptional) {
-    flags |= viewEngine.DepFlags.Optional;
+    flags |= DepFlags.Optional;
   }
   if (dep.isValue) {
-    flags |= viewEngine.DepFlags.Value;
+    flags |= DepFlags.Value;
   }
-  return flags === viewEngine.DepFlags.None ? expr : o.literalArr([o.literal(flags), expr]);
+  return flags === DepFlags.None ? expr : o.literalArr([o.literal(flags), expr]);
 }
 
 function needsAdditionalRootNode(ast: TemplateAst): boolean {
@@ -859,31 +857,31 @@ function needsAdditionalRootNode(ast: TemplateAst): boolean {
 }
 
 function lifecycleHookToNodeFlag(lifecycleHook: LifecycleHooks): number {
-  let nodeFlag = viewEngine.NodeFlags.None;
+  let nodeFlag = NodeFlags.None;
   switch (lifecycleHook) {
     case LifecycleHooks.AfterContentChecked:
-      nodeFlag = viewEngine.NodeFlags.AfterContentChecked;
+      nodeFlag = NodeFlags.AfterContentChecked;
       break;
     case LifecycleHooks.AfterContentInit:
-      nodeFlag = viewEngine.NodeFlags.AfterContentInit;
+      nodeFlag = NodeFlags.AfterContentInit;
       break;
     case LifecycleHooks.AfterViewChecked:
-      nodeFlag = viewEngine.NodeFlags.AfterViewChecked;
+      nodeFlag = NodeFlags.AfterViewChecked;
       break;
     case LifecycleHooks.AfterViewInit:
-      nodeFlag = viewEngine.NodeFlags.AfterViewInit;
+      nodeFlag = NodeFlags.AfterViewInit;
       break;
     case LifecycleHooks.DoCheck:
-      nodeFlag = viewEngine.NodeFlags.DoCheck;
+      nodeFlag = NodeFlags.DoCheck;
       break;
     case LifecycleHooks.OnChanges:
-      nodeFlag = viewEngine.NodeFlags.OnChanges;
+      nodeFlag = NodeFlags.OnChanges;
       break;
     case LifecycleHooks.OnDestroy:
-      nodeFlag = viewEngine.NodeFlags.OnDestroy;
+      nodeFlag = NodeFlags.OnDestroy;
       break;
     case LifecycleHooks.OnInit:
-      nodeFlag = viewEngine.NodeFlags.OnInit;
+      nodeFlag = NodeFlags.OnInit;
       break;
   }
   return nodeFlag;
@@ -894,12 +892,12 @@ function elementBindingDefs(inputAsts: BoundElementPropertyAst[]): o.Expression[
     switch (inputAst.type) {
       case PropertyBindingType.Attribute:
         return o.literalArr([
-          o.literal(viewEngine.BindingType.ElementAttribute), o.literal(inputAst.name),
+          o.literal(BindingType.ElementAttribute), o.literal(inputAst.name),
           o.literal(inputAst.securityContext)
         ]);
       case PropertyBindingType.Property:
         return o.literalArr([
-          o.literal(viewEngine.BindingType.ElementProperty), o.literal(inputAst.name),
+          o.literal(BindingType.ElementProperty), o.literal(inputAst.name),
           o.literal(inputAst.securityContext)
         ]);
       case PropertyBindingType.Animation:
@@ -908,12 +906,10 @@ function elementBindingDefs(inputAsts: BoundElementPropertyAst[]): o.Expression[
           o.literal(inputAst.securityContext)
         ]);
       case PropertyBindingType.Class:
-        return o.literalArr(
-            [o.literal(viewEngine.BindingType.ElementClass), o.literal(inputAst.name)]);
+        return o.literalArr([o.literal(BindingType.ElementClass), o.literal(inputAst.name)]);
       case PropertyBindingType.Style:
         return o.literalArr([
-          o.literal(viewEngine.BindingType.ElementStyle), o.literal(inputAst.name),
-          o.literal(inputAst.unit)
+          o.literal(BindingType.ElementStyle), o.literal(inputAst.name), o.literal(inputAst.unit)
         ]);
     }
   });
@@ -947,13 +943,11 @@ function mergeAttributeValue(attrName: string, attrValue1: string, attrValue2: s
 
 function callCheckStmt(nodeIndex: number, exprs: o.Expression[]): o.Expression {
   if (exprs.length > 10) {
-    return CHECK_VAR.callFn([
-      VIEW_VAR, o.literal(nodeIndex), o.literal(viewEngine.ArgumentType.Dynamic),
-      o.literalArr(exprs)
-    ]);
+    return CHECK_VAR.callFn(
+        [VIEW_VAR, o.literal(nodeIndex), o.literal(ArgumentType.Dynamic), o.literalArr(exprs)]);
   } else {
     return CHECK_VAR.callFn(
-        [VIEW_VAR, o.literal(nodeIndex), o.literal(viewEngine.ArgumentType.Inline), ...exprs]);
+        [VIEW_VAR, o.literal(nodeIndex), o.literal(ArgumentType.Inline), ...exprs]);
   }
 }
 
diff --git a/modules/@angular/compiler/tsconfig-build.json b/modules/@angular/compiler/tsconfig-build.json
index 580dff9d18..85e3335637 100644
--- a/modules/@angular/compiler/tsconfig-build.json
+++ b/modules/@angular/compiler/tsconfig-build.json
@@ -15,7 +15,7 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "lib": ["es2015", "dom"],
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
diff --git a/modules/@angular/compiler/tsconfig-es5.json b/modules/@angular/compiler/tsconfig-es5.json
new file mode 100644
index 0000000000..855d8fcce6
--- /dev/null
+++ b/modules/@angular/compiler/tsconfig-es5.json
@@ -0,0 +1,9 @@
+
+{
+  "extends": "./tsconfig-build",
+
+  "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/compiler/es5",
+    "target": "es5"
+  }
+}
diff --git a/modules/@angular/compiler/tsconfig-testing.json b/modules/@angular/compiler/tsconfig-testing.json
index cd278208ac..365bedb9c1 100644
--- a/modules/@angular/compiler/tsconfig-testing.json
+++ b/modules/@angular/compiler/tsconfig-testing.json
@@ -4,6 +4,7 @@
   "compilerOptions": {
     // Test that we rely on decorator downleveling
     "emitDecoratorMetadata": false,
+    "outDir": "../../../dist/packages-dist/compiler",
     "paths": {
       "@angular/core": ["../../../dist/packages-dist/core"],
       "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
diff --git a/modules/@angular/core/.babelrc b/modules/@angular/core/.babelrc
new file mode 100644
index 0000000000..c01af9d746
--- /dev/null
+++ b/modules/@angular/core/.babelrc
@@ -0,0 +1,13 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "rxjs/Subject": "Rx"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/core"
+}
+
diff --git a/modules/@angular/core/package.json b/modules/@angular/core/package.json
index ceae5fe46e..b01e73f373 100644
--- a/modules/@angular/core/package.json
+++ b/modules/@angular/core/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/core",
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the core framework",
-  "main": "bundles/core.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/core.umd.js",
+  "module": "./@angular/core.es5.js",
+  "es2015": "./@angular/core.js",
+  "typings": "./typings/core.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/core/rollup-testing.config.js b/modules/@angular/core/rollup-testing.config.js
deleted file mode 100644
index bf27b75a40..0000000000
--- a/modules/@angular/core/rollup-testing.config.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/core/testing/index.js',
-  dest: '../../../dist/packages-dist/core/bundles/core-testing.umd.js',
-  format: 'umd',
-  moduleName: 'ng.core.testing',
-  globals: {
-    '@angular/core': 'ng.core',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx',
-  }
-};
diff --git a/modules/@angular/core/rollup.config.js b/modules/@angular/core/rollup.config.js
deleted file mode 100644
index c13b6b6f6b..0000000000
--- a/modules/@angular/core/rollup.config.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/core/index.js',
-  dest: '../../../dist/packages-dist/core/bundles/core.umd.js',
-  format: 'umd',
-  moduleName: 'ng.core',
-  globals: {
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx',
-  }
-};
diff --git a/modules/@angular/core/src/codegen_private_exports.ts b/modules/@angular/core/src/codegen_private_exports.ts
index ba9ae5a17a..6b0bcc75f9 100644
--- a/modules/@angular/core/src/codegen_private_exports.ts
+++ b/modules/@angular/core/src/codegen_private_exports.ts
@@ -6,9 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import * as view_utils from './linker/view_utils';
-import * as viewEngine from './view/index';
-
 export {AnimationGroupPlayer as ɵAnimationGroupPlayer} from './animation/animation_group_player';
 export {AnimationKeyframe as ɵAnimationKeyframe} from './animation/animation_keyframe';
 export {NoOpAnimationPlayer as ɵNoOpAnimationPlayer} from './animation/animation_player';
@@ -28,5 +25,5 @@ export {AppView as ɵAppView, DebugAppView as ɵDebugAppView} from './linker/vie
 export {ViewContainer as ɵViewContainer} from './linker/view_container';
 export {ViewType as ɵViewType} from './linker/view_type';
 export {reflector as ɵreflector} from './reflection/reflection';
-export {view_utils as ɵview_utils};
-export {viewEngine as ɵviewEngine};
\ No newline at end of file
+export {ViewUtils as ɵViewUtils, checkBinding as ɵcheckBinding, checkBindingChange as ɵcheckBindingChange, checkRenderText as ɵcheckRenderText, checkRenderProperty as ɵcheckRenderProperty, checkRenderAttribute as ɵcheckRenderAttribute, checkRenderClass as ɵcheckRenderClass, checkRenderStyle as ɵcheckRenderStyle, inlineInterpolate as ɵinlineInterpolate, interpolate as ɵinterpolate, castByValue as ɵcastByValue, EMPTY_ARRAY as ɵEMPTY_ARRAY, EMPTY_MAP as ɵEMPTY_MAP, createRenderElement as ɵcreateRenderElement, selectOrCreateRenderHostElement as ɵselectOrCreateRenderHostElement, pureProxy1 as ɵpureProxy1, pureProxy2 as ɵpureProxy2, pureProxy3 as ɵpureProxy3, pureProxy4 as ɵpureProxy4, pureProxy5 as ɵpureProxy5, pureProxy6 as ɵpureProxy6, pureProxy7 as ɵpureProxy7, pureProxy8 as ɵpureProxy8, pureProxy9 as ɵpureProxy9, pureProxy10 as ɵpureProxy10, noop as ɵnoop, setBindingDebugInfo as ɵsetBindingDebugInfo, setBindingDebugInfoForChanges as ɵsetBindingDebugInfoForChanges, InlineArray2 as ɵInlineArray2, InlineArray4 as ɵInlineArray4, InlineArray8 as ɵInlineArray8, InlineArray16 as ɵInlineArray16, EMPTY_INLINE_ARRAY as ɵEMPTY_INLINE_ARRAY, InlineArrayDynamic as ɵInlineArrayDynamic, subscribeToRenderElement as ɵsubscribeToRenderElement, createRenderComponentType as ɵcreateRenderComponentType, getComponentFactoryViewClass as ɵgetComponentFactoryViewClass} from './linker/view_utils';
+export {viewDef as ɵviewDef, elementDef as ɵelementDef, anchorDef as ɵanchorDef, textDef as ɵtextDef, directiveDef as ɵdirectiveDef, providerDef as ɵproviderDef, queryDef as ɵqueryDef, pureArrayDef as ɵpureArrayDef, pureObjectDef as ɵpureObjectDef, purePipeDef as ɵpurePipeDef, pipeDef as ɵpipeDef, nodeValue as ɵnodeValue, ngContentDef as ɵngContentDef, unwrapValue as ɵunwrapValue, NodeFlags as ɵNodeFlags, ViewFlags as ɵViewFlags, elementEventFullName as ɵelementEventFullName, QueryValueType as ɵQueryValueType, QueryBindingType as ɵQueryBindingType, ProviderType as ɵProviderType, BindingType as ɵBindingType, ArgumentType as ɵArgumentType, DepFlags as ɵDepFlags, createComponentFactory as ɵcreateComponentFactory, createRendererTypeV2 as ɵcreateRendererTypeV2} from './view/index';
diff --git a/modules/@angular/core/testing/testing.ts b/modules/@angular/core/testing/before_each.ts
similarity index 100%
rename from modules/@angular/core/testing/testing.ts
rename to modules/@angular/core/testing/before_each.ts
diff --git a/modules/@angular/core/testing/index.ts b/modules/@angular/core/testing/index.ts
index f913cb0202..9051a017e2 100644
--- a/modules/@angular/core/testing/index.ts
+++ b/modules/@angular/core/testing/index.ts
@@ -16,6 +16,6 @@ export * from './async';
 export * from './component_fixture';
 export * from './fake_async';
 export * from './test_bed';
-export * from './testing';
+export * from './before_each';
 export * from './metadata_override';
 export * from './private_export_testing';
diff --git a/modules/@angular/core/tsconfig-build.json b/modules/@angular/core/tsconfig-build.json
index c95f8fbdd7..ded3724ec4 100644
--- a/modules/@angular/core/tsconfig-build.json
+++ b/modules/@angular/core/tsconfig-build.json
@@ -13,7 +13,7 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "lib": ["es2015", "dom"],
     "skipLibCheck": true,
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
diff --git a/modules/@angular/core/tsconfig-testing.json b/modules/@angular/core/tsconfig-testing.json
index adde454a0f..a0a74c4234 100644
--- a/modules/@angular/core/tsconfig-testing.json
+++ b/modules/@angular/core/tsconfig-testing.json
@@ -2,6 +2,7 @@
   "extends": "./tsconfig-build",
 
   "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/core",
     "paths": {
       "rxjs/*": ["../../../node_modules/rxjs/*"],
       "@angular/core": ["../../../dist/packages-dist/core"]
diff --git a/modules/@angular/docs/web_workers/web_workers.md b/modules/@angular/docs/web_workers/web_workers.md
index fa1241355a..e4f7c26bd5 100644
--- a/modules/@angular/docs/web_workers/web_workers.md
+++ b/modules/@angular/docs/web_workers/web_workers.md
@@ -214,7 +214,7 @@ You can obtain the MessageBus on both the render and worker thread through DI.
 To use the MessageBus you need to initialize a new channel on both the UI and WebWorker.
 In TypeScript that would look like this:
 ```TypeScript
-// index.ts, which is running on the UI.
+// public_api.ts, which is running on the UI.
 import {WORKER_RENDER_PLATFORM, WORKER_RENDER_APPLICATION, WORKER_SCRIPT, MessageBus} from "angular2/platform/worker_render";
 import {platform} from "angular2/core";
 
@@ -238,7 +238,7 @@ export class MyComponent {
 Once the channel has been initialized either side can use the `from` and `to` methods on the MessageBus to send
 and receive messages. Both methods return EventEmitter. Expanding on the example from earlier:
 ```TypeScript
-// index.ts, which is running on the UI.
+// public_api.ts, which is running on the UI.
 import {WORKER_RENDER_PLATFORM, WORKER_RENDER_APPLICATION, WORKER_SCRIPT, MessageBus} from "angular2/platform/worker_render";
 import {platform} from "angular2/core";
 
@@ -334,7 +334,7 @@ during bootstrap like so:
 
 In TypeScript:
 ```TypeScript
-// index.ts, running on the UI side
+// public_api.ts, running on the UI side
 import {platform, APP_INITIALIZER, Injector} from 'angular2/core';
 import {
     WORKER_RENDER_PLATFORM,
@@ -401,7 +401,7 @@ MessageBrokers in an application. For a more complete example, check out the `We
 
 #### Using the MessageBroker in TypeScript
 ```TypeScript
-// index.ts, which is running on the UI with a method that we want to expose to a WebWorker
+// public_api.ts, which is running on the UI with a method that we want to expose to a WebWorker
 import {WORKER_RENDER_PLATFORM, WORKER_RENDER_APPLICATION, WORKER_SCRIPT, ServiceMessageBrokerFactory} from "angular2/platform/worker_render";
 import {platform} from "angular2/core";
 
diff --git a/modules/@angular/examples/_common/main-dynamic.ts b/modules/@angular/examples/_common/main-dynamic.ts
index 54ce634363..e30f1c076b 100644
--- a/modules/@angular/examples/_common/main-dynamic.ts
+++ b/modules/@angular/examples/_common/main-dynamic.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
-import * as module from './module';
+import * as mod from './module';
 
-if (module.AppModule) {
-  platformBrowserDynamic().bootstrapModule(module.AppModule);
-}
\ No newline at end of file
+if (mod.AppModule) {
+  platformBrowserDynamic().bootstrapModule(mod.AppModule);
+}
diff --git a/modules/@angular/forms/.babelrc b/modules/@angular/forms/.babelrc
new file mode 100644
index 0000000000..68e57e5ae2
--- /dev/null
+++ b/modules/@angular/forms/.babelrc
@@ -0,0 +1,18 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/common": "ng.common",
+      "@angular/compiler": "ng.compiler",
+      "@angular/forms": "ng.forms",
+      "rxjs/Observable": "Rx",
+      "rxjs/Subject": "Rx",
+      "rxjs/observable/fromPromise": "Rx.Observable",
+      "rxjs/operator/toPromise": "Rx.Observable.prototype"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/forms"
+}
diff --git a/modules/@angular/forms/index.ts b/modules/@angular/forms/index.ts
index 05e6b19532..e727e2e8a7 100644
--- a/modules/@angular/forms/index.ts
+++ b/modules/@angular/forms/index.ts
@@ -7,7 +7,7 @@
  */
 
 // 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`
+// by the TypeScript language service and during build for verification. `ngc`
 // replaces this file with production index.ts when it rewrites private symbol
 // names.
 
diff --git a/modules/@angular/forms/package.json b/modules/@angular/forms/package.json
index 30ed466bcb..44b2c0c005 100644
--- a/modules/@angular/forms/package.json
+++ b/modules/@angular/forms/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/forms",
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - directives and services for creating forms",
-  "main": "bundles/forms.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/forms.umd.js",
+  "module": "./@angular/forms.es5.js",
+  "es2015": "./@angular/forms.js",
+  "typings": "./typings/forms.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/forms/rollup.config.js b/modules/@angular/forms/rollup.config.js
deleted file mode 100644
index 89990f851c..0000000000
--- a/modules/@angular/forms/rollup.config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/forms/index.js',
-  dest: '../../../dist/packages-dist/forms/bundles/forms.umd.js',
-  format: 'umd',
-  moduleName: 'ng.forms',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/compiler': 'ng.compiler',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx',
-    'rxjs/observable/fromPromise': 'Rx.Observable',
-    'rxjs/operator/toPromise': 'Rx.Observable.prototype'
-  }
-};
diff --git a/modules/@angular/forms/tsconfig-build.json b/modules/@angular/forms/tsconfig-build.json
index 1857294498..92c76d7a19 100644
--- a/modules/@angular/forms/tsconfig-build.json
+++ b/modules/@angular/forms/tsconfig-build.json
@@ -18,7 +18,7 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "lib": ["es2015", "dom"],
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
diff --git a/modules/@angular/http/.babelrc b/modules/@angular/http/.babelrc
new file mode 100644
index 0000000000..9826492600
--- /dev/null
+++ b/modules/@angular/http/.babelrc
@@ -0,0 +1,16 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/compiler": "ng.compiler",
+      "@angular/platform-browser": "ng.platformBrowser",
+      "@angular/http": "ng.http",
+      "rxjs/Observable": "Rx",
+      "rxjs/Subject": "Rx"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/http"
+}
diff --git a/modules/@angular/http/.babelrc-testing b/modules/@angular/http/.babelrc-testing
new file mode 100644
index 0000000000..74ed0b8122
--- /dev/null
+++ b/modules/@angular/http/.babelrc-testing
@@ -0,0 +1,19 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/compiler": "ng.compiler",
+      "@angular/platform-browser": "ng.platformBrowser",
+      "@angular/http": "ng.http",
+      "@angular/http/testing": "ng.http.testing",
+      "rxjs/Observable": "Rx",
+      "rxjs/ReplaySubject": "Rx",
+      "rxjs/Subject": "Rx",
+      "rxjs/operator/take": "Rx.Observable.prototype"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/http/testing"
+}
diff --git a/modules/@angular/http/index.ts b/modules/@angular/http/index.ts
index 05e6b19532..e727e2e8a7 100644
--- a/modules/@angular/http/index.ts
+++ b/modules/@angular/http/index.ts
@@ -7,7 +7,7 @@
  */
 
 // 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`
+// by the TypeScript language service and during build for verification. `ngc`
 // replaces this file with production index.ts when it rewrites private symbol
 // names.
 
diff --git a/modules/@angular/http/package.json b/modules/@angular/http/package.json
index 4000b55256..9e19b9da83 100644
--- a/modules/@angular/http/package.json
+++ b/modules/@angular/http/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/http",
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the http service",
-  "main": "bundles/http.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/http.umd.js",
+  "module": "./@angular/http.es5.js",
+  "es2015": "./@angular/http.js",
+  "typings": "./typings/http.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/http/rollup-testing.config.js b/modules/@angular/http/rollup-testing.config.js
deleted file mode 100644
index 52c3207716..0000000000
--- a/modules/@angular/http/rollup-testing.config.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/http/testing/index.js',
-  dest: '../../../dist/packages-dist/http/bundles/http-testing.umd.js',
-  format: 'umd',
-  moduleName: 'ng.http.testing',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/http': 'ng.http',
-    'rxjs/Observable': 'Rx',
-    'rxjs/ReplaySubject': 'Rx',
-    'rxjs/Subject': 'Rx',
-    'rxjs/operator/take': 'Rx.Observable.prototype'
-  }
-};
diff --git a/modules/@angular/http/rollup.config.js b/modules/@angular/http/rollup.config.js
deleted file mode 100644
index 69e786cdda..0000000000
--- a/modules/@angular/http/rollup.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/http/index.js',
-  dest: '../../../dist/packages-dist/http/bundles/http.umd.js',
-  format: 'umd',
-  moduleName: 'ng.http',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
-  }
-};
diff --git a/modules/@angular/http/tsconfig-build.json b/modules/@angular/http/tsconfig-build.json
index dd4fb45d72..58274941fd 100644
--- a/modules/@angular/http/tsconfig-build.json
+++ b/modules/@angular/http/tsconfig-build.json
@@ -15,7 +15,7 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "lib": ["es2015", "dom"]
   },
diff --git a/modules/@angular/http/tsconfig-testing.json b/modules/@angular/http/tsconfig-testing.json
index 7f7bd0eac5..9c33a596de 100644
--- a/modules/@angular/http/tsconfig-testing.json
+++ b/modules/@angular/http/tsconfig-testing.json
@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig-build",
   "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/http",
     "paths": {
       "@angular/core": ["../../../dist/packages-dist/core"],
       "@angular/http": ["../../../dist/packages-dist/http"],
diff --git a/modules/@angular/language-service/.babelrc b/modules/@angular/language-service/.babelrc
new file mode 100644
index 0000000000..3ffb3baf4a
--- /dev/null
+++ b/modules/@angular/language-service/.babelrc
@@ -0,0 +1,14 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/language-service": "ng.language_service",
+      "typescript": "ts",
+      "path": "path",
+      "fs": "fs"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/language-service"
+}
diff --git a/modules/@angular/language-service/package.json b/modules/@angular/language-service/package.json
index 423de65b92..1ee930f2db 100644
--- a/modules/@angular/language-service/package.json
+++ b/modules/@angular/language-service/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/language-service",
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - language services",
-  "main": "bundles/language-service.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/language-service.umd.js",
+  "module": "./@angular/language-service.es5.js",
+  "es2015": "./@angular/language-service.js",
+  "typings": "./typings/language-service.d.ts",
   "author": "angular",
   "license": "MIT",
   "repository": {
diff --git a/modules/@angular/language-service/rollup.config.js b/modules/@angular/language-service/rollup.config.js
deleted file mode 100644
index c0e158ee5a..0000000000
--- a/modules/@angular/language-service/rollup.config.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * @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 commonjs from 'rollup-plugin-commonjs';
-import * as path from 'path';
-
-var m = /^\@angular\/((\w|\-)+)(\/(\w|\d|\/|\-)+)?$/;
-var location = normalize('../../../dist/packages-dist') + '/';
-var rxjsLocation = normalize('../../../node_modules/rxjs');
-var esm = 'esm/';
-
-var locations = {
-  'tsc-wrapped': normalize('../../../dist/tools/@angular') + '/',
-  'compiler-cli': normalize('../../../dist/esm') + '/'
-};
-
-var esm_suffixes = {};
-
-function normalize(fileName) {
-  return path.resolve(__dirname, fileName);
-}
-
-function resolve(id, from) {
-  // console.log('Resolve id:', id, 'from', from)
-  if (id == '@angular/tsc-wrapped') {
-    // Hack to restrict the import to not include the index of @angular/tsc-wrapped so we don't
-    // rollup tsickle.
-    return locations['tsc-wrapped'] + 'tsc-wrapped/src/collector.js';
-  }
-  var match = m.exec(id);
-  if (match) {
-    var packageName = match[1];
-    var esm_suffix = esm_suffixes[packageName] || '';
-    var loc = locations[packageName] || location;
-    var r = loc + esm_suffix + packageName + (match[3] || '/index') + '.js';
-    // console.log('** ANGULAR MAPPED **: ', r);
-    return r;
-  }
-  if (id && id.startsWith('rxjs/')) {
-    const resolved = `${rxjsLocation}${id.replace('rxjs', '')}.js`;
-    return resolved;
-  }
-}
-
-var banner = `
-var $deferred, $resolved, $provided;
-function $getModule(name) { return $provided[name] || require(name); }
-function define(modules, cb) { $deferred = { modules: modules, cb: cb }; }
-module.exports = function(provided) {
-  if ($resolved) return $resolved;
-  var result = {};
-  $provided = Object.assign({}, provided || {}, { exports: result });
-  $deferred.cb.apply(this, $deferred.modules.map($getModule));
-  $resolved = result;
-  return result;
-}
-`;
-
-export default {
-  entry: '../../../dist/packages-dist/language-service/index.js',
-  dest: '../../../dist/packages-dist/language-service/bundles/language-service.umd.js',
-  format: 'amd',
-  moduleName: 'ng.language_service',
-  exports: 'named',
-  external: [
-    'fs',
-    'path',
-    'typescript',
-  ],
-  globals: {
-    'typescript': 'ts',
-    'path': 'path',
-    'fs': 'fs',
-  },
-  banner: banner,
-  plugins: [{resolveId: resolve}, commonjs()]
-}
diff --git a/modules/@angular/language-service/src/common.ts b/modules/@angular/language-service/src/common.ts
index 457cfca2a4..ba578b647a 100644
--- a/modules/@angular/language-service/src/common.ts
+++ b/modules/@angular/language-service/src/common.ts
@@ -6,13 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompileDirectiveMetadata, CompileDirectiveSummary, CompilePipeSummary} from '@angular/compiler';
-
-import {Parser} from '@angular/compiler/src/expression_parser/parser';
-import {Node as HtmlAst} from '@angular/compiler/src/ml_parser/ast';
-import {ParseError} from '@angular/compiler/src/parse_util';
-import {CssSelector} from '@angular/compiler/src/selector';
-import {TemplateAst} from '@angular/compiler/src/template_parser/template_ast';
+import {CompileDirectiveMetadata, CompileDirectiveSummary, CompilePipeSummary, CssSelector, Node as HtmlAst, ParseError, Parser, TemplateAst} from '@angular/compiler';
 
 import {Diagnostic, TemplateSource} from './types';
 
diff --git a/modules/@angular/language-service/src/completions.ts b/modules/@angular/language-service/src/completions.ts
index 661d5ce629..53591902b1 100644
--- a/modules/@angular/language-service/src/completions.ts
+++ b/modules/@angular/language-service/src/completions.ts
@@ -6,12 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AST, ImplicitReceiver, ParseSpan, PropertyRead} from '@angular/compiler/src/expression_parser/ast';
-import {Attribute, Element, Node as HtmlAst, Text} from '@angular/compiler/src/ml_parser/ast';
-import {getHtmlTagDefinition} from '@angular/compiler/src/ml_parser/html_tags';
-import {NAMED_ENTITIES, TagContentType, splitNsName} from '@angular/compiler/src/ml_parser/tags';
-import {CssSelector, SelectorMatcher} from '@angular/compiler/src/selector';
-import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '@angular/compiler/src/template_parser/template_ast';
+import {AST, AttrAst, Attribute, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, CssSelector, DirectiveAst, Element, ElementAst, EmbeddedTemplateAst, ImplicitReceiver, NAMED_ENTITIES, NgContentAst, Node as HtmlAst, ParseSpan, PropertyRead, ReferenceAst, SelectorMatcher, TagContentType, TemplateAst, TemplateAstVisitor, Text, TextAst, VariableAst, getHtmlTagDefinition, splitNsName, templateVisitAll} from '@angular/compiler';
 
 import {AstResult, AttrInfo, SelectorInfo, TemplateInfo} from './common';
 import {getExpressionCompletions, getExpressionScope} from './expressions';
diff --git a/modules/@angular/language-service/src/diagnostics.ts b/modules/@angular/language-service/src/diagnostics.ts
index f0ef19c411..f96fc40cfe 100644
--- a/modules/@angular/language-service/src/diagnostics.ts
+++ b/modules/@angular/language-service/src/diagnostics.ts
@@ -6,11 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompileDirectiveMetadata, CompileDirectiveSummary, StaticSymbol} from '@angular/compiler';
-import {NgAnalyzedModules} from '@angular/compiler/src/aot/compiler';
-import {AST} from '@angular/compiler/src/expression_parser/ast';
-import {Attribute} from '@angular/compiler/src/ml_parser/ast';
-import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '@angular/compiler/src/template_parser/template_ast';
+import {AST, AttrAst, Attribute, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, CompileDirectiveMetadata, CompileDirectiveSummary, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgAnalyzedModules, NgContentAst, ReferenceAst, StaticSymbol, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '@angular/compiler';
 
 import {AstResult, SelectorInfo, TemplateInfo} from './common';
 import {getExpressionDiagnostics, getExpressionScope} from './expressions';
diff --git a/modules/@angular/language-service/src/expressions.ts b/modules/@angular/language-service/src/expressions.ts
index 29e47fb084..2f3a483834 100644
--- a/modules/@angular/language-service/src/expressions.ts
+++ b/modules/@angular/language-service/src/expressions.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {StaticSymbol, identifierName, tokenReference} from '@angular/compiler';
-import {AST, ASTWithSource, AstVisitor, Binary, BindingPipe, Chain, Conditional, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, PrefixNot, PropertyRead, PropertyWrite, Quote, SafeMethodCall, SafePropertyRead} from '@angular/compiler/src/expression_parser/ast';
-import {ElementAst, EmbeddedTemplateAst, ReferenceAst, TemplateAst, templateVisitAll} from '@angular/compiler/src/template_parser/template_ast';
+import {AST, ASTWithSource, AstVisitor, Binary, BindingPipe, Chain, Conditional, ElementAst, EmbeddedTemplateAst, FunctionCall, ImplicitReceiver, Interpolation, KeyedRead, KeyedWrite, LiteralArray, LiteralMap, LiteralPrimitive, MethodCall, PrefixNot, PropertyRead, PropertyWrite, Quote, ReferenceAst, SafeMethodCall, SafePropertyRead, StaticSymbol, TemplateAst, identifierName, templateVisitAll, tokenReference} from '@angular/compiler';
 
 import {AstPath as AstPathBase} from './ast_path';
 import {TemplateInfo} from './common';
@@ -784,4 +782,4 @@ function getDefintionOf(info: TemplateInfo, ast: TemplateAst): Definition {
       }
     }];
   }
-}
\ No newline at end of file
+}
diff --git a/modules/@angular/language-service/src/html_path.ts b/modules/@angular/language-service/src/html_path.ts
index 6e4907e095..152ad95468 100644
--- a/modules/@angular/language-service/src/html_path.ts
+++ b/modules/@angular/language-service/src/html_path.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Attribute, Comment, Element, Expansion, ExpansionCase, Node, Text, Visitor, visitAll} from '@angular/compiler/src/ml_parser/ast';
+import {Attribute, Comment, Element, Expansion, ExpansionCase, Node, Text, Visitor, visitAll} from '@angular/compiler';
 
 import {AstPath} from './ast_path';
 import {inSpan, spanOf} from './utils';
diff --git a/modules/@angular/language-service/src/language_service.ts b/modules/@angular/language-service/src/language_service.ts
index fd6a740acc..d411861236 100644
--- a/modules/@angular/language-service/src/language_service.ts
+++ b/modules/@angular/language-service/src/language_service.ts
@@ -6,16 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgAnalyzedModules} from '@angular/compiler/src/aot/compiler';
-import {CompileNgModuleMetadata} from '@angular/compiler/src/compile_metadata';
-import {CompilerConfig} from '@angular/compiler/src/config';
-import {Lexer} from '@angular/compiler/src/expression_parser/lexer';
-import {Parser} from '@angular/compiler/src/expression_parser/parser';
-import {I18NHtmlParser} from '@angular/compiler/src/i18n/i18n_html_parser';
-import {CompileMetadataResolver} from '@angular/compiler/src/metadata_resolver';
-import {HtmlParser} from '@angular/compiler/src/ml_parser/html_parser';
-import {DomElementSchemaRegistry} from '@angular/compiler/src/schema/dom_element_schema_registry';
-import {TemplateParser} from '@angular/compiler/src/template_parser/template_parser';
+import {CompileMetadataResolver, CompileNgModuleMetadata, CompilerConfig, DomElementSchemaRegistry, HtmlParser, I18NHtmlParser, Lexer, NgAnalyzedModules, Parser, TemplateParser} from '@angular/compiler';
 
 import {AstResult, AttrInfo, TemplateInfo} from './common';
 import {getTemplateCompletions} from './completions';
@@ -190,4 +181,4 @@ function findSuitableDefaultModule(modules: NgAnalyzedModules): CompileNgModuleM
     }
   }
   return result;
-}
\ No newline at end of file
+}
diff --git a/modules/@angular/language-service/src/locate_symbol.ts b/modules/@angular/language-service/src/locate_symbol.ts
index 7bdb52e4f0..6e86f82e51 100644
--- a/modules/@angular/language-service/src/locate_symbol.ts
+++ b/modules/@angular/language-service/src/locate_symbol.ts
@@ -6,10 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {tokenReference} from '@angular/compiler';
-import {AST} from '@angular/compiler/src/expression_parser/ast';
-import {Attribute} from '@angular/compiler/src/ml_parser/ast';
-import {BoundDirectivePropertyAst, BoundEventAst, ElementAst, TemplateAst} from '@angular/compiler/src/template_parser/template_ast';
+import {AST, Attribute, BoundDirectivePropertyAst, BoundEventAst, ElementAst, TemplateAst, tokenReference} from '@angular/compiler';
 
 import {TemplateInfo} from './common';
 import {getExpressionScope, getExpressionSymbol} from './expressions';
@@ -190,4 +187,4 @@ class OverrideKindSymbol implements Symbol {
   selectSignature(types: Symbol[]) { return this.sym.selectSignature(types); }
 
   indexed(argument: Symbol) { return this.sym.indexed(argument); }
-}
\ No newline at end of file
+}
diff --git a/modules/@angular/language-service/src/template_path.ts b/modules/@angular/language-service/src/template_path.ts
index eacc0b45e2..e974e39563 100644
--- a/modules/@angular/language-service/src/template_path.ts
+++ b/modules/@angular/language-service/src/template_path.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '@angular/compiler/src/template_parser/template_ast';
+import {AttrAst, BoundDirectivePropertyAst, BoundElementPropertyAst, BoundEventAst, BoundTextAst, DirectiveAst, ElementAst, EmbeddedTemplateAst, NgContentAst, ReferenceAst, TemplateAst, TemplateAstVisitor, TextAst, VariableAst, templateVisitAll} from '@angular/compiler';
 
 import {AstPath} from './ast_path';
 import {inSpan, isNarrower, spanOf} from './utils';
diff --git a/modules/@angular/language-service/src/types.ts b/modules/@angular/language-service/src/types.ts
index 8706636182..b187f03a7d 100644
--- a/modules/@angular/language-service/src/types.ts
+++ b/modules/@angular/language-service/src/types.ts
@@ -6,9 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompileDirectiveMetadata, StaticSymbol} from '@angular/compiler';
-import {NgAnalyzedModules} from '@angular/compiler/src/aot/compiler';
-import {CompileMetadataResolver} from '@angular/compiler/src/metadata_resolver';
+import {CompileDirectiveMetadata, CompileMetadataResolver, NgAnalyzedModules, StaticSymbol} from '@angular/compiler';
+
 
 
 /**
@@ -47,7 +46,7 @@ export interface TemplateSource {
 
   /**
    * The version of the source. As files are modified the version should change. That is, if the
-   * `LanguageSerivce` requesting
+   * `LanguageService` requesting
    * template infomration for a source file and that file has changed since the last time the host
    * was asked for the file then
    * this version string should be different. No assumptions are made about the format of this
@@ -411,7 +410,7 @@ export interface SymbolQuery {
 }
 
 /**
- * The host for a `LanguageService`. This provides all the `LanguageSerivce` requires to respond to
+ * The host for a `LanguageService`. This provides all the `LanguageService` requires to respond to
  * the `LanguageService` requests.
  *
  * This interface describes the requirements of the `LanguageService` on its host.
@@ -419,7 +418,7 @@ export interface SymbolQuery {
  * The host interface is host language agnostic.
  *
  * Adding optional member to this interface or any interface that is described as a
- * `LanguageSerivceHost`
+ * `LanguageServiceHost`
  * interface is not considered a breaking change as defined by SemVer. Removing a method or changing
  * a
  * member from required to optional will also not be considered a breaking change.
@@ -678,7 +677,7 @@ export interface Hover {
  * beginning
  * of the file reference by `fileName`.
  *
- * This interface and all interfaces and types marked as `LanguageSerivce` types, describe  a
+ * This interface and all interfaces and types marked as `LanguageService` types, describe  a
  * particlar
  * implementation of the Angular language service and is not intented to be implemented. Adding
  * members
diff --git a/modules/@angular/language-service/src/typescript_host.ts b/modules/@angular/language-service/src/typescript_host.ts
index 3fbb68f260..5191ff2edf 100644
--- a/modules/@angular/language-service/src/typescript_host.ts
+++ b/modules/@angular/language-service/src/typescript_host.ts
@@ -6,20 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {AotSummaryResolver, CompileDirectiveMetadata, CompilerConfig, StaticReflector, StaticSymbol, StaticSymbolCache, StaticSymbolResolver, componentModuleUrl, createOfflineCompileUrlResolver} from '@angular/compiler';
-import {NgAnalyzedModules, analyzeNgModules, extractProgramSymbols} from '@angular/compiler/src/aot/compiler';
-import {DirectiveNormalizer} from '@angular/compiler/src/directive_normalizer';
-import {DirectiveResolver} from '@angular/compiler/src/directive_resolver';
-import {CompileMetadataResolver} from '@angular/compiler/src/metadata_resolver';
-import {HtmlParser} from '@angular/compiler/src/ml_parser/html_parser';
-import {DEFAULT_INTERPOLATION_CONFIG, InterpolationConfig} from '@angular/compiler/src/ml_parser/interpolation_config';
-import {ParseTreeResult, Parser} from '@angular/compiler/src/ml_parser/parser';
-import {NgModuleResolver} from '@angular/compiler/src/ng_module_resolver';
-import {PipeResolver} from '@angular/compiler/src/pipe_resolver';
-import {ResourceLoader} from '@angular/compiler/src/resource_loader';
-import {DomElementSchemaRegistry} from '@angular/compiler/src/schema/dom_element_schema_registry';
-import {SummaryResolver} from '@angular/compiler/src/summary_resolver';
-import {UrlResolver} from '@angular/compiler/src/url_resolver';
+import {AotSummaryResolver, CompileDirectiveMetadata, CompileMetadataResolver, CompilerConfig, DEFAULT_INTERPOLATION_CONFIG, DirectiveNormalizer, DirectiveResolver, DomElementSchemaRegistry, HtmlParser, InterpolationConfig, NgAnalyzedModules, NgModuleResolver, ParseTreeResult, Parser, PipeResolver, ResourceLoader, StaticReflector, StaticSymbol, StaticSymbolCache, StaticSymbolResolver, SummaryResolver, UrlResolver, analyzeNgModules, componentModuleUrl, createOfflineCompileUrlResolver, extractProgramSymbols} from '@angular/compiler';
 import {Type, ViewEncapsulation} from '@angular/core';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -29,6 +16,7 @@ import {createLanguageService} from './language_service';
 import {ReflectorHost} from './reflector_host';
 import {BuiltinType, CompletionKind, Declaration, DeclarationError, Declarations, Definition, LanguageService, LanguageServiceHost, PipeInfo, Pipes, Signature, Span, Symbol, SymbolDeclaration, SymbolQuery, SymbolTable, TemplateSource, TemplateSources} from './types';
 
+
 // In TypeScript 2.1 these flags moved
 // These helpers work for both 2.0 and 2.1.
 const isPrivate = (ts as any).ModifierFlags ?
@@ -76,7 +64,7 @@ export class DummyResourceLoader extends ResourceLoader {
 }
 
 /**
- * An implemntation of a `LanguageSerivceHost` for a TypeScript project.
+ * An implemntation of a `LanguageServiceHost` for a TypeScript project.
  *
  * The `TypeScriptServiceHost` implements the Angular `LanguageServiceHost` using
  * the TypeScript language services.
diff --git a/modules/@angular/language-service/src/utils.ts b/modules/@angular/language-service/src/utils.ts
index 7793268cd9..f971a33049 100644
--- a/modules/@angular/language-service/src/utils.ts
+++ b/modules/@angular/language-service/src/utils.ts
@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {CompileDirectiveSummary, CompileTypeMetadata, identifierName} from '@angular/compiler';
-import {ParseSourceSpan} from '@angular/compiler/src/parse_util';
-import {CssSelector, SelectorMatcher} from '@angular/compiler/src/selector';
+import {CompileDirectiveSummary, CompileTypeMetadata, CssSelector, ParseSourceSpan, SelectorMatcher, identifierName} from '@angular/compiler';
 
 import {SelectorInfo, TemplateInfo} from './common';
 import {Span} from './types';
diff --git a/modules/@angular/language-service/tsconfig-build.json b/modules/@angular/language-service/tsconfig-build.json
index d180fe6ac4..8a9a54a396 100644
--- a/modules/@angular/language-service/tsconfig-build.json
+++ b/modules/@angular/language-service/tsconfig-build.json
@@ -12,11 +12,9 @@
       "@angular/core": ["../../../dist/packages-dist/core"],
       "@angular/animation": ["../../../dist/packages-dist/animation"],
       "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
-      "@angular/core/testing/*": ["../../../dist/packages-dist/core/testing/*"],
       "@angular/common": ["../../../dist/packages-dist/common"],
       "@angular/compiler": ["../../../dist/packages-dist/compiler"],
-      "@angular/compiler/*": ["../../../dist/packages-dist/compiler/*"],
-      "@angular/compiler-cli": ["../../../dist/packages-dist/compiler-cli"],
+      "@angular/compiler-cli": ["../../../dist/esm/compiler-cli"],
       "@angular/http": ["../../../dist/packages-dist/http"],
       "@angular/platform-server": ["../../../dist/packages-dist/platform-server"],
       "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"],
@@ -26,7 +24,7 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "lib": ["es2015", "dom"]
   },
diff --git a/modules/@angular/platform-browser-dynamic/.babelrc b/modules/@angular/platform-browser-dynamic/.babelrc
new file mode 100644
index 0000000000..b3e31984a5
--- /dev/null
+++ b/modules/@angular/platform-browser-dynamic/.babelrc
@@ -0,0 +1,15 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/common": "ng.common",
+      "@angular/compiler": "ng.compiler",
+      "@angular/platform-browser": "ng.platformBrowser",
+      "@angular/platform-browser-dynamic": "ng.platformBrowserDynamic"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/platform-browser-dynamic"
+}
diff --git a/modules/@angular/platform-browser-dynamic/.babelrc-testing b/modules/@angular/platform-browser-dynamic/.babelrc-testing
new file mode 100644
index 0000000000..a7697569bc
--- /dev/null
+++ b/modules/@angular/platform-browser-dynamic/.babelrc-testing
@@ -0,0 +1,19 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/core/testing": "ng.core.testing",
+      "@angular/common": "ng.common",
+      "@angular/compiler": "ng.compiler",
+      "@angular/compiler/testing": "ng.compiler.testing",
+      "@angular/platform-browser": "ng.platformBrowser",
+      "@angular/platform-browser/testing": "ng.platformBrowser.testing",
+      "@angular/platform-browser-dynamic": "ng.platformBrowserDynamic",
+      "@angular/platform-browser-dynamic/testing": "ng.platformBrowserDynamic.testing"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/platform-browser-dynamic/testing"
+}
diff --git a/modules/@angular/platform-browser-dynamic/package.json b/modules/@angular/platform-browser-dynamic/package.json
index 434c62a0e0..29f5366f4f 100644
--- a/modules/@angular/platform-browser-dynamic/package.json
+++ b/modules/@angular/platform-browser-dynamic/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/platform-browser-dynamic",
   "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": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/platform-browser-dynamic.umd.js",
+  "module": "./@angular/platform-browser-dynamic.es5.js",
+  "es2015": "./@angular/platform-browser-dynamic.js",
+  "typings": "./typings/platform-browser-dynamic.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/platform-browser-dynamic/rollup-testing.config.js b/modules/@angular/platform-browser-dynamic/rollup-testing.config.js
deleted file mode 100644
index ca88ac7f53..0000000000
--- a/modules/@angular/platform-browser-dynamic/rollup-testing.config.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/platform-browser-dynamic/testing/index.js',
-  dest:
-      '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic-testing.umd.js',
-  format: 'umd',
-  moduleName: 'ng.platformBrowserDynamic.testing',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/core/testing': 'ng.core.testing',
-    '@angular/common': 'ng.common',
-    '@angular/compiler': 'ng.compiler',
-    '@angular/compiler/testing': 'ng.compiler.testing',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/platform-browser/testing': 'ng.platformBrowser.testing',
-    '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic'
-  }
-};
diff --git a/modules/@angular/platform-browser-dynamic/rollup.config.js b/modules/@angular/platform-browser-dynamic/rollup.config.js
deleted file mode 100644
index 03ed750040..0000000000
--- a/modules/@angular/platform-browser-dynamic/rollup.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/platform-browser-dynamic/index.js',
-  dest:
-      '../../../dist/packages-dist/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
-  format: 'umd',
-  moduleName: 'ng.platformBrowserDynamic',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser',
-  }
-};
diff --git a/modules/@angular/platform-browser-dynamic/tsconfig-build.json b/modules/@angular/platform-browser-dynamic/tsconfig-build.json
index 5e5e98ead3..53ab459b53 100644
--- a/modules/@angular/platform-browser-dynamic/tsconfig-build.json
+++ b/modules/@angular/platform-browser-dynamic/tsconfig-build.json
@@ -20,7 +20,7 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "lib": ["es2015", "dom"],
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
diff --git a/modules/@angular/platform-browser-dynamic/tsconfig-testing.json b/modules/@angular/platform-browser-dynamic/tsconfig-testing.json
index 2355e245c5..26fddfdd85 100644
--- a/modules/@angular/platform-browser-dynamic/tsconfig-testing.json
+++ b/modules/@angular/platform-browser-dynamic/tsconfig-testing.json
@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig-build",
   "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/platform-browser-dynamic",
     "paths": {
       "@angular/core": ["../../../dist/packages-dist/core"],
       "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
diff --git a/modules/@angular/platform-browser/.babelrc b/modules/@angular/platform-browser/.babelrc
new file mode 100644
index 0000000000..bb5d83d4b5
--- /dev/null
+++ b/modules/@angular/platform-browser/.babelrc
@@ -0,0 +1,13 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/common": "ng.common",
+      "@angular/platform-browser": "ng.platformBrowser"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/platform-browser"
+}
diff --git a/modules/@angular/platform-browser/.babelrc-testing b/modules/@angular/platform-browser/.babelrc-testing
new file mode 100644
index 0000000000..1a07a358a3
--- /dev/null
+++ b/modules/@angular/platform-browser/.babelrc-testing
@@ -0,0 +1,14 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/common": "ng.common",
+      "@angular/platform-browser": "ng.platformBrowser",
+      "@angular/platform-browser/testing": "ng.platformBrowser.testing"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/platform-browser/testing"
+}
diff --git a/modules/@angular/platform-browser/index.ts b/modules/@angular/platform-browser/index.ts
index a83ba2315d..e727e2e8a7 100644
--- a/modules/@angular/platform-browser/index.ts
+++ b/modules/@angular/platform-browser/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 package.
- */
-export * from './src/platform-browser';
-// This file only reexports content of the `src` folder. Keep it that way.
+// 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 './public_api';
diff --git a/modules/@angular/platform-browser/package.json b/modules/@angular/platform-browser/package.json
index 220ed92199..51cfc46a58 100644
--- a/modules/@angular/platform-browser/package.json
+++ b/modules/@angular/platform-browser/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/platform-browser",
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in a web browser",
-  "main": "bundles/platform-browser.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/platform-browser.umd.js",
+  "module": "./@angular/platform-browser.es5.js",
+  "es2015": "./@angular/platform-browser.js",
+  "typings": "./typings/platform-browser.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/platform-browser/public_api.ts b/modules/@angular/platform-browser/public_api.ts
new file mode 100644
index 0000000000..a83ba2315d
--- /dev/null
+++ b/modules/@angular/platform-browser/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 the platform-browser package.
+ */
+export * from './src/platform-browser';
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/modules/@angular/platform-browser/rollup-testing.config.js b/modules/@angular/platform-browser/rollup-testing.config.js
deleted file mode 100644
index bd8fb02094..0000000000
--- a/modules/@angular/platform-browser/rollup-testing.config.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/platform-browser/testing/index.js',
-  dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser-testing.umd.js',
-  format: 'umd',
-  moduleName: 'ng.platformBrowser.testing',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/platform-browser': 'ng.platformBrowser'
-  }
-};
diff --git a/modules/@angular/platform-browser/rollup.config.js b/modules/@angular/platform-browser/rollup.config.js
deleted file mode 100644
index a02654510a..0000000000
--- a/modules/@angular/platform-browser/rollup.config.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/platform-browser/index.js',
-  dest: '../../../dist/packages-dist/platform-browser/bundles/platform-browser.umd.js',
-  format: 'umd',
-  moduleName: 'ng.platformBrowser',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-  }
-};
diff --git a/modules/@angular/platform-browser/src/dom/dom_renderer.ts b/modules/@angular/platform-browser/src/dom/dom_renderer.ts
index eb8d4b8d96..85693cbad4 100644
--- a/modules/@angular/platform-browser/src/dom/dom_renderer.ts
+++ b/modules/@angular/platform-browser/src/dom/dom_renderer.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {APP_ID, ComponentRenderTypeV2, Inject, Injectable, RenderComponentType, Renderer, RendererFactoryV2, RendererV2, RootRenderer, ViewEncapsulation, ɵAnimationKeyframe as AnimationKeyframe, ɵAnimationPlayer as AnimationPlayer, ɵAnimationStyles as AnimationStyles, ɵDirectRenderer as DirectRenderer, ɵNoOpAnimationPlayer as NoOpAnimationPlayer, ɵRenderDebugInfo as RenderDebugInfo} from '@angular/core';
+import {APP_ID, Inject, Injectable, RenderComponentType, Renderer, RendererFactoryV2, RendererTypeV2, RendererV2, RootRenderer, ViewEncapsulation, ɵAnimationKeyframe as AnimationKeyframe, ɵAnimationPlayer as AnimationPlayer, ɵAnimationStyles as AnimationStyles, ɵDirectRenderer as DirectRenderer, ɵNoOpAnimationPlayer as NoOpAnimationPlayer, ɵRenderDebugInfo as RenderDebugInfo} from '@angular/core';
 
 import {isPresent, stringify} from '../facade/lang';
 
diff --git a/modules/@angular/platform-browser/src/dom/web_animations_player.ts b/modules/@angular/platform-browser/src/dom/web_animations_player.ts
index b6376aef40..e41e84d8b8 100644
--- a/modules/@angular/platform-browser/src/dom/web_animations_player.ts
+++ b/modules/@angular/platform-browser/src/dom/web_animations_player.ts
@@ -77,9 +77,14 @@ export class WebAnimationsPlayer implements AnimationPlayer {
       });
 
       if (missingStyleProps.length) {
-        for (let i = 1; i < keyframes.length; i++) {
+        const self = this;
+        // tslint:disable-next-line
+        for (var i = 1; i < keyframes.length; i++) {
           let kf = keyframes[i];
-          missingStyleProps.forEach(prop => { kf[prop] = _computeStyle(this.element, prop); });
+          // tslint:disable-next-line
+          missingStyleProps.forEach(function(prop) {
+            kf[prop] = _computeStyle(self.element, prop);
+          });
         }
       }
     }
diff --git a/modules/@angular/platform-browser/tsconfig-build.json b/modules/@angular/platform-browser/tsconfig-build.json
index 1a8a874f95..465fc79cef 100644
--- a/modules/@angular/platform-browser/tsconfig-build.json
+++ b/modules/@angular/platform-browser/tsconfig-build.json
@@ -14,19 +14,21 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "lib": ["es2015", "dom"],
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
     "types": []
   },
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/@types/hammerjs/index.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "bundleIndex": "index",
+    "importAs": "@angular/platform-browser"
   }
 }
diff --git a/modules/@angular/platform-browser/tsconfig-testing.json b/modules/@angular/platform-browser/tsconfig-testing.json
index c14de7e836..cdec2780af 100644
--- a/modules/@angular/platform-browser/tsconfig-testing.json
+++ b/modules/@angular/platform-browser/tsconfig-testing.json
@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig-build",
   "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/platform-browser",
     "paths": {
       "@angular/core": ["../../../dist/packages-dist/core"],
       "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
diff --git a/modules/@angular/platform-server/.babelrc b/modules/@angular/platform-server/.babelrc
new file mode 100644
index 0000000000..38e142664d
--- /dev/null
+++ b/modules/@angular/platform-server/.babelrc
@@ -0,0 +1,15 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      '@angular/core': 'ng.core',
+      '@angular/common': 'ng.common',
+      '@angular/compiler': 'ng.compiler',
+      '@angular/platform-browser': 'ng.platformBrowser',
+      '@angular/platform-server': 'ng.platformServer'
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/platform-server"
+}
diff --git a/modules/@angular/platform-server/.babelrc-testing b/modules/@angular/platform-server/.babelrc-testing
new file mode 100644
index 0000000000..e3d9952478
--- /dev/null
+++ b/modules/@angular/platform-server/.babelrc-testing
@@ -0,0 +1,18 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/common": "ng.common",
+      "@angular/compiler": "ng.compiler",
+      "@angular/compiler/testing": "ng.compiler.testing",
+      "@angular/platform-browser": "ng.platformBrowser",
+      "@angular/platform-server": "ng.platformServer",
+      "@angular/platform-server/testing": "ng.platformServer.testing",
+      "@angular/platform-browser-dynamic/testing": "ng.platformBrowserDynamic.testing"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/platform-server/testing"
+}
diff --git a/modules/@angular/platform-server/index.ts b/modules/@angular/platform-server/index.ts
index 405b49a6b5..e727e2e8a7 100644
--- a/modules/@angular/platform-server/index.ts
+++ b/modules/@angular/platform-server/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-server package.
- */
-export * from './src/platform-server';
+// 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/modules/@angular/platform-server/package.json b/modules/@angular/platform-server/package.json
index 0ff8d27b70..61f8e6f960 100644
--- a/modules/@angular/platform-server/package.json
+++ b/modules/@angular/platform-server/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/platform-server",
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - library for using Angular in Node.js",
-  "main": "bundles/platform-server.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/platform-server.umd.js",
+  "module": "./@angular/platform-server.es5.js",
+  "es2015": "./@angular/platform-server.js",
+  "typings": "./typings/platform-server.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/platform-server/public_api.ts b/modules/@angular/platform-server/public_api.ts
new file mode 100644
index 0000000000..405b49a6b5
--- /dev/null
+++ b/modules/@angular/platform-server/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 the platform-server package.
+ */
+export * from './src/platform-server';
+
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/modules/@angular/platform-server/rollup-testing.config.js b/modules/@angular/platform-server/rollup-testing.config.js
deleted file mode 100644
index 94b9763bf2..0000000000
--- a/modules/@angular/platform-server/rollup-testing.config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/platform-server/testing/index.js',
-  dest: '../../../dist/packages-dist/platform-server/bundles/platform-server-testing.umd.js',
-  format: 'umd',
-  moduleName: 'ng.platformServer.testing',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/compiler': 'ng.compiler',
-    '@angular/compiler/testing': 'ng.compiler.testing',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/platform-server': 'ng.platformServer',
-    '@angular/platform-browser-dynamic/testing': 'ng.platformBrowserDynamic.testing'
-  }
-};
diff --git a/modules/@angular/platform-server/rollup.config.js b/modules/@angular/platform-server/rollup.config.js
deleted file mode 100644
index 99f753257a..0000000000
--- a/modules/@angular/platform-server/rollup.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/platform-server/index.js',
-  dest: '../../../dist/packages-dist/platform-server/bundles/platform-server.umd.js',
-  format: 'umd',
-  moduleName: 'ng.platformServer',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser'
-  }
-};
diff --git a/modules/@angular/platform-server/src/server_renderer.ts b/modules/@angular/platform-server/src/server_renderer.ts
index f500d3edcb..b60c016f6a 100644
--- a/modules/@angular/platform-server/src/server_renderer.ts
+++ b/modules/@angular/platform-server/src/server_renderer.ts
@@ -7,7 +7,11 @@
  */
 
 import {DomElementSchemaRegistry} from '@angular/compiler';
-import {APP_ID, ComponentRenderTypeV2, Inject, Injectable, NgZone, RenderComponentType, Renderer, RendererFactoryV2, RendererV2, RootRenderer, ViewEncapsulation, ɵAnimationKeyframe as AnimationKeyframe, ɵAnimationPlayer as AnimationPlayer, ɵAnimationStyles as AnimationStyles, ɵRenderDebugInfo as RenderDebugInfo} from '@angular/core';
+import {
+  APP_ID, Inject, Injectable, NgZone, RenderComponentType, Renderer, RendererFactoryV2, RendererV2, RootRenderer,
+  ViewEncapsulation, ɵAnimationKeyframe as AnimationKeyframe, ɵAnimationPlayer as AnimationPlayer,
+  ɵAnimationStyles as AnimationStyles, ɵRenderDebugInfo as RenderDebugInfo, RendererTypeV2
+} from '@angular/core';
 import {AnimationDriver, DOCUMENT, ɵNAMESPACE_URIS as NAMESPACE_URIS, ɵSharedStylesHost as SharedStylesHost, ɵflattenStyles as flattenStyles, ɵgetDOM as getDOM, ɵisNamespaced as isNamespaced, ɵshimContentAttribute as shimContentAttribute, ɵshimHostAttribute as shimHostAttribute, ɵsplitNamespace as splitNamespace} from '@angular/platform-browser';
 import {isBlank, isPresent, stringify} from './facade/lang';
 
diff --git a/modules/@angular/platform-server/tsconfig-build.json b/modules/@angular/platform-server/tsconfig-build.json
index 954ffaec03..53ba502545 100644
--- a/modules/@angular/platform-server/tsconfig-build.json
+++ b/modules/@angular/platform-server/tsconfig-build.json
@@ -18,19 +18,21 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "lib": ["es2015", "dom"],
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
     "types": []
   },
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/@types/node/index.d.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "bundleIndex": "index",
+    "importAs": "@angular/platform-server"
   }
 }
diff --git a/modules/@angular/platform-server/tsconfig-testing.json b/modules/@angular/platform-server/tsconfig-testing.json
index 1fec1894bc..1a6da63d3c 100644
--- a/modules/@angular/platform-server/tsconfig-testing.json
+++ b/modules/@angular/platform-server/tsconfig-testing.json
@@ -1,14 +1,15 @@
 {
   "extends": "./tsconfig-build",
   "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/platform-server",
     "paths": {
-      "@angular/core": ["../../../dist/packages-dist/core/"],
+      "@angular/core": ["../../../dist/packages-dist/core"],
       "@angular/core/testing": ["../../../dist/packages-dist/core/testing"],
-      "@angular/common": ["../../../dist/packages-dist/common/"],
+      "@angular/common": ["../../../dist/packages-dist/common"],
       "@angular/common/testing": ["../../../dist/packages-dist/common/testing"],
-      "@angular/compiler": ["../../../dist/packages-dist/compiler/"],
+      "@angular/compiler": ["../../../dist/packages-dist/compiler"],
       "@angular/compiler/testing": ["../../../dist/packages-dist/compiler/testing"],
-      "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser/"],
+      "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"],
       "@angular/platform-browser/testing": ["../../../dist/packages-dist/platform-browser/testing"],
       "@angular/platform-browser-dynamic": ["../../../dist/packages-dist/platform-browser-dynamic"],
       "@angular/platform-browser-dynamic/testing": ["../../../dist/packages-dist/platform-browser-dynamic/testing"],
diff --git a/modules/@angular/platform-webworker-dynamic/.babelrc b/modules/@angular/platform-webworker-dynamic/.babelrc
new file mode 100644
index 0000000000..7a64b7e903
--- /dev/null
+++ b/modules/@angular/platform-webworker-dynamic/.babelrc
@@ -0,0 +1,17 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/common": "ng.common",
+      "@angular/compiler": "ng.compiler",
+      "@angular/platform-browser": "ng.platformBrowser",
+      "@angular/platform-browser-dynamic": "ng.platformBrowserDynamic",
+      "@angular/platform-webworker": "ng.platformWebworker",
+      "@angular/platform-webworker-dynamic": "ng.platformWebworkerDynamic"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/platform-webworker-dynamic"
+}
diff --git a/modules/@angular/platform-webworker-dynamic/package.json b/modules/@angular/platform-webworker-dynamic/package.json
index 691d90b4c6..04992cebfc 100644
--- a/modules/@angular/platform-webworker-dynamic/package.json
+++ b/modules/@angular/platform-webworker-dynamic/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/platform-webworker-dynamic",
   "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": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/platform-webworker-dynamic.umd.js",
+  "module": "./@angular/platform-webworker-dynamic.es5.js",
+  "es2015": "./@angular/platform-webworker-dynamic.js",
+  "typings": "./typings/platform-webworker-dynamic.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/platform-webworker-dynamic/rollup.config.js b/modules/@angular/platform-webworker-dynamic/rollup.config.js
deleted file mode 100644
index f8b4a0f4d3..0000000000
--- a/modules/@angular/platform-webworker-dynamic/rollup.config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/platform-webworker-dynamic/index.js',
-  dest:
-      '../../../dist/packages-dist/platform-webworker-dynamic/bundles/platform-webworker-dynamic.umd.js',
-  format: 'umd',
-  moduleName: 'ng.platformWebworkerDynamic',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
-    '@angular/platform-webworker': 'ng.platformWebworker',
-  }
-};
diff --git a/modules/@angular/platform-webworker-dynamic/tsconfig-build.json b/modules/@angular/platform-webworker-dynamic/tsconfig-build.json
index 96ccd24e36..ebcf7bc415 100644
--- a/modules/@angular/platform-webworker-dynamic/tsconfig-build.json
+++ b/modules/@angular/platform-webworker-dynamic/tsconfig-build.json
@@ -18,7 +18,7 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "lib": ["es2015", "dom"],
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
diff --git a/modules/@angular/platform-webworker/.babelrc b/modules/@angular/platform-webworker/.babelrc
new file mode 100644
index 0000000000..72102c16de
--- /dev/null
+++ b/modules/@angular/platform-webworker/.babelrc
@@ -0,0 +1,16 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/common": "ng.common",
+      "@angular/platform-browser": "ng.platformBrowser",
+      "@angular/platform-webworker": "ng.platformWebworker",
+      "rxjs/Observable": "Rx",
+      "rxjs/Subject": "Rx"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/platform-webworker"
+}
diff --git a/modules/@angular/platform-webworker/index.ts b/modules/@angular/platform-webworker/index.ts
index 398b8da2bd..e727e2e8a7 100644
--- a/modules/@angular/platform-webworker/index.ts
+++ b/modules/@angular/platform-webworker/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-webworker package.
- */
-export * from './src/platform-webworker';
+// 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/modules/@angular/platform-webworker/package.json b/modules/@angular/platform-webworker/package.json
index 34f9d37fc7..2cb87f7e53 100644
--- a/modules/@angular/platform-webworker/package.json
+++ b/modules/@angular/platform-webworker/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/platform-webworker",
   "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": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/platform-webworker.umd.js",
+  "module": "./@angular/platform-webworker.es5.js",
+  "es2015": "./@angular/platform-webworker.js",
+  "typings": "./typings/platform-webworker.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/platform-webworker/public_api.ts b/modules/@angular/platform-webworker/public_api.ts
new file mode 100644
index 0000000000..2ab5a8a8fc
--- /dev/null
+++ b/modules/@angular/platform-webworker/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 the platform-browser package.
+ */
+export * from './src/platform-webworker';
+// This file only reexports content of the `src` folder. Keep it that way.
diff --git a/modules/@angular/platform-webworker/rollup.config.js b/modules/@angular/platform-webworker/rollup.config.js
deleted file mode 100644
index c195c8be83..0000000000
--- a/modules/@angular/platform-webworker/rollup.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/platform-webworker/index.js',
-  dest: '../../../dist/packages-dist/platform-webworker/bundles/platform-webworker.umd.js',
-  format: 'umd',
-  moduleName: 'ng.platformWebworker',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx'
-  }
-};
diff --git a/modules/@angular/platform-webworker/tsconfig-build.json b/modules/@angular/platform-webworker/tsconfig-build.json
index 4afcab72f5..a9d9fabc87 100644
--- a/modules/@angular/platform-webworker/tsconfig-build.json
+++ b/modules/@angular/platform-webworker/tsconfig-build.json
@@ -15,18 +15,20 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "lib": ["es2015", "dom"],
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
     "types": []
   },
   "files": [
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
-    "strictMetadataEmit": true
+    "strictMetadataEmit": true,
+    "bundleIndex": "index",
+    "importAs": "@angular/platform-webworker"
   }
 }
diff --git a/modules/@angular/router/.babelrc b/modules/@angular/router/.babelrc
new file mode 100644
index 0000000000..5a23fed0b7
--- /dev/null
+++ b/modules/@angular/router/.babelrc
@@ -0,0 +1,38 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/common": "ng.common",
+      "@angular/platform-browser": "ng.platformBrowser",
+      "@angular/router": "ng.router",
+
+      "rxjs/BehaviorSubject": "Rx",
+      "rxjs/Observable": "Rx",
+      "rxjs/Subject": "Rx",
+      "rxjs/Subscription": "Rx",
+      "rxjs/util/EmptyError": "Rx",
+
+      "rxjs/observable/from": "Rx.Observable",
+      "rxjs/observable/fromPromise": "Rx.Observable",
+      "rxjs/observable/forkJoin": "Rx.Observable",
+      "rxjs/observable/of": "Rx.Observable",
+
+      "rxjs/operator/toPromise": "Rx.Observable.prototype",
+      "rxjs/operator/map": "Rx.Observable.prototype",
+      "rxjs/operator/mergeAll": "Rx.Observable.prototype",
+      "rxjs/operator/concatAll": "Rx.Observable.prototype",
+      "rxjs/operator/mergeMap": "Rx.Observable.prototype",
+      "rxjs/operator/reduce": "Rx.Observable.prototype",
+      "rxjs/operator/every": "Rx.Observable.prototype",
+      "rxjs/operator/first": "Rx.Observable.prototype",
+      "rxjs/operator/catch": "Rx.Observable.prototype",
+      "rxjs/operator/last": "Rx.Observable.prototype",
+      "rxjs/operator/filter": "Rx.Observable.prototype",
+      "rxjs/operator/concatMap": "Rx.Observable.prototype"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/router"
+}
diff --git a/modules/@angular/router/.babelrc-testing b/modules/@angular/router/.babelrc-testing
new file mode 100644
index 0000000000..8167b5eb54
--- /dev/null
+++ b/modules/@angular/router/.babelrc-testing
@@ -0,0 +1,16 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/common": "ng.common",
+      "@angular/common/testing": "ng.common.testing",
+      "@angular/platform-browser": "ng.platformBrowser",
+      "@angular/router": "ng.router",
+      "@angular/router/testing": "ng.router.testing"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/router/testing"
+}
diff --git a/modules/@angular/router/.babelrc-upgrade b/modules/@angular/router/.babelrc-upgrade
new file mode 100644
index 0000000000..931f1f8ad3
--- /dev/null
+++ b/modules/@angular/router/.babelrc-upgrade
@@ -0,0 +1,15 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/common": "ng.common",
+      "@angular/router": "ng.router",
+      "@angular/router/upgrade": "ng.router.upgrade",
+      "@angular/upgrade/static": "ng.upgrade.static"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/router/upgrade"
+}
diff --git a/modules/@angular/router/index.ts b/modules/@angular/router/index.ts
index 05e6b19532..e727e2e8a7 100644
--- a/modules/@angular/router/index.ts
+++ b/modules/@angular/router/index.ts
@@ -7,7 +7,7 @@
  */
 
 // 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`
+// by the TypeScript language service and during build for verification. `ngc`
 // replaces this file with production index.ts when it rewrites private symbol
 // names.
 
diff --git a/modules/@angular/router/package.json b/modules/@angular/router/package.json
index 03ac984481..0ed18a5ce7 100644
--- a/modules/@angular/router/package.json
+++ b/modules/@angular/router/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/router",
   "version": "0.0.0-ROUTERPLACEHOLDER",
   "description": "Angular - the routing library",
-  "main": "bundles/router.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/router.umd.js",
+  "module": "./@angular/router.es5.js",
+  "es2015": "./@angular/router.js",
+  "typings": "./typings/router.d.ts",
   "keywords": [
     "angular",
     "router"
diff --git a/modules/@angular/router/rollup-testing.config.js b/modules/@angular/router/rollup-testing.config.js
deleted file mode 100644
index 1943b5793c..0000000000
--- a/modules/@angular/router/rollup-testing.config.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/router/testing/index.js',
-  dest: '../../../dist/packages-dist/router/bundles/router-testing.umd.js',
-  format: 'umd',
-  moduleName: 'ng.router.testing',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/common/testing': 'ng.common.testing',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/router': 'ng.router'
-  }
-};
diff --git a/modules/@angular/router/rollup-upgrade.config.js b/modules/@angular/router/rollup-upgrade.config.js
deleted file mode 100644
index a7f56e3d02..0000000000
--- a/modules/@angular/router/rollup-upgrade.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/router/upgrade.js',
-  dest: '../../../dist/packages-dist/router/bundles/router-upgrade.umd.js',
-  format: 'umd',
-  moduleName: 'ng.router.upgrade',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/router': 'ng.router',
-    '@angular/upgrade/static': 'ng.upgrade.static'
-  }
-};
diff --git a/modules/@angular/router/rollup.config.js b/modules/@angular/router/rollup.config.js
deleted file mode 100644
index 5ee5465f69..0000000000
--- a/modules/@angular/router/rollup.config.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/router/index.js',
-  dest: '../../../dist/packages-dist/router/bundles/router.umd.js',
-  format: 'umd',
-  moduleName: 'ng.router',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/platform-browser': 'ng.platformBrowser',
-
-    'rxjs/BehaviorSubject': 'Rx',
-    'rxjs/Observable': 'Rx',
-    'rxjs/Subject': 'Rx',
-    'rxjs/Subscription': 'Rx',
-    'rxjs/util/EmptyError': 'Rx',
-
-    'rxjs/observable/from': 'Rx.Observable',
-    'rxjs/observable/fromPromise': 'Rx.Observable',
-    'rxjs/observable/forkJoin': 'Rx.Observable',
-    'rxjs/observable/of': 'Rx.Observable',
-
-    'rxjs/operator/toPromise': 'Rx.Observable.prototype',
-    'rxjs/operator/map': 'Rx.Observable.prototype',
-    'rxjs/operator/mergeAll': 'Rx.Observable.prototype',
-    'rxjs/operator/concatAll': 'Rx.Observable.prototype',
-    'rxjs/operator/mergeMap': 'Rx.Observable.prototype',
-    'rxjs/operator/reduce': 'Rx.Observable.prototype',
-    'rxjs/operator/every': 'Rx.Observable.prototype',
-    'rxjs/operator/first': 'Rx.Observable.prototype',
-    'rxjs/operator/catch': 'Rx.Observable.prototype',
-    'rxjs/operator/last': 'Rx.Observable.prototype',
-    'rxjs/operator/filter': 'Rx.Observable.prototype',
-    'rxjs/operator/concatMap': 'Rx.Observable.prototype'
-  },
-  plugins: []
-};
diff --git a/modules/@angular/router/src/private_export.ts b/modules/@angular/router/src/private_export.ts
index d65388ee99..25c7d71a6f 100644
--- a/modules/@angular/router/src/private_export.ts
+++ b/modules/@angular/router/src/private_export.ts
@@ -8,6 +8,5 @@
 
 
 
-export {ROUTES as ɵROUTES} from './router_config_loader';
 export {ROUTER_PROVIDERS as ɵROUTER_PROVIDERS} from './router_module';
 export {flatten as ɵflatten} from './utils/collection';
diff --git a/modules/@angular/router/testing/router_testing_module.ts b/modules/@angular/router/testing/router_testing_module.ts
index d65ba0370f..379abe7186 100644
--- a/modules/@angular/router/testing/router_testing_module.ts
+++ b/modules/@angular/router/testing/router_testing_module.ts
@@ -9,7 +9,7 @@
 import {Location, LocationStrategy} from '@angular/common';
 import {MockLocationStrategy, SpyLocation} from '@angular/common/testing';
 import {Compiler, Injectable, Injector, ModuleWithProviders, NgModule, NgModuleFactory, NgModuleFactoryLoader, Optional} from '@angular/core';
-import {NoPreloading, PreloadingStrategy, Route, Router, RouterModule, RouterOutletMap, Routes, UrlHandlingStrategy, UrlSerializer, provideRoutes, ɵROUTER_PROVIDERS as ROUTER_PROVIDERS, ɵROUTES as ROUTES, ɵflatten as flatten} from '@angular/router';
+import {NoPreloading, PreloadingStrategy, ROUTES, Route, Router, RouterModule, RouterOutletMap, Routes, UrlHandlingStrategy, UrlSerializer, provideRoutes, ɵROUTER_PROVIDERS as ROUTER_PROVIDERS, ɵflatten as flatten} from '@angular/router';
 
 
 
diff --git a/modules/@angular/router/tsconfig-build.json b/modules/@angular/router/tsconfig-build.json
index 2f8a57f1b7..1a45c25934 100644
--- a/modules/@angular/router/tsconfig-build.json
+++ b/modules/@angular/router/tsconfig-build.json
@@ -20,7 +20,7 @@
     "sourceMap": true,
     "inlineSources": true,
     "lib": ["es2015", "dom"],
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true
   },
   "files": [
diff --git a/modules/@angular/router/tsconfig-testing.json b/modules/@angular/router/tsconfig-testing.json
index f6a106efe7..ca8ecb5ad5 100644
--- a/modules/@angular/router/tsconfig-testing.json
+++ b/modules/@angular/router/tsconfig-testing.json
@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig-build",
   "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/router",
     "paths": {
       "@angular/core": ["../../../dist/packages-dist/core"],
       "@angular/common": ["../../../dist/packages-dist/common"],
diff --git a/modules/@angular/router/tsconfig-upgrade.json b/modules/@angular/router/tsconfig-upgrade.json
index 80194268e9..0343e3c052 100644
--- a/modules/@angular/router/tsconfig-upgrade.json
+++ b/modules/@angular/router/tsconfig-upgrade.json
@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig-build",
   "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/router/upgrade",
     "paths": {
       "@angular/core": ["../../../dist/packages-dist/core"],
       "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"],
diff --git a/modules/@angular/upgrade/.babelrc b/modules/@angular/upgrade/.babelrc
new file mode 100644
index 0000000000..9ffc504bf5
--- /dev/null
+++ b/modules/@angular/upgrade/.babelrc
@@ -0,0 +1,21 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/core": "ng.core",
+      "@angular/common": "ng.common",
+      "@angular/compiler": "ng.compiler",
+      "@angular/platform-browser": "ng.platformBrowser",
+      "@angular/platform-browser-dynamic": "ng.platformBrowserDynamic",
+      "@angular/upgrade": "ng.upgrade",
+      "rxjs/Subject": "Rx",
+      "rxjs/observable/PromiseObservable": "Rx",  // this is wrong, but this stuff has changed in rxjs
+                                                  // b.6 so we need to fix it when we update.
+      "rxjs/operator/toPromise": "Rx.Observable.prototype",
+      "rxjs/Observable": "Rx"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/upgrade"
+}
diff --git a/modules/@angular/upgrade/.babelrc-static b/modules/@angular/upgrade/.babelrc-static
new file mode 100644
index 0000000000..e85ea99663
--- /dev/null
+++ b/modules/@angular/upgrade/.babelrc-static
@@ -0,0 +1,12 @@
+
+{
+  "presets": ["es2015"],
+  "plugins": [["transform-es2015-modules-umd", {
+    "globals": {
+      "@angular/upgrade": "ng.upgrade",
+      "@angular/upgrade/static": "ng.upgrade.static"
+    },
+    "exactGlobals": true
+  }]],
+  "moduleId": "@angular/upgrade/static"
+}
diff --git a/modules/@angular/upgrade/index.ts b/modules/@angular/upgrade/index.ts
index 67db97dff7..e727e2e8a7 100644
--- a/modules/@angular/upgrade/index.ts
+++ b/modules/@angular/upgrade/index.ts
@@ -6,13 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-/**
- * @module
- * @description
- * Entry point for all public APIs of the upgrade/dynamic package, allowing
- * Angular 1 and Angular 2+ to run side by side in the same application.
- */
-export {VERSION} from './src/common/version';
-export {UpgradeAdapter, UpgradeAdapterRef} from './src/dynamic/upgrade_adapter';
+// 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 re-exports content of the `src` folder. Keep it that way.
+export * from './public_api';
diff --git a/modules/@angular/upgrade/package.json b/modules/@angular/upgrade/package.json
index 2c7119ef6d..fe7229461c 100644
--- a/modules/@angular/upgrade/package.json
+++ b/modules/@angular/upgrade/package.json
@@ -2,9 +2,10 @@
   "name": "@angular/upgrade",
   "version": "0.0.0-PLACEHOLDER",
   "description": "Angular - the library for easing update from v1 to v2",
-  "main": "bundles/upgrade.umd.js",
-  "module": "index.js",
-  "typings": "index.d.ts",
+  "main": "./bundles/upgrade.umd.js",
+  "module": "./@angular/upgrade.es5.js",
+  "es2015": "./@angular/upgrade.js",
+  "typings": "./typings/upgrade.d.ts",
   "author": "angular",
   "license": "MIT",
   "peerDependencies": {
diff --git a/modules/@angular/upgrade/public_api.ts b/modules/@angular/upgrade/public_api.ts
new file mode 100644
index 0000000000..67db97dff7
--- /dev/null
+++ b/modules/@angular/upgrade/public_api.ts
@@ -0,0 +1,18 @@
+/**
+ * @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 the upgrade/dynamic package, allowing
+ * Angular 1 and Angular 2+ to run side by side in the same application.
+ */
+export {VERSION} from './src/common/version';
+export {UpgradeAdapter, UpgradeAdapterRef} from './src/dynamic/upgrade_adapter';
+
+// This file only re-exports content of the `src` folder. Keep it that way.
diff --git a/modules/@angular/upgrade/rollup-static.config.js b/modules/@angular/upgrade/rollup-static.config.js
deleted file mode 100644
index a69138c84e..0000000000
--- a/modules/@angular/upgrade/rollup-static.config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/upgrade/static.js',
-  dest: '../../../dist/packages-dist/upgrade/bundles/upgrade-static.umd.js',
-  format: 'umd',
-  moduleName: 'ng.upgrade.static',
-  globals: {'@angular/core': 'ng.core'}
-};
diff --git a/modules/@angular/upgrade/rollup.config.js b/modules/@angular/upgrade/rollup.config.js
deleted file mode 100644
index f02a7da579..0000000000
--- a/modules/@angular/upgrade/rollup.config.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export default {
-  entry: '../../../dist/packages-dist/upgrade/index.js',
-  dest: '../../../dist/packages-dist/upgrade/bundles/upgrade.umd.js',
-  format: 'umd',
-  moduleName: 'ng.upgrade',
-  globals: {
-    '@angular/core': 'ng.core',
-    '@angular/common': 'ng.common',
-    '@angular/compiler': 'ng.compiler',
-    '@angular/platform-browser': 'ng.platformBrowser',
-    '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
-    'rxjs/Subject': 'Rx',
-    'rxjs/observable/PromiseObservable': 'Rx',  // this is wrong, but this stuff has changed in rxjs
-                                                // b.6 so we need to fix it when we update.
-    'rxjs/operator/toPromise': 'Rx.Observable.prototype',
-    'rxjs/Observable': 'Rx',
-  }
-};
diff --git a/modules/@angular/upgrade/static.ts b/modules/@angular/upgrade/static.ts
index 30dcc522fc..c2eb778246 100644
--- a/modules/@angular/upgrade/static.ts
+++ b/modules/@angular/upgrade/static.ts
@@ -7,7 +7,7 @@
  */
 
 // 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`
+// by the TypeScript language service and during build for verification. `ngc`
 // replaces this file with production static.ts when it rewrites private symbol
 // names.
 
diff --git a/modules/@angular/upgrade/tsconfig-build.json b/modules/@angular/upgrade/tsconfig-build.json
index 4a3c22b703..326366156c 100644
--- a/modules/@angular/upgrade/tsconfig-build.json
+++ b/modules/@angular/upgrade/tsconfig-build.json
@@ -17,22 +17,20 @@
     "rootDir": ".",
     "sourceMap": true,
     "inlineSources": true,
-    "target": "es5",
+    "target": "es2015",
     "skipLibCheck": true,
     "lib": [ "es2015", "dom" ],
     // don't auto-discover @types/node, it results in a ///<reference in the .d.ts output
     "types": []
   },
   "files": [
-    "public_api_static.ts",
-    "index.ts",
+    "public_api.ts",
     "../../../node_modules/zone.js/dist/zone.js.d.ts"
   ],
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
-    "bundleIndex": "static",
-    "libraryIndex": "./public_api_static",
-    "importAs": "@angular/upgrade/static"
+    "bundleIndex": "index",
+    "importAs": "@angular/upgrade"
   }
 }
diff --git a/modules/@angular/upgrade/tsconfig-static.json b/modules/@angular/upgrade/tsconfig-static.json
new file mode 100644
index 0000000000..ac1948de8e
--- /dev/null
+++ b/modules/@angular/upgrade/tsconfig-static.json
@@ -0,0 +1,22 @@
+
+{
+  "extends": "./tsconfig-build",
+  "compilerOptions": {
+    "outDir": "../../../dist/packages-dist/upgrade/static",
+    "target": "es5",
+    "paths": {
+      "@angular/core": ["../../../dist/packages-dist/core"],
+      "@angular/common": ["../../../dist/packages-dist/common"],
+      "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"],
+      "@angular/platform-browser-dynamic": ["../../../dist/packages-dist/platform-browser-dynamic"]
+    }
+  },
+  "files": [
+    "public_api_static.ts",
+    "../../../node_modules/zone.js/dist/zone.js.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "bundleIndex": "static",
+    "importAs": "@angular/upgrade/static"
+  }
+}
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 16e309e9a8..607c87eb37 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -260,6 +260,30 @@
       "version": "1.5.0",
       "dev": true
     },
+    "babel-cli": {
+      "version": "6.23.0",
+      "dev": true,
+      "dependencies": {
+        "async-each": {
+          "version": "1.0.1",
+          "dev": true,
+          "optional": true
+        },
+        "chokidar": {
+          "version": "1.6.1",
+          "dev": true,
+          "optional": true
+        },
+        "glob": {
+          "version": "7.1.1",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.4",
+          "dev": true
+        }
+      }
+    },
     "babel-code-frame": {
       "version": "6.20.0",
       "dev": true,
@@ -274,10 +298,412 @@
         }
       }
     },
+    "babel-core": {
+      "version": "6.23.1",
+      "dev": true,
+      "dependencies": {
+        "babel-code-frame": {
+          "version": "6.22.0",
+          "dev": true
+        },
+        "esutils": {
+          "version": "2.0.2",
+          "dev": true
+        },
+        "js-tokens": {
+          "version": "3.0.1",
+          "dev": true
+        },
+        "json5": {
+          "version": "0.5.1",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.4",
+          "dev": true
+        }
+      }
+    },
+    "babel-generator": {
+      "version": "6.23.0",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "dev": true
+        }
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-helper-define-map": {
+      "version": "6.23.0",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "dev": true
+        }
+      }
+    },
+    "babel-helper-evaluate-path": {
+      "version": "0.0.3",
+      "dev": true
+    },
+    "babel-helper-flip-expressions": {
+      "version": "0.0.2",
+      "dev": true
+    },
+    "babel-helper-function-name": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-helper-is-nodes-equiv": {
+      "version": "0.0.1",
+      "dev": true
+    },
+    "babel-helper-is-void-0": {
+      "version": "0.0.1",
+      "dev": true
+    },
+    "babel-helper-mark-eval-scopes": {
+      "version": "0.0.2",
+      "dev": true
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-helper-regex": {
+      "version": "6.22.0",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "dev": true
+        }
+      }
+    },
+    "babel-helper-remove-or-void": {
+      "version": "0.0.1",
+      "dev": true
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-helper-to-multiple-sequence-expressions": {
+      "version": "0.0.3",
+      "dev": true
+    },
+    "babel-helpers": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-loader": {
+      "version": "6.3.0",
+      "dev": true,
+      "dependencies": {
+        "json5": {
+          "version": "0.5.1",
+          "dev": true
+        },
+        "loader-utils": {
+          "version": "0.2.16",
+          "dev": true
+        }
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-minify-constant-folding": {
+      "version": "0.0.4",
+      "dev": true,
+      "dependencies": {
+        "jsesc": {
+          "version": "2.4.0",
+          "dev": true
+        }
+      }
+    },
+    "babel-plugin-minify-dead-code-elimination": {
+      "version": "0.1.3",
+      "dev": true
+    },
+    "babel-plugin-minify-flip-comparisons": {
+      "version": "0.0.2",
+      "dev": true
+    },
+    "babel-plugin-minify-guarded-expressions": {
+      "version": "0.0.4",
+      "dev": true
+    },
+    "babel-plugin-minify-infinity": {
+      "version": "0.0.3",
+      "dev": true
+    },
+    "babel-plugin-minify-mangle-names": {
+      "version": "0.0.7",
+      "dev": true
+    },
+    "babel-plugin-minify-numeric-literals": {
+      "version": "0.0.1",
+      "dev": true
+    },
+    "babel-plugin-minify-replace": {
+      "version": "0.0.1",
+      "dev": true
+    },
+    "babel-plugin-minify-simplify": {
+      "version": "0.0.7",
+      "dev": true
+    },
+    "babel-plugin-minify-type-constructors": {
+      "version": "0.0.3",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.23.0",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "dev": true
+        }
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-inline-consecutive-adds": {
+      "version": "0.0.2",
+      "dev": true
+    },
+    "babel-plugin-transform-member-expression-literals": {
+      "version": "6.8.1",
+      "dev": true
+    },
+    "babel-plugin-transform-merge-sibling-variables": {
+      "version": "6.8.2",
+      "dev": true
+    },
+    "babel-plugin-transform-minify-booleans": {
+      "version": "6.8.0",
+      "dev": true
+    },
+    "babel-plugin-transform-property-literals": {
+      "version": "6.8.1",
+      "dev": true
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-regexp-constructors": {
+      "version": "0.0.5",
+      "dev": true
+    },
+    "babel-plugin-transform-remove-console": {
+      "version": "6.8.0",
+      "dev": true
+    },
+    "babel-plugin-transform-remove-debugger": {
+      "version": "6.8.0",
+      "dev": true
+    },
+    "babel-plugin-transform-remove-undefined": {
+      "version": "0.0.5",
+      "dev": true
+    },
+    "babel-plugin-transform-simplify-comparison-operators": {
+      "version": "6.8.1",
+      "dev": true
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-plugin-transform-undefined-to-void": {
+      "version": "6.8.0",
+      "dev": true
+    },
+    "babel-polyfill": {
+      "version": "6.23.0",
+      "dev": true
+    },
+    "babel-preset-babili": {
+      "version": "0.0.11",
+      "dev": true
+    },
+    "babel-preset-es2015": {
+      "version": "6.22.0",
+      "dev": true
+    },
+    "babel-register": {
+      "version": "6.23.0",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "dev": true
+        }
+      }
+    },
     "babel-runtime": {
       "version": "6.22.0",
       "dev": true
     },
+    "babel-template": {
+      "version": "6.23.0",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "dev": true
+        }
+      }
+    },
+    "babel-traverse": {
+      "version": "6.23.1",
+      "dev": true,
+      "dependencies": {
+        "babel-code-frame": {
+          "version": "6.22.0",
+          "dev": true
+        },
+        "esutils": {
+          "version": "2.0.2",
+          "dev": true
+        },
+        "js-tokens": {
+          "version": "3.0.1",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.4",
+          "dev": true
+        }
+      }
+    },
+    "babel-types": {
+      "version": "6.23.0",
+      "dev": true,
+      "dependencies": {
+        "esutils": {
+          "version": "2.0.2",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.4",
+          "dev": true
+        }
+      }
+    },
+    "babili": {
+      "version": "0.0.11",
+      "dev": true
+    },
+    "babylon": {
+      "version": "6.15.0",
+      "dev": true
+    },
     "backo2": {
       "version": "1.0.2",
       "dev": true
@@ -2041,6 +2467,10 @@
       "version": "2.9.0",
       "dev": true
     },
+    "commondir": {
+      "version": "1.0.1",
+      "dev": true
+    },
     "compare-func": {
       "version": "1.3.2",
       "dev": true
@@ -2255,6 +2685,10 @@
         }
       }
     },
+    "convert-source-map": {
+      "version": "1.4.0",
+      "dev": true
+    },
     "cookie": {
       "version": "0.1.3",
       "dev": true
@@ -2499,6 +2933,10 @@
       "version": "1.1.1",
       "dev": true
     },
+    "emojis-list": {
+      "version": "2.1.0",
+      "dev": true
+    },
     "end-of-stream": {
       "version": "1.1.0",
       "dev": true
@@ -2801,6 +3239,10 @@
       "version": "0.4.0",
       "dev": true
     },
+    "find-cache-dir": {
+      "version": "0.1.1",
+      "dev": true
+    },
     "find-index": {
       "version": "0.1.1",
       "dev": true
@@ -2897,6 +3339,10 @@
       "version": "0.3.1",
       "dev": true
     },
+    "fs-readdir-recursive": {
+      "version": "1.0.0",
+      "dev": true
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "dev": true
@@ -3523,6 +3969,10 @@
       "version": "0.0.12",
       "dev": true
     },
+    "globals": {
+      "version": "9.15.0",
+      "dev": true
+    },
     "globby": {
       "version": "5.0.0",
       "dev": true,
@@ -3847,6 +4297,10 @@
       "version": "2.16.3",
       "dev": true
     },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "dev": true
+    },
     "hosted-git-info": {
       "version": "2.1.4",
       "dev": true
@@ -4211,6 +4665,10 @@
       "dev": true,
       "optional": true
     },
+    "jsesc": {
+      "version": "1.3.0",
+      "dev": true
+    },
     "json-schema": {
       "version": "0.2.3",
       "dev": true
@@ -4439,6 +4897,10 @@
       "version": "3.0.4",
       "dev": true
     },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "dev": true
+    },
     "lodash.keys": {
       "version": "3.1.2",
       "dev": true
@@ -4447,6 +4909,10 @@
       "version": "3.6.1",
       "dev": true
     },
+    "lodash.some": {
+      "version": "4.6.0",
+      "dev": true
+    },
     "lodash.template": {
       "version": "3.6.2",
       "dev": true
@@ -5058,6 +5524,20 @@
       "version": "0.1.3",
       "dev": true
     },
+    "output-file-sync": {
+      "version": "1.1.2",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.1.11",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "dev": true
+        }
+      }
+    },
     "over": {
       "version": "0.0.5",
       "dev": true
@@ -5172,6 +5652,10 @@
       "version": "2.0.0",
       "dev": true
     },
+    "pkg-dir": {
+      "version": "1.0.0",
+      "dev": true
+    },
     "pkginfo": {
       "version": "0.3.1",
       "dev": true
@@ -5188,6 +5672,10 @@
       "version": "1.0.1",
       "dev": true
     },
+    "private": {
+      "version": "0.1.7",
+      "dev": true
+    },
     "process": {
       "version": "0.11.9",
       "dev": true
@@ -5391,14 +5879,26 @@
     "reflect-metadata": {
       "version": "0.1.3"
     },
+    "regenerate": {
+      "version": "1.3.2",
+      "dev": true
+    },
     "regenerator-runtime": {
       "version": "0.10.1",
       "dev": true
     },
+    "regenerator-transform": {
+      "version": "0.9.8",
+      "dev": true
+    },
     "regex-cache": {
       "version": "0.4.2",
       "dev": true
     },
+    "regexpu-core": {
+      "version": "2.0.0",
+      "dev": true
+    },
     "registry-auth-token": {
       "version": "3.1.0",
       "dev": true
@@ -5407,6 +5907,20 @@
       "version": "3.1.0",
       "dev": true
     },
+    "regjsgen": {
+      "version": "0.2.0",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "dev": true,
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "dev": true
+        }
+      }
+    },
     "repeat-element": {
       "version": "1.1.2",
       "dev": true
@@ -5605,6 +6119,16 @@
         }
       }
     },
+    "rollup-plugin-babel": {
+      "version": "2.7.1",
+      "dev": true,
+      "dependencies": {
+        "object-assign": {
+          "version": "4.1.1",
+          "dev": true
+        }
+      }
+    },
     "rollup-plugin-commonjs": {
       "version": "5.0.5",
       "dev": true,
@@ -5780,6 +6304,10 @@
       "version": "2.1.2",
       "dev": true
     },
+    "slash": {
+      "version": "1.0.0",
+      "dev": true
+    },
     "slice-stream": {
       "version": "1.0.0",
       "dev": true,
@@ -6129,6 +6657,10 @@
       "version": "0.1.4",
       "dev": true
     },
+    "to-fast-properties": {
+      "version": "1.0.2",
+      "dev": true
+    },
     "tough-cookie": {
       "version": "2.2.1",
       "dev": true
@@ -6145,6 +6677,10 @@
       "version": "1.0.1",
       "dev": true
     },
+    "trim-right": {
+      "version": "1.0.1",
+      "dev": true
+    },
     "ts-api-guardian": {
       "version": "0.2.1",
       "dev": true,
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4a2a00f148..2a4c3af528 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -384,6 +384,40 @@
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz",
       "dev": true
     },
+    "babel-cli": {
+      "version": "6.23.0",
+      "from": "babel-cli@>=6.22.2 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.23.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "async-each": {
+          "version": "1.0.1",
+          "from": "async-each@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+          "dev": true,
+          "optional": true
+        },
+        "chokidar": {
+          "version": "1.6.1",
+          "from": "chokidar@>=1.6.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz",
+          "dev": true,
+          "optional": true
+        },
+        "glob": {
+          "version": "7.1.1",
+          "from": "glob@>=7.0.0 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.4",
+          "from": "lodash@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "dev": true
+        }
+      }
+    },
     "babel-code-frame": {
       "version": "6.20.0",
       "from": "babel-code-frame@>=6.20.0 <7.0.0",
@@ -404,12 +438,604 @@
         }
       }
     },
+    "babel-core": {
+      "version": "6.23.1",
+      "from": "https://registry.npmjs.org/babel-core/-/babel-core-6.23.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.23.1.tgz",
+      "dev": true,
+      "dependencies": {
+        "babel-code-frame": {
+          "version": "6.22.0",
+          "from": "babel-code-frame@>=6.22.0 <7.0.0",
+          "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
+          "dev": true
+        },
+        "esutils": {
+          "version": "2.0.2",
+          "from": "esutils@>=2.0.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+          "dev": true
+        },
+        "js-tokens": {
+          "version": "3.0.1",
+          "from": "js-tokens@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz",
+          "dev": true
+        },
+        "json5": {
+          "version": "0.5.1",
+          "from": "json5@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.4",
+          "from": "lodash@^4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "dev": true
+        }
+      }
+    },
+    "babel-generator": {
+      "version": "6.23.0",
+      "from": "babel-generator@>=6.23.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.23.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "from": "lodash@^4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "dev": true
+        }
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.22.0",
+      "from": "babel-helper-call-delegate@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-helper-define-map": {
+      "version": "6.23.0",
+      "from": "babel-helper-define-map@>=6.23.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.23.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "from": "lodash@^4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "dev": true
+        }
+      }
+    },
+    "babel-helper-evaluate-path": {
+      "version": "0.0.3",
+      "from": "babel-helper-evaluate-path@>=0.0.3 <0.0.4",
+      "resolved": "https://registry.npmjs.org/babel-helper-evaluate-path/-/babel-helper-evaluate-path-0.0.3.tgz",
+      "dev": true
+    },
+    "babel-helper-flip-expressions": {
+      "version": "0.0.2",
+      "from": "babel-helper-flip-expressions@>=0.0.2 <0.0.3",
+      "resolved": "https://registry.npmjs.org/babel-helper-flip-expressions/-/babel-helper-flip-expressions-0.0.2.tgz",
+      "dev": true
+    },
+    "babel-helper-function-name": {
+      "version": "6.23.0",
+      "from": "babel-helper-function-name@>=6.23.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.22.0",
+      "from": "babel-helper-get-function-arity@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.22.0",
+      "from": "babel-helper-hoist-variables@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-helper-is-nodes-equiv": {
+      "version": "0.0.1",
+      "from": "babel-helper-is-nodes-equiv@>=0.0.1 <0.0.2",
+      "resolved": "https://registry.npmjs.org/babel-helper-is-nodes-equiv/-/babel-helper-is-nodes-equiv-0.0.1.tgz",
+      "dev": true
+    },
+    "babel-helper-is-void-0": {
+      "version": "0.0.1",
+      "from": "babel-helper-is-void-0@>=0.0.1 <0.0.2",
+      "resolved": "https://registry.npmjs.org/babel-helper-is-void-0/-/babel-helper-is-void-0-0.0.1.tgz",
+      "dev": true
+    },
+    "babel-helper-mark-eval-scopes": {
+      "version": "0.0.2",
+      "from": "babel-helper-mark-eval-scopes@>=0.0.2 <0.0.3",
+      "resolved": "https://registry.npmjs.org/babel-helper-mark-eval-scopes/-/babel-helper-mark-eval-scopes-0.0.2.tgz",
+      "dev": true
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.23.0",
+      "from": "babel-helper-optimise-call-expression@>=6.23.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-helper-regex": {
+      "version": "6.22.0",
+      "from": "babel-helper-regex@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.22.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "from": "lodash@^4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "dev": true
+        }
+      }
+    },
+    "babel-helper-remove-or-void": {
+      "version": "0.0.1",
+      "from": "babel-helper-remove-or-void@>=0.0.1 <0.0.2",
+      "resolved": "https://registry.npmjs.org/babel-helper-remove-or-void/-/babel-helper-remove-or-void-0.0.1.tgz",
+      "dev": true
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.23.0",
+      "from": "babel-helper-replace-supers@>=6.23.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-helper-to-multiple-sequence-expressions": {
+      "version": "0.0.3",
+      "from": "babel-helper-to-multiple-sequence-expressions@>=0.0.3 <0.0.4",
+      "resolved": "https://registry.npmjs.org/babel-helper-to-multiple-sequence-expressions/-/babel-helper-to-multiple-sequence-expressions-0.0.3.tgz",
+      "dev": true
+    },
+    "babel-helpers": {
+      "version": "6.23.0",
+      "from": "babel-helpers@>=6.23.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-loader": {
+      "version": "6.3.0",
+      "from": "babel-loader@latest",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-6.3.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "json5": {
+          "version": "0.5.1",
+          "from": "json5@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "dev": true
+        },
+        "loader-utils": {
+          "version": "0.2.16",
+          "from": "loader-utils@>=0.2.16 <0.3.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz",
+          "dev": true
+        }
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "from": "babel-messages@>=6.23.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "from": "babel-plugin-check-es2015-constants@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-minify-constant-folding": {
+      "version": "0.0.4",
+      "from": "babel-plugin-minify-constant-folding@>=0.0.4 <0.0.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-constant-folding/-/babel-plugin-minify-constant-folding-0.0.4.tgz",
+      "dev": true,
+      "dependencies": {
+        "jsesc": {
+          "version": "2.4.0",
+          "from": "jsesc@>=2.4.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.4.0.tgz",
+          "dev": true
+        }
+      }
+    },
+    "babel-plugin-minify-dead-code-elimination": {
+      "version": "0.1.3",
+      "from": "babel-plugin-minify-dead-code-elimination@>=0.1.3 <0.2.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-dead-code-elimination/-/babel-plugin-minify-dead-code-elimination-0.1.3.tgz",
+      "dev": true
+    },
+    "babel-plugin-minify-flip-comparisons": {
+      "version": "0.0.2",
+      "from": "babel-plugin-minify-flip-comparisons@>=0.0.2 <0.0.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-flip-comparisons/-/babel-plugin-minify-flip-comparisons-0.0.2.tgz",
+      "dev": true
+    },
+    "babel-plugin-minify-guarded-expressions": {
+      "version": "0.0.4",
+      "from": "babel-plugin-minify-guarded-expressions@>=0.0.4 <0.0.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-guarded-expressions/-/babel-plugin-minify-guarded-expressions-0.0.4.tgz",
+      "dev": true
+    },
+    "babel-plugin-minify-infinity": {
+      "version": "0.0.3",
+      "from": "babel-plugin-minify-infinity@>=0.0.3 <0.0.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-infinity/-/babel-plugin-minify-infinity-0.0.3.tgz",
+      "dev": true
+    },
+    "babel-plugin-minify-mangle-names": {
+      "version": "0.0.7",
+      "from": "babel-plugin-minify-mangle-names@>=0.0.7 <0.0.8",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-mangle-names/-/babel-plugin-minify-mangle-names-0.0.7.tgz",
+      "dev": true
+    },
+    "babel-plugin-minify-numeric-literals": {
+      "version": "0.0.1",
+      "from": "babel-plugin-minify-numeric-literals@>=0.0.1 <0.0.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-numeric-literals/-/babel-plugin-minify-numeric-literals-0.0.1.tgz",
+      "dev": true
+    },
+    "babel-plugin-minify-replace": {
+      "version": "0.0.1",
+      "from": "babel-plugin-minify-replace@>=0.0.1 <0.0.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-replace/-/babel-plugin-minify-replace-0.0.1.tgz",
+      "dev": true
+    },
+    "babel-plugin-minify-simplify": {
+      "version": "0.0.7",
+      "from": "babel-plugin-minify-simplify@>=0.0.7 <0.0.8",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-simplify/-/babel-plugin-minify-simplify-0.0.7.tgz",
+      "dev": true
+    },
+    "babel-plugin-minify-type-constructors": {
+      "version": "0.0.3",
+      "from": "babel-plugin-minify-type-constructors@>=0.0.3 <0.0.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-minify-type-constructors/-/babel-plugin-minify-type-constructors-0.0.3.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-arrow-functions@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.23.0",
+      "from": "babel-plugin-transform-es2015-block-scoping@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.23.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "from": "lodash@^4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "dev": true
+        }
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.23.0",
+      "from": "babel-plugin-transform-es2015-classes@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-computed-properties@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "from": "babel-plugin-transform-es2015-destructuring@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-duplicate-keys@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "from": "babel-plugin-transform-es2015-for-of@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-function-name@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-literals@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-modules-amd@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.23.0",
+      "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.23.0",
+      "from": "babel-plugin-transform-es2015-modules-systemjs@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.23.0",
+      "from": "babel-plugin-transform-es2015-modules-umd@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-object-super@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.23.0",
+      "from": "babel-plugin-transform-es2015-parameters@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-shorthand-properties@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-spread@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-sticky-regex@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-template-literals@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "from": "babel-plugin-transform-es2015-typeof-symbol@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-es2015-unicode-regex@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-inline-consecutive-adds": {
+      "version": "0.0.2",
+      "from": "babel-plugin-transform-inline-consecutive-adds@>=0.0.2 <0.0.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-inline-consecutive-adds/-/babel-plugin-transform-inline-consecutive-adds-0.0.2.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-member-expression-literals": {
+      "version": "6.8.1",
+      "from": "babel-plugin-transform-member-expression-literals@>=6.8.1 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-member-expression-literals/-/babel-plugin-transform-member-expression-literals-6.8.1.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-merge-sibling-variables": {
+      "version": "6.8.2",
+      "from": "babel-plugin-transform-merge-sibling-variables@>=6.8.2 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-merge-sibling-variables/-/babel-plugin-transform-merge-sibling-variables-6.8.2.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-minify-booleans": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-minify-booleans@>=6.8.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-minify-booleans/-/babel-plugin-transform-minify-booleans-6.8.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-property-literals": {
+      "version": "6.8.1",
+      "from": "babel-plugin-transform-property-literals@>=6.8.1 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-property-literals/-/babel-plugin-transform-property-literals-6.8.1.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-regenerator@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-regexp-constructors": {
+      "version": "0.0.5",
+      "from": "babel-plugin-transform-regexp-constructors@>=0.0.5 <0.0.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regexp-constructors/-/babel-plugin-transform-regexp-constructors-0.0.5.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-remove-console": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-remove-console@>=6.8.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.8.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-remove-debugger": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-remove-debugger@>=6.8.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-debugger/-/babel-plugin-transform-remove-debugger-6.8.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-remove-undefined": {
+      "version": "0.0.5",
+      "from": "babel-plugin-transform-remove-undefined@>=0.0.5 <0.0.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-remove-undefined/-/babel-plugin-transform-remove-undefined-0.0.5.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-simplify-comparison-operators": {
+      "version": "6.8.1",
+      "from": "babel-plugin-transform-simplify-comparison-operators@>=6.8.1 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-simplify-comparison-operators/-/babel-plugin-transform-simplify-comparison-operators-6.8.1.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.22.0",
+      "from": "babel-plugin-transform-strict-mode@>=6.22.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-plugin-transform-undefined-to-void": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-undefined-to-void@>=6.8.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.8.0.tgz",
+      "dev": true
+    },
+    "babel-polyfill": {
+      "version": "6.23.0",
+      "from": "babel-polyfill@>=6.23.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz",
+      "dev": true
+    },
+    "babel-preset-babili": {
+      "version": "0.0.11",
+      "from": "babel-preset-babili@0.0.11",
+      "resolved": "https://registry.npmjs.org/babel-preset-babili/-/babel-preset-babili-0.0.11.tgz",
+      "dev": true
+    },
+    "babel-preset-es2015": {
+      "version": "6.22.0",
+      "from": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.22.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.22.0.tgz",
+      "dev": true
+    },
+    "babel-register": {
+      "version": "6.23.0",
+      "from": "babel-register@>=6.23.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.23.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "from": "lodash@^4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "dev": true
+        }
+      }
+    },
     "babel-runtime": {
       "version": "6.22.0",
       "from": "babel-runtime@>=6.0.0 <7.0.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz",
       "dev": true
     },
+    "babel-template": {
+      "version": "6.23.0",
+      "from": "babel-template@>=6.23.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.23.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "from": "lodash@^4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "dev": true
+        }
+      }
+    },
+    "babel-traverse": {
+      "version": "6.23.1",
+      "from": "babel-traverse@>=6.23.1 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.23.1.tgz",
+      "dev": true,
+      "dependencies": {
+        "babel-code-frame": {
+          "version": "6.22.0",
+          "from": "babel-code-frame@^6.22.0",
+          "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
+          "dev": true
+        },
+        "esutils": {
+          "version": "2.0.2",
+          "from": "esutils@^2.0.2",
+          "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+          "dev": true
+        },
+        "js-tokens": {
+          "version": "3.0.1",
+          "from": "js-tokens@^3.0.0",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.4",
+          "from": "lodash@^4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "dev": true
+        }
+      }
+    },
+    "babel-types": {
+      "version": "6.23.0",
+      "from": "babel-types@>=6.23.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.23.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "esutils": {
+          "version": "2.0.2",
+          "from": "esutils@^2.0.2",
+          "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+          "dev": true
+        },
+        "lodash": {
+          "version": "4.17.4",
+          "from": "lodash@^4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "dev": true
+        }
+      }
+    },
+    "babili": {
+      "version": "0.0.11",
+      "from": "babili@0.0.11",
+      "resolved": "https://registry.npmjs.org/babili/-/babili-0.0.11.tgz",
+      "dev": true
+    },
+    "babylon": {
+      "version": "6.15.0",
+      "from": "babylon@>=6.11.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.15.0.tgz",
+      "dev": true
+    },
     "backo2": {
       "version": "1.0.2",
       "from": "backo2@1.0.2",
@@ -2935,6 +3561,12 @@
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
       "dev": true
     },
+    "commondir": {
+      "version": "1.0.1",
+      "from": "commondir@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "dev": true
+    },
     "compare-func": {
       "version": "1.3.2",
       "from": "compare-func@>=1.3.1 <2.0.0",
@@ -3249,6 +3881,12 @@
         }
       }
     },
+    "convert-source-map": {
+      "version": "1.4.0",
+      "from": "convert-source-map@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.4.0.tgz",
+      "dev": true
+    },
     "cookie": {
       "version": "0.1.3",
       "from": "cookie@0.1.3",
@@ -3611,6 +4249,12 @@
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "dev": true
     },
+    "emojis-list": {
+      "version": "2.1.0",
+      "from": "emojis-list@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "dev": true
+    },
     "end-of-stream": {
       "version": "1.1.0",
       "from": "end-of-stream@>=1.0.0 <2.0.0",
@@ -4053,6 +4697,12 @@
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz",
       "dev": true
     },
+    "find-cache-dir": {
+      "version": "0.1.1",
+      "from": "find-cache-dir@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
+      "dev": true
+    },
     "find-index": {
       "version": "0.1.1",
       "from": "find-index@>=0.1.1 <0.2.0",
@@ -4193,6 +4843,12 @@
       "resolved": "https://registry.npmjs.org/fs-promise/-/fs-promise-0.3.1.tgz",
       "dev": true
     },
+    "fs-readdir-recursive": {
+      "version": "1.0.0",
+      "from": "fs-readdir-recursive@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz",
+      "dev": true
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "from": "fs.realpath@>=1.0.0 <2.0.0",
@@ -5137,6 +5793,12 @@
       "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
       "dev": true
     },
+    "globals": {
+      "version": "9.15.0",
+      "from": "globals@>=9.0.0 <10.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.15.0.tgz",
+      "dev": true
+    },
     "globby": {
       "version": "5.0.0",
       "from": "globby@>=5.0.0 <6.0.0",
@@ -5609,6 +6271,12 @@
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "dev": true
     },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "from": "home-or-tmp@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "dev": true
+    },
     "hosted-git-info": {
       "version": "2.1.4",
       "from": "hosted-git-info@>=2.1.4 <3.0.0",
@@ -6147,6 +6815,12 @@
       "dev": true,
       "optional": true
     },
+    "jsesc": {
+      "version": "1.3.0",
+      "from": "jsesc@>=1.3.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "dev": true
+    },
     "json-schema": {
       "version": "0.2.3",
       "from": "json-schema@0.2.3",
@@ -6483,6 +7157,12 @@
       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
       "dev": true
     },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "from": "lodash.isplainobject@>=4.0.6 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "dev": true
+    },
     "lodash.keys": {
       "version": "3.1.2",
       "from": "lodash.keys@>=3.0.0 <4.0.0",
@@ -6495,6 +7175,12 @@
       "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
       "dev": true
     },
+    "lodash.some": {
+      "version": "4.6.0",
+      "from": "lodash.some@>=4.6.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz",
+      "dev": true
+    },
     "lodash.template": {
       "version": "3.6.2",
       "from": "lodash.template@>=3.6.1 <4.0.0",
@@ -7388,6 +8074,26 @@
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz",
       "dev": true
     },
+    "output-file-sync": {
+      "version": "1.1.2",
+      "from": "output-file-sync@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.1.11",
+          "from": "graceful-fs@>=4.1.4 <5.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "from": "object-assign@>=4.1.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "dev": true
+        }
+      }
+    },
     "over": {
       "version": "0.0.5",
       "from": "over@>=0.0.5 <1.0.0",
@@ -7558,6 +8264,12 @@
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz",
       "dev": true
     },
+    "pkg-dir": {
+      "version": "1.0.0",
+      "from": "pkg-dir@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
+      "dev": true
+    },
     "pkginfo": {
       "version": "0.3.1",
       "from": "pkginfo@>=0.3.0 <0.4.0",
@@ -7582,6 +8294,12 @@
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.1.tgz",
       "dev": true
     },
+    "private": {
+      "version": "0.1.7",
+      "from": "private@>=0.1.6 <0.2.0",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
+      "dev": true
+    },
     "process": {
       "version": "0.11.9",
       "from": "process@>=0.11.0 <0.12.0",
@@ -7881,18 +8599,36 @@
       "from": "reflect-metadata@0.1.3",
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.3.tgz"
     },
+    "regenerate": {
+      "version": "1.3.2",
+      "from": "regenerate@>=1.2.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
+      "dev": true
+    },
     "regenerator-runtime": {
       "version": "0.10.1",
       "from": "regenerator-runtime@>=0.10.0 <0.11.0",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz",
       "dev": true
     },
+    "regenerator-transform": {
+      "version": "0.9.8",
+      "from": "regenerator-transform@0.9.8",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.8.tgz",
+      "dev": true
+    },
     "regex-cache": {
       "version": "0.4.2",
       "from": "regex-cache@>=0.4.2 <0.5.0",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.2.tgz",
       "dev": true
     },
+    "regexpu-core": {
+      "version": "2.0.0",
+      "from": "regexpu-core@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+      "dev": true
+    },
     "registry-auth-token": {
       "version": "3.1.0",
       "from": "registry-auth-token@>=3.0.1 <4.0.0",
@@ -7905,6 +8641,26 @@
       "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
       "dev": true
     },
+    "regjsgen": {
+      "version": "0.2.0",
+      "from": "regjsgen@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "from": "regjsparser@>=0.1.4 <0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "dev": true,
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "from": "jsesc@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "dev": true
+        }
+      }
+    },
     "repeat-element": {
       "version": "1.1.2",
       "from": "repeat-element@>=1.1.2 <2.0.0",
@@ -8197,6 +8953,20 @@
         }
       }
     },
+    "rollup-plugin-babel": {
+      "version": "2.7.1",
+      "from": "rollup-plugin-babel@>=2.7.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-2.7.1.tgz",
+      "dev": true,
+      "dependencies": {
+        "object-assign": {
+          "version": "4.1.1",
+          "from": "object-assign@^4.1.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "dev": true
+        }
+      }
+    },
     "rollup-plugin-commonjs": {
       "version": "5.0.5",
       "from": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-5.0.5.tgz",
@@ -8454,6 +9224,12 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz",
       "dev": true
     },
+    "slash": {
+      "version": "1.0.0",
+      "from": "slash@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "dev": true
+    },
     "slice-stream": {
       "version": "1.0.0",
       "from": "slice-stream@>=1.0.0 <2.0.0",
@@ -8963,6 +9739,12 @@
       "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
       "dev": true
     },
+    "to-fast-properties": {
+      "version": "1.0.2",
+      "from": "to-fast-properties@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.2.tgz",
+      "dev": true
+    },
     "tough-cookie": {
       "version": "2.2.1",
       "from": "tough-cookie@>=2.2.0 <2.3.0",
@@ -8987,6 +9769,12 @@
       "resolved": "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz",
       "dev": true
     },
+    "trim-right": {
+      "version": "1.0.1",
+      "from": "trim-right@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "dev": true
+    },
     "ts-api-guardian": {
       "version": "0.2.1",
       "from": "ts-api-guardian@0.2.1",
diff --git a/package.json b/package.json
index 570843c697..bd304fd959 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,12 @@
     "angular": "^1.5.0",
     "angular-animate": "^1.5.0",
     "angular-mocks": "^1.5.0",
+    "babel-cli": "^6.22.2",
+    "babel-core": "https://registry.npmjs.org/babel-core/-/babel-core-6.23.1.tgz",
+    "babel-loader": "^6.3.0",
+    "babel-preset-babili": "0.0.11",
+    "babel-preset-es2015": "^6.22.0",
+    "babili": "0.0.11",
     "base64-js": "^1.2.0",
     "bower": "^1.3.12",
     "browserstacktunnel-wrapper": "^1.4.2",
@@ -80,6 +86,7 @@
     "rewire": "^2.3.3",
     "rho": "^0.3.0",
     "rollup": "^0.26.3",
+    "rollup-plugin-babel": "^2.7.1",
     "rollup-plugin-commonjs": "^5.0.5",
     "selenium-webdriver": "^2.53.3",
     "semver": "^5.1.0",
diff --git a/scripts/ci-lite/offline_compiler_test.sh b/scripts/ci-lite/offline_compiler_test.sh
index 1076926ad7..a2564d5f4e 100755
--- a/scripts/ci-lite/offline_compiler_test.sh
+++ b/scripts/ci-lite/offline_compiler_test.sh
@@ -16,6 +16,9 @@ PKGS=(
   jasmine@2.4.1
   webpack@2.1.0-beta.21
   @angular2-material/{core,button}@2.0.0-alpha.8-1
+  babel-core@6.23.1
+  babel-loader@6.3.0
+  babel-preset-es2015@6.22.0
 )
 
 TMPDIR=${TMPDIR:-.}
diff --git a/tools/@angular/tsc-wrapped/src/bundler.ts b/tools/@angular/tsc-wrapped/src/bundler.ts
index 7fbdb12085..6e7def2b9c 100644
--- a/tools/@angular/tsc-wrapped/src/bundler.ts
+++ b/tools/@angular/tsc-wrapped/src/bundler.ts
@@ -79,6 +79,7 @@ export class MetadataBundler {
   private metadataCache = new Map<string, ModuleMetadata>();
   private exports = new Map<string, Symbol[]>();
   private rootModule: string;
+  private exported: Set<Symbol>;
 
   constructor(
       private root: string, private importAs: string|undefined, private host: MetadataBundlerHost) {
@@ -191,16 +192,18 @@ export class MetadataBundler {
    */
   private canonicalizeSymbols(exportedSymbols: Symbol[]) {
     const symbols = Array.from(this.symbolMap.values());
-    const exported = new Set(exportedSymbols);
-    symbols.forEach(symbol => {
-      const rootExport = getRootExport(symbol);
-      const declaration = getSymbolDeclaration(symbol);
-      const isPrivate = !exported.has(rootExport);
-      const canonicalSymbol = isPrivate ? declaration : rootExport;
-      symbol.isPrivate = isPrivate;
-      symbol.declaration = declaration;
-      symbol.canonicalSymbol = canonicalSymbol;
-    });
+    this.exported = new Set(exportedSymbols);;
+    symbols.forEach(this.canonicalizeSymbol, this);
+  }
+
+  private canonicalizeSymbol(symbol: Symbol) {
+    const rootExport = getRootExport(symbol);
+    const declaration = getSymbolDeclaration(symbol);
+    const isPrivate = !this.exported.has(rootExport);
+    const canonicalSymbol = isPrivate ? declaration : rootExport;
+    symbol.isPrivate = isPrivate;
+    symbol.declaration = declaration;
+    symbol.canonicalSymbol = canonicalSymbol;
   }
 
   private getEntries(exportedSymbols: Symbol[]): BundleEntries {
@@ -487,14 +490,11 @@ export class MetadataBundler {
   }
 
   private canonicalSymbolOf(module: string, name: string): Symbol {
+    // Ensure the module has been seen.
+    this.exportAll(module);
     const symbol = this.symbolOf(module, name);
     if (!symbol.canonicalSymbol) {
-      // If we get a symbol after canonical symbols have been assigned it must be a private
-      // symbol so treat it as one.
-      symbol.declaration = symbol;
-      symbol.canonicalSymbol = symbol;
-      symbol.isPrivate = true;
-      this.convertSymbol(symbol);
+      this.canonicalizeSymbol(symbol);
     }
     return symbol;
   }
diff --git a/tools/@angular/tsc-wrapped/src/main.ts b/tools/@angular/tsc-wrapped/src/main.ts
index 4fc0280ba5..61930934f1 100644
--- a/tools/@angular/tsc-wrapped/src/main.ts
+++ b/tools/@angular/tsc-wrapped/src/main.ts
@@ -29,7 +29,7 @@ export type CodegenExtension =
 
 export function main(
     project: string | VinylFile, cliOptions: CliOptions, codegen?: CodegenExtension,
-    options?: ts.CompilerOptions): Promise<any> {
+    options?: ts.CompilerOptions, skipImportRename?: boolean): Promise<any> {
   try {
     let projectDir = project;
     // project is vinyl like file object
@@ -118,7 +118,7 @@ export function main(
       const tsickleCompilerHostOptions: tsickle.Options = {
         googmodule: false,
         untyped: true,
-        convertIndexImportShorthand:
+        convertIndexImportShorthand: !skipImportRename &&
             ngOptions.target === ts.ScriptTarget.ES2015,  // This covers ES6 too
       };
 
@@ -173,13 +173,19 @@ export function main(
 
 // CLI entry point
 if (require.main === module) {
-  const args = process.argv.slice(2);
+  let args = process.argv.slice(2);
+  let idx = args.indexOf('--skipImportRename');
+  let skipImportRename = false;
+  if (idx !== -1) {
+    args.splice(idx, 1);
+    skipImportRename = true;
+  }
   let {options, fileNames, errors} = (ts as any).parseCommandLine(args);
   check(errors);
   const project = options.project || '.';
   // TODO(alexeagle): command line should be TSC-compatible, remove "CliOptions" here
   const cliOptions = new CliOptions(require('minimist')(args));
-  main(project, cliOptions, null, options)
+  main(project, cliOptions, null, options, skipImportRename)
       .then((exitCode: any) => process.exit(exitCode))
       .catch((e: any) => {
         console.error(e.stack);
diff --git a/tools/gulp-tasks/public-api.js b/tools/gulp-tasks/public-api.js
index 63c0748c78..5aaa3b2111 100644
--- a/tools/gulp-tasks/public-api.js
+++ b/tools/gulp-tasks/public-api.js
@@ -1,21 +1,26 @@
 const entrypoints = [
-  'dist/packages-dist/core/index.d.ts', 'dist/packages-dist/core/testing/index.d.ts',
-  'dist/packages-dist/common/index.d.ts', 'dist/packages-dist/common/testing/index.d.ts',
+  'dist/packages-dist/core/typings/core.d.ts',
+  'dist/packages-dist/core/typings/testing/testing.d.ts',
+  'dist/packages-dist/common/typings/common.d.ts',
+  'dist/packages-dist/common/typings/testing/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/index.d.ts', 'dist/packages-dist/upgrade/static.d.ts',
-  'dist/packages-dist/platform-browser/index.d.ts',
-  'dist/packages-dist/platform-browser/testing/index.d.ts',
-  'dist/packages-dist/platform-browser-dynamic/index.d.ts',
-  'dist/packages-dist/platform-browser-dynamic/testing/index.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/index.d.ts', 'dist/packages-dist/http/index.d.ts',
-  'dist/packages-dist/http/testing/index.d.ts', 'dist/packages-dist/forms/index.d.ts',
-  'dist/packages-dist/router/index.d.ts', 'dist/packages-dist/animation/index.d.ts'
+  'dist/packages-dist/upgrade/typings/upgrade.d.ts',
+  'dist/packages-dist/upgrade/typings/static/static.d.ts',
+  'dist/packages-dist/platform-browser/typings/platform-browser.d.ts',
+  'dist/packages-dist/platform-browser/typings/testing/testing.d.ts',
+  'dist/packages-dist/platform-browser-dynamic/typings/platform-browser-dynamic.d.ts',
+  'dist/packages-dist/platform-browser-dynamic/typings/testing/testing.d.ts',
+  'dist/packages-dist/platform-webworker/typings/platform-webworker.d.ts',
+  'dist/packages-dist/platform-webworker-dynamic/typings/platform-webworker-dynamic.d.ts',
+  'dist/packages-dist/platform-server/typings/platform-server.d.ts',
+  'dist/packages-dist/platform-server/typings/testing/testing.d.ts',
+  'dist/packages-dist/http/typings/http.d.ts',
+  'dist/packages-dist/http/typings/testing/testing.d.ts',
+  'dist/packages-dist/forms/typings/forms.d.ts', 'dist/packages-dist/router/typings/router.d.ts',
+  'dist/packages-dist/animation/typings/animation.d.ts'
 ];
 
 const publicApiDir = 'tools/public_api_guard';
diff --git a/tools/public_api_guard/animation/index.d.ts b/tools/public_api_guard/animation/typings/animation.d.ts
similarity index 100%
rename from tools/public_api_guard/animation/index.d.ts
rename to tools/public_api_guard/animation/typings/animation.d.ts
diff --git a/tools/public_api_guard/common/index.d.ts b/tools/public_api_guard/common/typings/common.d.ts
similarity index 100%
rename from tools/public_api_guard/common/index.d.ts
rename to tools/public_api_guard/common/typings/common.d.ts
diff --git a/tools/public_api_guard/common/testing/index.d.ts b/tools/public_api_guard/common/typings/testing/testing.d.ts
similarity index 100%
rename from tools/public_api_guard/common/testing/index.d.ts
rename to tools/public_api_guard/common/typings/testing/testing.d.ts
diff --git a/tools/public_api_guard/compiler/index.d.ts b/tools/public_api_guard/compiler/typings/compiler.d.ts
similarity index 100%
rename from tools/public_api_guard/compiler/index.d.ts
rename to tools/public_api_guard/compiler/typings/compiler.d.ts
diff --git a/tools/public_api_guard/compiler/testing/index.d.ts b/tools/public_api_guard/compiler/typings/testing/testing.d.ts
similarity index 100%
rename from tools/public_api_guard/compiler/testing/index.d.ts
rename to tools/public_api_guard/compiler/typings/testing/testing.d.ts
diff --git a/tools/public_api_guard/core/index.d.ts b/tools/public_api_guard/core/typings/core.d.ts
similarity index 100%
rename from tools/public_api_guard/core/index.d.ts
rename to tools/public_api_guard/core/typings/core.d.ts
diff --git a/tools/public_api_guard/core/testing/index.d.ts b/tools/public_api_guard/core/typings/testing/testing.d.ts
similarity index 100%
rename from tools/public_api_guard/core/testing/index.d.ts
rename to tools/public_api_guard/core/typings/testing/testing.d.ts
diff --git a/tools/public_api_guard/forms/index.d.ts b/tools/public_api_guard/forms/typings/forms.d.ts
similarity index 100%
rename from tools/public_api_guard/forms/index.d.ts
rename to tools/public_api_guard/forms/typings/forms.d.ts
diff --git a/tools/public_api_guard/http/index.d.ts b/tools/public_api_guard/http/typings/http.d.ts
similarity index 100%
rename from tools/public_api_guard/http/index.d.ts
rename to tools/public_api_guard/http/typings/http.d.ts
diff --git a/tools/public_api_guard/http/testing/index.d.ts b/tools/public_api_guard/http/typings/testing/testing.d.ts
similarity index 100%
rename from tools/public_api_guard/http/testing/index.d.ts
rename to tools/public_api_guard/http/typings/testing/testing.d.ts
diff --git a/tools/public_api_guard/platform-browser-dynamic/index.d.ts b/tools/public_api_guard/platform-browser-dynamic/typings/platform-browser-dynamic.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-browser-dynamic/index.d.ts
rename to tools/public_api_guard/platform-browser-dynamic/typings/platform-browser-dynamic.d.ts
diff --git a/tools/public_api_guard/platform-browser-dynamic/testing/index.d.ts b/tools/public_api_guard/platform-browser-dynamic/typings/testing/testing.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-browser-dynamic/testing/index.d.ts
rename to tools/public_api_guard/platform-browser-dynamic/typings/testing/testing.d.ts
diff --git a/tools/public_api_guard/platform-browser/index.d.ts b/tools/public_api_guard/platform-browser/typings/platform-browser.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-browser/index.d.ts
rename to tools/public_api_guard/platform-browser/typings/platform-browser.d.ts
diff --git a/tools/public_api_guard/platform-browser/testing/index.d.ts b/tools/public_api_guard/platform-browser/typings/testing/testing.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-browser/testing/index.d.ts
rename to tools/public_api_guard/platform-browser/typings/testing/testing.d.ts
diff --git a/tools/public_api_guard/platform-server/index.d.ts b/tools/public_api_guard/platform-server/typings/platform-server.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-server/index.d.ts
rename to tools/public_api_guard/platform-server/typings/platform-server.d.ts
diff --git a/tools/public_api_guard/platform-server/testing/index.d.ts b/tools/public_api_guard/platform-server/typings/testing/testing.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-server/testing/index.d.ts
rename to tools/public_api_guard/platform-server/typings/testing/testing.d.ts
diff --git a/tools/public_api_guard/platform-webworker-dynamic/index.d.ts b/tools/public_api_guard/platform-webworker-dynamic/typings/platform-webworker-dynamic.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-webworker-dynamic/index.d.ts
rename to tools/public_api_guard/platform-webworker-dynamic/typings/platform-webworker-dynamic.d.ts
diff --git a/tools/public_api_guard/platform-webworker/index.d.ts b/tools/public_api_guard/platform-webworker/typings/platform-webworker.d.ts
similarity index 100%
rename from tools/public_api_guard/platform-webworker/index.d.ts
rename to tools/public_api_guard/platform-webworker/typings/platform-webworker.d.ts
diff --git a/tools/public_api_guard/router/index.d.ts b/tools/public_api_guard/router/typings/router.d.ts
similarity index 100%
rename from tools/public_api_guard/router/index.d.ts
rename to tools/public_api_guard/router/typings/router.d.ts
diff --git a/tools/public_api_guard/upgrade/static.d.ts b/tools/public_api_guard/upgrade/typings/static/static.d.ts
similarity index 100%
rename from tools/public_api_guard/upgrade/static.d.ts
rename to tools/public_api_guard/upgrade/typings/static/static.d.ts
diff --git a/tools/public_api_guard/upgrade/index.d.ts b/tools/public_api_guard/upgrade/typings/upgrade.d.ts
similarity index 100%
rename from tools/public_api_guard/upgrade/index.d.ts
rename to tools/public_api_guard/upgrade/typings/upgrade.d.ts