diff --git a/.pullapprove.yml b/.pullapprove.yml
index 6cbd1f9250..6d55d20e49 100644
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@@ -69,7 +69,6 @@ groups:
           - "*.lock"
           - "tools/*"
         exclude:
-          - "tools/@angular/tsc-wrapped/*"
           - "tools/public_api_guard/*"
           - "aio/*"
     users:
@@ -136,7 +135,7 @@ groups:
   compiler-cli:
     conditions:
       files:
-        - "tools/@angular/tsc-wrapped/*"
+        - "packages/tsc-wrapped/*"
         - "packages/compiler-cli/*"
     users:
       - alexeagle
diff --git a/build.sh b/build.sh
index 6e9827092c..099d7f05c8 100755
--- a/build.sh
+++ b/build.sh
@@ -333,7 +333,7 @@ echo "====== BUILDING: Version ${VERSION}"
 N="
 "
 TSC=`pwd`/node_modules/.bin/tsc
-NGC="node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main"
+NGC="node --max-old-space-size=3000 dist/packages-dist/tsc-wrapped/src/main"
 MAP_SOURCES="node `pwd`/scripts/build/map_sources.js "
 UGLIFYJS=`pwd`/node_modules/.bin/uglifyjs
 TSCONFIG=./tools/tsconfig.json
@@ -345,8 +345,6 @@ if [[ ${BUILD_TOOLS} == true ]]; then
     rm -rf ./dist/tools/
     mkdir -p ./dist/tools/
     $(npm bin)/tsc -p ${TSCONFIG}
-
-    cp ./tools/@angular/tsc-wrapped/package.json ./dist/tools/@angular/tsc-wrapped
   travisFoldEnd "build tools"
 fi
 
@@ -398,11 +396,11 @@ if [[ ${BUILD_ALL} == true && ${TYPECHECK_ALL} == true ]]; then
 
   TSCONFIG="packages/tsconfig.json"
   travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
-    $NGC -p ${TSCONFIG}
+    $TSC -p ${TSCONFIG}
   travisFoldEnd "tsc -p ${TSCONFIG}"
   TSCONFIG="modules/tsconfig.json"
   travisFoldStart "tsc -p ${TSCONFIG}" "no-xtrace"
-    $NGC -p ${TSCONFIG}
+    $TSC -p ${TSCONFIG}
   travisFoldEnd "tsc -p ${TSCONFIG}"
 
 fi
@@ -414,6 +412,15 @@ if [[ ${BUILD_ALL} == true ]]; then
   fi
 fi
 
+if [[ ${BUILD_TOOLS} == true || ${BUILD_ALL} == true ]]; then
+  echo "====== (tsc-wrapped)COMPILING: \$(npm bin)/tsc -p packages/tsc-wrapped/tsconfig.json ====="
+  $(npm bin)/tsc -p packages/tsc-wrapped/tsconfig.json
+  echo "====== (tsc-wrapped)COMPILING: \$(npm bin)/tsc -p packages/tsc-wrapped/tsconfig-build.json ====="
+  $(npm bin)/tsc -p packages/tsc-wrapped/tsconfig-build.json
+  cp ./packages/tsc-wrapped/package.json ./dist/packages-dist/tsc-wrapped
+  cp ./packages/tsc-wrapped/README.md ./dist/packages-dist/tsc-wrapped
+fi
+
 for PACKAGE in ${PACKAGES[@]}
 do
   travisFoldStart "build package: ${PACKAGE}" "no-xtrace"
diff --git a/integration/hello_world__closure/package.json b/integration/hello_world__closure/package.json
index 950b6857b2..b5cecce1de 100644
--- a/integration/hello_world__closure/package.json
+++ b/integration/hello_world__closure/package.json
@@ -10,7 +10,7 @@
     "@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",
+    "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
     "google-closure-compiler": "20170409.0.0",
     "rxjs": "5.3.1",
     "typescript": "2.1.6",
diff --git a/integration/language_service_plugin/package.json b/integration/language_service_plugin/package.json
index 065fce7883..c3e751f091 100644
--- a/integration/language_service_plugin/package.json
+++ b/integration/language_service_plugin/package.json
@@ -12,7 +12,7 @@
     "@angular/language-service": "file:../../dist/packages-dist/language-service",
     "@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",
+    "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
     "@types/minimist": "^1.2.0",
     "@types/node": "^7.0.5",
     "minimist": "^1.2.0",
diff --git a/integration/typings_test_ts21/package.json b/integration/typings_test_ts21/package.json
index 98fabcb911..b9bd98bb60 100644
--- a/integration/typings_test_ts21/package.json
+++ b/integration/typings_test_ts21/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
     "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
     "@angular/router": "file:../../dist/packages-dist/router",
-    "@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
+    "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
     "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
     "@types/jasmine": "2.5.41",
     "rxjs": "file:../../node_modules/rxjs",
diff --git a/integration/typings_test_ts22/package.json b/integration/typings_test_ts22/package.json
index 45092aa006..987838f182 100644
--- a/integration/typings_test_ts22/package.json
+++ b/integration/typings_test_ts22/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
     "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
     "@angular/router": "file:../../dist/packages-dist/router",
-    "@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
+    "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
     "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
     "@types/jasmine": "2.5.41",
     "rxjs": "file:../../node_modules/rxjs",
diff --git a/integration/typings_test_ts23/package.json b/integration/typings_test_ts23/package.json
index 12739138bc..59e6348ebe 100644
--- a/integration/typings_test_ts23/package.json
+++ b/integration/typings_test_ts23/package.json
@@ -15,7 +15,7 @@
     "@angular/platform-browser-dynamic": "file:../../dist/packages-dist/platform-browser-dynamic",
     "@angular/platform-server": "file:../../dist/packages-dist/platform-server",
     "@angular/router": "file:../../dist/packages-dist/router",
-    "@angular/tsc-wrapped": "file:../../dist/tools/@angular/tsc-wrapped",
+    "@angular/tsc-wrapped": "file:../../dist/packages-dist/tsc-wrapped",
     "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
     "@types/jasmine": "2.5.41",
     "rxjs": "file:../../node_modules/rxjs",
diff --git a/karma-js.conf.js b/karma-js.conf.js
index dffbbf61ac..ef566dd2ff 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -59,6 +59,7 @@ module.exports = function(config) {
       'dist/all/@angular/examples/**/e2e_test/*',
       'dist/all/@angular/language-service/**',
       'dist/all/@angular/router/test/**',
+      'dist/all/@angular/tsc-wrapped/**',
       'dist/all/@angular/platform-browser/testing/e2e_util.js',
       'dist/all/angular1_router.js',
       'dist/examples/**/e2e_test/**',
diff --git a/modules/tsconfig.json b/modules/tsconfig.json
index fb8de06ce6..18bd97a6c3 100644
--- a/modules/tsconfig.json
+++ b/modules/tsconfig.json
@@ -13,8 +13,8 @@
       "selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"],
       "rxjs/*": ["../node_modules/rxjs/*"],
       "@angular/*": ["../dist/all/@angular/*"],
-      "@angular/tsc-wrapped": ["../dist/tools/@angular/tsc-wrapped"],
-      "@angular/tsc-wrapped/*": ["../dist/tools/@angular/tsc-wrapped/*"]
+      "@angular/tsc-wrapped": ["../dist/packages-dist/tsc-wrapped"],
+      "@angular/tsc-wrapped/*": ["../dist/packages-dist/tsc-wrapped/*"]
     },
     "rootDir": ".",
     "inlineSourceMap": true,
diff --git a/packages/compiler-cli/README.md b/packages/compiler-cli/README.md
index 971b2fc452..074a9ec499 100644
--- a/packages/compiler-cli/README.md
+++ b/packages/compiler-cli/README.md
@@ -121,9 +121,6 @@ At a high level, this program
 # Build Angular and the compiler
 ./build.sh
 
-# Copy over the package so we can test the compiler tests
-$ cp tools/@angular/tsc-wrapped/package.json dist/tools/@angular/tsc-wrapped
-
 # Run the test once
 # (First edit the LINKABLE_PKGS to use npm link instead of npm install)
 $ ./scripts/ci/offline_compiler_test.sh
diff --git a/packages/compiler-cli/tsconfig-build.json b/packages/compiler-cli/tsconfig-build.json
index a796b64941..6937d14a26 100644
--- a/packages/compiler-cli/tsconfig-build.json
+++ b/packages/compiler-cli/tsconfig-build.json
@@ -14,7 +14,7 @@
       "@angular/http": ["../../dist/packages/http"],
       "@angular/platform-server": ["../../dist/packages/platform-server"],
       "@angular/platform-browser": ["../../dist/packages/platform-browser"],
-      "@angular/tsc-wrapped": ["../../dist/tools/@angular/tsc-wrapped"]
+      "@angular/tsc-wrapped": ["../../dist/packages-dist/tsc-wrapped"]
     },
     "rootDir": ".",
     "sourceMap": true,
diff --git a/packages/language-service/rollup.config.js b/packages/language-service/rollup.config.js
index 69d6ca8731..d1596f30bd 100644
--- a/packages/language-service/rollup.config.js
+++ b/packages/language-service/rollup.config.js
@@ -16,7 +16,7 @@ var tslibLocation = normalize('../../node_modules/tslib');
 var esm = 'esm/';
 
 var locations = {
-  'tsc-wrapped': normalize('../../dist/tools/@angular') + '/',
+  'tsc-wrapped': normalize('../../dist/packages-dist') + '/',
   'compiler-cli': normalize('../../dist/packages') + '/'
 };
 
diff --git a/packages/language-service/tsconfig-build.json b/packages/language-service/tsconfig-build.json
index bab561736e..96a8d2658a 100644
--- a/packages/language-service/tsconfig-build.json
+++ b/packages/language-service/tsconfig-build.json
@@ -20,8 +20,8 @@
       "@angular/http": ["../../dist/packages/http"],
       "@angular/platform-server": ["../../dist/packages/platform-server"],
       "@angular/platform-browser": ["../../dist/packages/platform-browser"],
-      "@angular/tsc-wrapped": ["../../dist/tools/@angular/tsc-wrapped"],
-      "@angular/tsc-wrapped/*": ["../../dist/tools/@angular/tsc-wrapped/*"]
+      "@angular/tsc-wrapped": ["../../dist/packages-dist/tsc-wrapped"],
+      "@angular/tsc-wrapped/*": ["../../dist/packages-dist/tsc-wrapped/*"]
     },
     "rootDir": ".",
     "sourceMap": true,
diff --git a/tools/@angular/tsc-wrapped/README.md b/packages/tsc-wrapped/README.md
similarity index 100%
rename from tools/@angular/tsc-wrapped/README.md
rename to packages/tsc-wrapped/README.md
diff --git a/tools/@angular/tsc-wrapped/index.ts b/packages/tsc-wrapped/index.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/index.ts
rename to packages/tsc-wrapped/index.ts
diff --git a/tools/@angular/tsc-wrapped/package.json b/packages/tsc-wrapped/package.json
similarity index 79%
rename from tools/@angular/tsc-wrapped/package.json
rename to packages/tsc-wrapped/package.json
index 9dc08d63a0..7000d99cd4 100644
--- a/tools/@angular/tsc-wrapped/package.json
+++ b/packages/tsc-wrapped/package.json
@@ -1,8 +1,8 @@
 {
   "name": "@angular/tsc-wrapped",
-  "version": "5.0.0-beta.0",
+  "version": "0.0.0-PLACEHOLDER",
   "description": "Wraps the tsc CLI, allowing extensions.",
-  "homepage": "https://github.com/angular/angular/blob/master/tools/@angular/tsc-wrapped",
+  "homepage": "https://github.com/angular/angular/blob/master/packages/tsc-wrapped",
   "bugs": "https://github.com/angular/angular/issues",
   "contributors": [
     "Alex Eagle <alexeagle@google.com>",
diff --git a/tools/@angular/tsc-wrapped/src/bundler.ts b/packages/tsc-wrapped/src/bundler.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/bundler.ts
rename to packages/tsc-wrapped/src/bundler.ts
diff --git a/tools/@angular/tsc-wrapped/src/cli_options.ts b/packages/tsc-wrapped/src/cli_options.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/cli_options.ts
rename to packages/tsc-wrapped/src/cli_options.ts
diff --git a/tools/@angular/tsc-wrapped/src/collector.ts b/packages/tsc-wrapped/src/collector.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/collector.ts
rename to packages/tsc-wrapped/src/collector.ts
diff --git a/tools/@angular/tsc-wrapped/src/compiler_host.ts b/packages/tsc-wrapped/src/compiler_host.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/compiler_host.ts
rename to packages/tsc-wrapped/src/compiler_host.ts
diff --git a/tools/@angular/tsc-wrapped/src/evaluator.ts b/packages/tsc-wrapped/src/evaluator.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/evaluator.ts
rename to packages/tsc-wrapped/src/evaluator.ts
diff --git a/tools/@angular/tsc-wrapped/src/index_writer.ts b/packages/tsc-wrapped/src/index_writer.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/index_writer.ts
rename to packages/tsc-wrapped/src/index_writer.ts
diff --git a/tools/@angular/tsc-wrapped/src/main.ts b/packages/tsc-wrapped/src/main.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/main.ts
rename to packages/tsc-wrapped/src/main.ts
diff --git a/tools/@angular/tsc-wrapped/src/options.ts b/packages/tsc-wrapped/src/options.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/options.ts
rename to packages/tsc-wrapped/src/options.ts
diff --git a/tools/@angular/tsc-wrapped/src/schema.ts b/packages/tsc-wrapped/src/schema.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/schema.ts
rename to packages/tsc-wrapped/src/schema.ts
diff --git a/tools/@angular/tsc-wrapped/src/symbols.ts b/packages/tsc-wrapped/src/symbols.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/symbols.ts
rename to packages/tsc-wrapped/src/symbols.ts
diff --git a/tools/@angular/tsc-wrapped/src/tsc.ts b/packages/tsc-wrapped/src/tsc.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/tsc.ts
rename to packages/tsc-wrapped/src/tsc.ts
diff --git a/tools/@angular/tsc-wrapped/src/vinyl_file.ts b/packages/tsc-wrapped/src/vinyl_file.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/src/vinyl_file.ts
rename to packages/tsc-wrapped/src/vinyl_file.ts
diff --git a/tools/@angular/tsc-wrapped/test/bundler_spec.ts b/packages/tsc-wrapped/test/bundler_spec.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/test/bundler_spec.ts
rename to packages/tsc-wrapped/test/bundler_spec.ts
diff --git a/tools/@angular/tsc-wrapped/test/collector.spec.ts b/packages/tsc-wrapped/test/collector.spec.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/test/collector.spec.ts
rename to packages/tsc-wrapped/test/collector.spec.ts
diff --git a/tools/@angular/tsc-wrapped/test/evaluator.spec.ts b/packages/tsc-wrapped/test/evaluator.spec.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/test/evaluator.spec.ts
rename to packages/tsc-wrapped/test/evaluator.spec.ts
diff --git a/tools/@angular/tsc-wrapped/test/index_writer_spec.ts b/packages/tsc-wrapped/test/index_writer_spec.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/test/index_writer_spec.ts
rename to packages/tsc-wrapped/test/index_writer_spec.ts
diff --git a/tools/@angular/tsc-wrapped/test/main.spec.ts b/packages/tsc-wrapped/test/main.spec.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/test/main.spec.ts
rename to packages/tsc-wrapped/test/main.spec.ts
diff --git a/tools/@angular/tsc-wrapped/test/symbols.spec.ts b/packages/tsc-wrapped/test/symbols.spec.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/test/symbols.spec.ts
rename to packages/tsc-wrapped/test/symbols.spec.ts
diff --git a/tools/@angular/tsc-wrapped/test/test_support.ts b/packages/tsc-wrapped/test/test_support.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/test/test_support.ts
rename to packages/tsc-wrapped/test/test_support.ts
diff --git a/tools/@angular/tsc-wrapped/test/tsc.spec.ts b/packages/tsc-wrapped/test/tsc.spec.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/test/tsc.spec.ts
rename to packages/tsc-wrapped/test/tsc.spec.ts
diff --git a/tools/@angular/tsc-wrapped/test/typescript.mocks.ts b/packages/tsc-wrapped/test/typescript.mocks.ts
similarity index 100%
rename from tools/@angular/tsc-wrapped/test/typescript.mocks.ts
rename to packages/tsc-wrapped/test/typescript.mocks.ts
diff --git a/packages/tsc-wrapped/tsconfig-build.json b/packages/tsc-wrapped/tsconfig-build.json
new file mode 100644
index 0000000000..16515d1707
--- /dev/null
+++ b/packages/tsc-wrapped/tsconfig-build.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/packages-dist/tsc-wrapped"
+  }
+}
\ No newline at end of file
diff --git a/packages/tsc-wrapped/tsconfig.json b/packages/tsc-wrapped/tsconfig.json
new file mode 100644
index 0000000000..c687e4971f
--- /dev/null
+++ b/packages/tsc-wrapped/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "declaration": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "../../dist/all/@angular/tsc-wrapped",
+    "noImplicitAny": true,
+    "noFallthroughCasesInSwitch": true,
+    "paths": {
+    },
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "lib": ["es6", "dom"],
+    "target": "es5",
+    "skipLibCheck": true
+  }
+}
diff --git a/packages/tsconfig.json b/packages/tsconfig.json
index 2af993963d..10ec247ee0 100644
--- a/packages/tsconfig.json
+++ b/packages/tsconfig.json
@@ -14,8 +14,6 @@
       "selenium-webdriver": ["../node_modules/@types/selenium-webdriver/index.d.ts"],
       "rxjs/*": ["../node_modules/rxjs/*"],
       "@angular/*": ["./*"],
-      "@angular/tsc-wrapped": ["../dist/tools/@angular/tsc-wrapped"],
-      "@angular/tsc-wrapped/*": ["../dist/tools/@angular/tsc-wrapped/*"],
       "e2e_util/*": ["../modules/e2e_util/*"]
     },
     "rootDir": ".",
@@ -28,6 +26,7 @@
   },
   "exclude": [
     "compiler-cli/integrationtest",
-    "platform-server/integrationtest"
+    "platform-server/integrationtest",
+    "tsc-wrapped"
   ]
 }
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index 3268d989c5..b7c84de85f 100755
--- a/scripts/ci/build.sh
+++ b/scripts/ci/build.sh
@@ -20,23 +20,26 @@ fi
 
 travisFoldStart "tsc tools"
   $(npm bin)/tsc -p tools
-  cp tools/@angular/tsc-wrapped/package.json dist/tools/@angular/tsc-wrapped
+  $(npm bin)/tsc -p packages/tsc-wrapped/tsconfig-build.json
+  cp packages/tsc-wrapped/package.json dist/packages-dist/tsc-wrapped
+  $(npm bin)/tsc -p packages/tsc-wrapped/tsconfig.json
+  cp packages/tsc-wrapped/package.json dist/all/@angular/tsc-wrapped
 travisFoldEnd "tsc tools"
 
 
 travisFoldStart "tsc all"
-  node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main -p packages
-  node --max-old-space-size=3000 dist/tools/@angular/tsc-wrapped/src/main -p modules
+  node --max-old-space-size=3000 dist/packages-dist/tsc-wrapped/src/main -p packages
+  node --max-old-space-size=3000 dist/packages-dist/tsc-wrapped/src/main -p modules
 travisFoldEnd "tsc all"
 
 
 # TODO(i): what are these compilations here for?
 travisFoldStart "tsc a bunch of useless stuff"
-  node dist/tools/@angular/tsc-wrapped/src/main -p packages/core/tsconfig-build.json
-  node dist/tools/@angular/tsc-wrapped/src/main -p packages/common/tsconfig-build.json
-  node dist/tools/@angular/tsc-wrapped/src/main -p packages/platform-browser/tsconfig-build.json
-  node dist/tools/@angular/tsc-wrapped/src/main -p packages/router/tsconfig-build.json
-  node dist/tools/@angular/tsc-wrapped/src/main -p packages/forms/tsconfig-build.json
+  node dist/packages-dist/tsc-wrapped/src/main -p packages/core/tsconfig-build.json
+  node dist/packages-dist/tsc-wrapped/src/main -p packages/common/tsconfig-build.json
+  node dist/packages-dist/tsc-wrapped/src/main -p packages/platform-browser/tsconfig-build.json
+  node dist/packages-dist/tsc-wrapped/src/main -p packages/router/tsconfig-build.json
+  node dist/packages-dist/tsc-wrapped/src/main -p packages/forms/tsconfig-build.json
 travisFoldEnd "tsc a bunch of useless stuff"
 
 
diff --git a/scripts/ci/offline_compiler_test.sh b/scripts/ci/offline_compiler_test.sh
index a938ca911b..f419884f85 100755
--- a/scripts/ci/offline_compiler_test.sh
+++ b/scripts/ci/offline_compiler_test.sh
@@ -5,8 +5,7 @@ set -u -e -o pipefail
 
 # These ones can be `npm link`ed for fast development
 LINKABLE_PKGS=(
-  $(pwd)/dist/packages-dist/{common,forms,core,compiler,compiler-cli,platform-{browser,server},platform-browser-dynamic,router,http,animations}
-  $(pwd)/dist/tools/@angular/tsc-wrapped
+  $(pwd)/dist/packages-dist/{common,forms,core,compiler,compiler-cli,platform-{browser,server},platform-browser-dynamic,router,http,animations,tsc-wrapped}
 )
 
 TYPESCRIPT_2_1=typescript@2.1.5
diff --git a/scripts/ci/publish-build-artifacts.sh b/scripts/ci/publish-build-artifacts.sh
index 8e9fa949f8..1cdf28ea51 100755
--- a/scripts/ci/publish-build-artifacts.sh
+++ b/scripts/ci/publish-build-artifacts.sh
@@ -101,7 +101,7 @@ function publishPackages {
   PKGS_DIST=$2
   BRANCH=$3
 
-  for dir in $PKGS_DIST/*/ dist/tools/@angular/tsc-wrapped
+  for dir in $PKGS_DIST/*/ 
   do
     COMPONENT="$(basename ${dir})"
 
diff --git a/scripts/ci/test-js.sh b/scripts/ci/test-js.sh
index f4fa7aa09e..b3877a07df 100755
--- a/scripts/ci/test-js.sh
+++ b/scripts/ci/test-js.sh
@@ -30,8 +30,8 @@ travisFoldEnd "test.unit.node"
 # rebuild to revert files in @angular/compiler/test
 # TODO(tbosch): remove this and teach karma to serve the right files
 travisFoldStart "test.unit.rebuildHack"
-  node dist/tools/@angular/tsc-wrapped/src/main -p packages/tsconfig.json
-  node dist/tools/@angular/tsc-wrapped/src/main -p modules/tsconfig.json
+  node dist/packages-dist/tsc-wrapped/src/main -p packages/tsconfig.json
+  node dist/packages-dist/tsc-wrapped/src/main -p modules/tsconfig.json
 travisFoldStart "test.unit.rebuildHack"
 
 
diff --git a/test.sh b/test.sh
index dc51694db7..b04cb50b76 100755
--- a/test.sh
+++ b/test.sh
@@ -18,11 +18,12 @@ else
   fi
   echo "Compiling tools..."
   $(npm bin)/tsc -p tools
+  $(npm bin)/tsc -p packages/tsc-wrapped
   if [[ $1 == 'node' ]]; then
     # Note: .metadata.json files are needed for the language service tests!
     echo "Creating .metadata.json files..."
-    node dist/tools/@angular/tsc-wrapped/src/main -p packages
-    node dist/tools/@angular/tsc-wrapped/src/main -p modules
+    node dist/all/@angular/tsc-wrapped/src/main -p packages
+    node dist/all/@angular/tsc-wrapped/src/main -p modules
   fi
   node dist/tools/tsc-watch/ $1 watch
 fi