diff --git a/.circleci/config.yml b/.circleci/config.yml
index 04f67a64a4..7efbf2cb79 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,7 +41,7 @@ jobs:
       - restore_cache:
           key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }}
 
-      - run: bazel run @io_bazel_rules_typescript_node//:bin/npm install
+      - run: bazel run @build_bazel_rules_typescript_node//:bin/npm install
       - run: bazel build packages/...
       - save_cache:
           key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }}
diff --git a/BUILD b/BUILD.bazel
similarity index 64%
rename from BUILD
rename to BUILD.bazel
index 488214e115..3ad279d7aa 100644
--- a/BUILD
+++ b/BUILD.bazel
@@ -11,8 +11,15 @@ filegroup(
         # This won't scale in the general case.
         # TODO(alexeagle): figure out what to do
         "node_modules/typescript/**",
-        "node_modules/zone.js/**/*.d.ts",
+        "node_modules/zone.js/**",
         "node_modules/rxjs/**/*.d.ts",
+        "node_modules/rxjs/**/*.js",
         "node_modules/@types/**/*.d.ts",
+        "node_modules/tsickle/**",
+        "node_modules/hammerjs/**/*.d.ts",
+        "node_modules/protobufjs/**",
+        "node_modules/bytebuffer/**",
+        "node_modules/reflect-metadata/**",
+        "node_modules/minimist/**/*.js",
     ]),
 )
diff --git a/WORKSPACE b/WORKSPACE
index 32fc09d341..ba15d08389 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,11 +1,17 @@
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
-   name = "io_bazel_rules_typescript",
+   name = "build_bazel_rules_typescript",
    remote = "https://github.com/bazelbuild/rules_typescript.git",
-   commit = "3a8404d",
+   tag = "0.0.5",
 )
 
-load("@io_bazel_rules_typescript//:defs.bzl", "node_repositories")
+load("@build_bazel_rules_typescript//:defs.bzl", "node_repositories")
 
 node_repositories(package_json = "//:package.json")
+
+git_repository(
+    name = "build_bazel_rules_angular",
+    remote = "https://github.com/bazelbuild/rules_angular.git",
+    tag = "0.0.1",
+)
\ No newline at end of file
diff --git a/docs/BAZEL.md b/docs/BAZEL.md
index f8a3396db5..9c8ddb85d5 100644
--- a/docs/BAZEL.md
+++ b/docs/BAZEL.md
@@ -21,7 +21,7 @@ you run the first build.
 
 The `WORKSPACE` file indicates that our root directory is a
 Bazel project. It contains the version of the Bazel rules we
-use to execute build steps, from `io_bazel_rules_typescript`.
+use to execute build steps, from `build_bazel_rules_typescript`.
 The sources on [GitHub] are published from Google's internal
 repository (google3).
 
@@ -29,7 +29,7 @@ That repository defines dependencies on specific versions of
 all the tools. You can run the tools Bazel installed, for
 example rather than `npm install` (which depends on whatever
 version you have installed on your machine), you can
-`bazel run @io_bazel_rules_typescript_node//:bin/npm install`.
+`bazel run @build_bazel_rules_typescript_node//:bin/npm install`.
 
 Bazel accepts a lot of options. We check in some options in the
 `.bazelrc` file. See the [bazelrc doc]. For example, if you don't
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 631cf2fa06..b2d8292227 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "4.3.0",
+  "version": "5.0.0-beta.0",
   "dependencies": {
     "@types/angularjs": {
       "version": "1.5.13-alpha"
@@ -21,7 +21,7 @@
       "version": "1.10.21-alpha"
     },
     "@types/node": {
-      "version": "4.0.22-alpha"
+      "version": "6.0.84"
     },
     "@types/q": {
       "version": "0.0.32"
@@ -177,6 +177,9 @@
     "asap": {
       "version": "2.0.3"
     },
+    "ascli": {
+      "version": "1.0.1"
+    },
     "asn1": {
       "version": "0.2.3"
     },
@@ -1479,6 +1482,9 @@
     "builtin-modules": {
       "version": "1.1.1"
     },
+    "bytebuffer": {
+      "version": "5.0.1"
+    },
     "bytes": {
       "version": "2.1.0"
     },
@@ -1597,6 +1603,9 @@
     "colors": {
       "version": "1.1.2"
     },
+    "colour": {
+      "version": "0.7.1"
+    },
     "combined-stream": {
       "version": "1.0.5"
     },
@@ -3500,6 +3509,9 @@
         }
       }
     },
+    "long": {
+      "version": "3.2.0"
+    },
     "longest": {
       "version": "1.0.1"
     },
@@ -3925,6 +3937,9 @@
     "options": {
       "version": "0.0.6"
     },
+    "optjs": {
+      "version": "3.2.2"
+    },
     "orchestrator": {
       "version": "0.3.7",
       "dependencies": {
@@ -4080,6 +4095,14 @@
         }
       }
     },
+    "protobufjs": {
+      "version": "5.0.0",
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15"
+        }
+      }
+    },
     "protractor": {
       "version": "4.0.14",
       "dependencies": {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 54d14723f9..28c7f9a952 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "4.3.0",
+  "version": "5.0.0-beta.0",
   "dependencies": {
     "@types/angularjs": {
       "version": "1.5.13-alpha",
@@ -33,9 +33,9 @@
       "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-1.10.21-alpha.tgz"
     },
     "@types/node": {
-      "version": "4.0.22-alpha",
-      "from": "@types/node@latest",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-4.0.22-alpha.tgz"
+      "version": "6.0.84",
+      "from": "@types/node@6.0.84",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.84.tgz"
     },
     "@types/q": {
       "version": "0.0.32",
@@ -287,6 +287,11 @@
       "from": "asap@>=2.0.3 <2.1.0",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
     },
+    "ascli": {
+      "version": "1.0.1",
+      "from": "ascli@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz"
+    },
     "asn1": {
       "version": "0.2.3",
       "from": "asn1@>=0.2.3 <0.3.0",
@@ -2305,6 +2310,11 @@
       "from": "builtin-modules@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"
     },
+    "bytebuffer": {
+      "version": "5.0.1",
+      "from": "bytebuffer@>=5.0.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz"
+    },
     "bytes": {
       "version": "2.1.0",
       "from": "bytes@2.1.0",
@@ -2495,6 +2505,11 @@
       "from": "colors@>=1.1.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
     },
+    "colour": {
+      "version": "0.7.1",
+      "from": "colour@>=0.7.1 <0.8.0",
+      "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz"
+    },
     "combined-stream": {
       "version": "1.0.5",
       "from": "combined-stream@>=1.0.5 <1.1.0",
@@ -5576,6 +5591,11 @@
         }
       }
     },
+    "long": {
+      "version": "3.2.0",
+      "from": "long@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz"
+    },
     "longest": {
       "version": "1.0.1",
       "from": "longest@>=1.0.1 <2.0.0",
@@ -6255,6 +6275,11 @@
       "from": "options@>=0.0.5",
       "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
     },
+    "optjs": {
+      "version": "3.2.2",
+      "from": "optjs@>=3.2.2 <3.3.0",
+      "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz"
+    },
     "orchestrator": {
       "version": "0.3.7",
       "from": "orchestrator@>=0.3.0 <0.4.0",
@@ -6508,6 +6533,18 @@
         }
       }
     },
+    "protobufjs": {
+      "version": "5.0.0",
+      "from": "protobufjs@5.0.0",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.0.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "from": "glob@>=5.0.10 <6.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
+        }
+      }
+    },
     "protractor": {
       "version": "4.0.14",
       "from": "protractor@4.0.14",
@@ -7792,9 +7829,9 @@
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
     },
     "typescript": {
-      "version": "2.3.2",
-      "from": "typescript@>=2.3.0 <2.4.0",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.2.tgz"
+      "version": "2.3.4",
+      "from": "typescript@2.3.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz"
     },
     "ua-parser-js": {
       "version": "0.7.10",
diff --git a/package.json b/package.json
index 528e251a34..6e6c4dc8c8 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "@types/fs-extra": "0.0.22-alpha",
     "@types/hammerjs": "^2.0.33",
     "@types/jasmine": "^2.2.22-alpha",
-    "@types/node": "^4.0.22-alpha",
+    "@types/node": "^6.0.84",
     "@types/selenium-webdriver": "^2.53.35",
     "@types/systemjs": "^0.19.32",
     "angular": "^1.5.0",
@@ -78,6 +78,7 @@
     "nan": "^2.4.0",
     "node-uuid": "1.4.x",
     "parse5": "^3.0.1",
+    "protobufjs": "^5.0.0",
     "protractor": "^4.0.14",
     "react": "^0.14.0",
     "rewire": "^2.3.3",
diff --git a/packages/common/BUILD b/packages/common/BUILD.bazel
similarity index 82%
rename from packages/common/BUILD
rename to packages/common/BUILD.bazel
index fb99e72d1a..cee67edccd 100644
--- a/packages/common/BUILD
+++ b/packages/common/BUILD.bazel
@@ -1,5 +1,5 @@
 package(default_visibility=["//visibility:public"])
-load("@io_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 
 ts_library(
     name = "common",
diff --git a/packages/core/BUILD b/packages/core/BUILD.bazel
similarity index 80%
rename from packages/core/BUILD
rename to packages/core/BUILD.bazel
index 8c444bf1e2..d2c76b4d2a 100644
--- a/packages/core/BUILD
+++ b/packages/core/BUILD.bazel
@@ -1,5 +1,5 @@
 package(default_visibility=["//visibility:public"])
-load("@io_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
 
 ts_library(
     name = "core",