diff --git a/modules/@angular/router/.gitignore b/modules/@angular/router/.gitignore
index 8833d1c5fe..4cdd7657e5 100644
--- a/modules/@angular/router/.gitignore
+++ b/modules/@angular/router/.gitignore
@@ -2,4 +2,5 @@ node_modules/
 dist/
 typings/
 npm-debug.log
-.idea/
\ No newline at end of file
+.idea/
+package
\ No newline at end of file
diff --git a/modules/@angular/router/README.md b/modules/@angular/router/README.md
new file mode 100644
index 0000000000..7c4fbbaa59
--- /dev/null
+++ b/modules/@angular/router/README.md
@@ -0,0 +1 @@
+# Router
diff --git a/modules/@angular/router/build/README.md b/modules/@angular/router/build/README.md
deleted file mode 100644
index eb02ffb1d1..0000000000
--- a/modules/@angular/router/build/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# vladivostok
diff --git a/modules/@angular/router/build/es6/src/common_router_providers.d.ts b/modules/@angular/router/build/es6/src/common_router_providers.d.ts
deleted file mode 100644
index dea74761c8..0000000000
--- a/modules/@angular/router/build/es6/src/common_router_providers.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { RouterConfig } from './config';
-export declare function provideRouter(config: RouterConfig): any[];
diff --git a/modules/@angular/router/build/es6/src/common_router_providers.js b/modules/@angular/router/build/es6/src/common_router_providers.js
deleted file mode 100644
index b189f9ae0e..0000000000
--- a/modules/@angular/router/build/es6/src/common_router_providers.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { RouterOutletMap } from './router_outlet_map';
-import { UrlSerializer, DefaultUrlSerializer } from './url_serializer';
-import { ActivatedRoute } from './router_state';
-import { Router } from './router';
-import { ComponentResolver, ApplicationRef, Injector } from '@angular/core';
-import { LocationStrategy, PathLocationStrategy, Location } from '@angular/common';
-export function provideRouter(config) {
-    return [
-        Location,
-        { provide: LocationStrategy, useClass: PathLocationStrategy },
-        { provide: UrlSerializer, useClass: DefaultUrlSerializer },
-        {
-            provide: Router,
-            useFactory: (ref, resolver, urlSerializer, outletMap, location, injector) => {
-                if (ref.componentTypes.length == 0) {
-                    throw new Error("Bootstrap at least one component before injecting Router.");
-                }
-                const componentType = ref.componentTypes[0];
-                const r = new Router(componentType, resolver, urlSerializer, outletMap, location, injector);
-                r.resetConfig(config);
-                ref.registerDisposeListener(() => r.dispose());
-                return r;
-            },
-            deps: [ApplicationRef, ComponentResolver, UrlSerializer, RouterOutletMap, Location, Injector]
-        },
-        RouterOutletMap,
-        { provide: ActivatedRoute, useFactory: (r) => r.routerState.root, deps: [Router] },
-    ];
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbW9uX3JvdXRlcl9wcm92aWRlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29tbW9uX3JvdXRlcl9wcm92aWRlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ik9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxxQkFBcUI7T0FDOUMsRUFBRSxhQUFhLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSxrQkFBa0I7T0FDL0QsRUFBRSxjQUFjLEVBQUUsTUFBTSxnQkFBZ0I7T0FDeEMsRUFBRSxNQUFNLEVBQUUsTUFBTSxVQUFVO09BRTFCLEVBQUUsaUJBQWlCLEVBQUUsY0FBYyxFQUFFLFFBQVEsRUFBRSxNQUFNLGVBQWU7T0FDcEUsRUFBRSxnQkFBZ0IsRUFBRSxvQkFBb0IsRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUI7QUFvQmxGLDhCQUE4QixNQUFvQjtJQUNoRCxNQUFNLENBQUM7UUFDTCxRQUFRO1FBQ1IsRUFBQyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsUUFBUSxFQUFFLG9CQUFvQixFQUFDO1FBQzNELEVBQUMsT0FBTyxFQUFFLGFBQWEsRUFBRSxRQUFRLEVBQUUsb0JBQW9CLEVBQUM7UUFFeEQ7WUFDRSxPQUFPLEVBQUUsTUFBTTtZQUNmLFVBQVUsRUFBRSxDQUFDLEdBQUcsRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsUUFBUTtnQkFDdEUsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxNQUFNLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDbkMsTUFBTSxJQUFJLEtBQUssQ0FBQywyREFBMkQsQ0FBQyxDQUFDO2dCQUMvRSxDQUFDO2dCQUNELE1BQU0sYUFBYSxHQUFHLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQzVDLE1BQU0sQ0FBQyxHQUFHLElBQUksTUFBTSxDQUFDLGFBQWEsRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsUUFBUSxDQUFDLENBQUM7Z0JBQzVGLENBQUMsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ3RCLEdBQUcsQ0FBQyx1QkFBdUIsQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO2dCQUMvQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ1gsQ0FBQztZQUNELElBQUksRUFBRSxDQUFDLGNBQWMsRUFBRSxpQkFBaUIsRUFBRSxhQUFhLEVBQUUsZUFBZSxFQUFFLFFBQVEsRUFBRSxRQUFRLENBQUM7U0FDOUY7UUFFRCxlQUFlO1FBQ2YsRUFBQyxPQUFPLEVBQUUsY0FBYyxFQUFFLFVBQVUsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsV0FBVyxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsQ0FBQyxNQUFNLENBQUMsRUFBQztLQUNqRixDQUFDO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJvdXRlck91dGxldE1hcCB9IGZyb20gJy4vcm91dGVyX291dGxldF9tYXAnO1xuaW1wb3J0IHsgVXJsU2VyaWFsaXplciwgRGVmYXVsdFVybFNlcmlhbGl6ZXIgfSBmcm9tICcuL3VybF9zZXJpYWxpemVyJztcbmltcG9ydCB7IEFjdGl2YXRlZFJvdXRlIH0gZnJvbSAnLi9yb3V0ZXJfc3RhdGUnO1xuaW1wb3J0IHsgUm91dGVyIH0gZnJvbSAnLi9yb3V0ZXInO1xuaW1wb3J0IHsgUm91dGVyQ29uZmlnIH0gZnJvbSAnLi9jb25maWcnO1xuaW1wb3J0IHsgQ29tcG9uZW50UmVzb2x2ZXIsIEFwcGxpY2F0aW9uUmVmLCBJbmplY3RvciB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgTG9jYXRpb25TdHJhdGVneSwgUGF0aExvY2F0aW9uU3RyYXRlZ3ksIExvY2F0aW9uIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcblxuLyoqXG4gKiBBIGxpc3Qgb2Yge0BsaW5rIFByb3ZpZGVyfXMuIFRvIHVzZSB0aGUgcm91dGVyLCB5b3UgbXVzdCBhZGQgdGhpcyB0byB5b3VyIGFwcGxpY2F0aW9uLlxuICpcbiAqICMjIyBFeGFtcGxlXG4gKlxuICogYGBgXG4gKiBAQ29tcG9uZW50KHtkaXJlY3RpdmVzOiBbUk9VVEVSX0RJUkVDVElWRVNdfSlcbiAqIGNsYXNzIEFwcENtcCB7XG4gKiAgIC8vIC4uLlxuICogfVxuICpcbiAqIGNvbnN0IHJvdXRlciA9IFtcbiAqICAge3BhdGg6ICcvaG9tZScsIGNvbXBvbmVudDogSG9tZX1cbiAqIF07XG4gKlxuICogYm9vdHN0cmFwKEFwcENtcCwgW3Byb3ZpZGVSb3V0ZXIocm91dGVyKV0pO1xuICogYGBgXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBwcm92aWRlUm91dGVyKGNvbmZpZzogUm91dGVyQ29uZmlnKTphbnlbXSB7XG4gIHJldHVybiBbXG4gICAgTG9jYXRpb24sXG4gICAge3Byb3ZpZGU6IExvY2F0aW9uU3RyYXRlZ3ksIHVzZUNsYXNzOiBQYXRoTG9jYXRpb25TdHJhdGVneX0sXG4gICAge3Byb3ZpZGU6IFVybFNlcmlhbGl6ZXIsIHVzZUNsYXNzOiBEZWZhdWx0VXJsU2VyaWFsaXplcn0sXG5cbiAgICB7XG4gICAgICBwcm92aWRlOiBSb3V0ZXIsXG4gICAgICB1c2VGYWN0b3J5OiAocmVmLCByZXNvbHZlciwgdXJsU2VyaWFsaXplciwgb3V0bGV0TWFwLCBsb2NhdGlvbiwgaW5qZWN0b3IpID0+IHtcbiAgICAgICAgaWYgKHJlZi5jb21wb25lbnRUeXBlcy5sZW5ndGggPT0gMCkge1xuICAgICAgICAgIHRocm93IG5ldyBFcnJvcihcIkJvb3RzdHJhcCBhdCBsZWFzdCBvbmUgY29tcG9uZW50IGJlZm9yZSBpbmplY3RpbmcgUm91dGVyLlwiKTtcbiAgICAgICAgfVxuICAgICAgICBjb25zdCBjb21wb25lbnRUeXBlID0gcmVmLmNvbXBvbmVudFR5cGVzWzBdO1xuICAgICAgICBjb25zdCByID0gbmV3IFJvdXRlcihjb21wb25lbnRUeXBlLCByZXNvbHZlciwgdXJsU2VyaWFsaXplciwgb3V0bGV0TWFwLCBsb2NhdGlvbiwgaW5qZWN0b3IpO1xuICAgICAgICByLnJlc2V0Q29uZmlnKGNvbmZpZyk7XG4gICAgICAgIHJlZi5yZWdpc3RlckRpc3Bvc2VMaXN0ZW5lcigoKSA9PiByLmRpc3Bvc2UoKSk7XG4gICAgICAgIHJldHVybiByO1xuICAgICAgfSxcbiAgICAgIGRlcHM6IFtBcHBsaWNhdGlvblJlZiwgQ29tcG9uZW50UmVzb2x2ZXIsIFVybFNlcmlhbGl6ZXIsIFJvdXRlck91dGxldE1hcCwgTG9jYXRpb24sIEluamVjdG9yXVxuICAgIH0sXG5cbiAgICBSb3V0ZXJPdXRsZXRNYXAsXG4gICAge3Byb3ZpZGU6IEFjdGl2YXRlZFJvdXRlLCB1c2VGYWN0b3J5OiAocikgPT4gci5yb3V0ZXJTdGF0ZS5yb290LCBkZXBzOiBbUm91dGVyXX0sXG4gIF07XG59XG4iXX0=
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/config.d.ts b/modules/@angular/router/build/es6/src/config.d.ts
deleted file mode 100644
index 2074d71163..0000000000
--- a/modules/@angular/router/build/es6/src/config.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Type } from '@angular/core';
-export declare type RouterConfig = Route[];
-export interface Route {
-    index?: boolean;
-    path?: string;
-    component: Type | string;
-    outlet?: string;
-    canActivate?: any[];
-    canDeactivate?: any[];
-    children?: Route[];
-}
diff --git a/modules/@angular/router/build/es6/src/config.js b/modules/@angular/router/build/es6/src/config.js
deleted file mode 100644
index 1d0208cc76..0000000000
--- a/modules/@angular/router/build/es6/src/config.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHlwZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5leHBvcnQgdHlwZSBSb3V0ZXJDb25maWcgPSBSb3V0ZVtdO1xuXG5leHBvcnQgaW50ZXJmYWNlIFJvdXRlIHtcbiAgaW5kZXg/OiBib29sZWFuO1xuICBwYXRoPzogc3RyaW5nO1xuICBjb21wb25lbnQ6IFR5cGUgfCBzdHJpbmc7XG4gIG91dGxldD86IHN0cmluZztcbiAgY2FuQWN0aXZhdGU/OiBhbnlbXSxcbiAgY2FuRGVhY3RpdmF0ZT86IGFueVtdLFxuICBjaGlsZHJlbj86IFJvdXRlW107XG59Il19
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/create_router_state.d.ts b/modules/@angular/router/build/es6/src/create_router_state.d.ts
deleted file mode 100644
index 4ff54a3c73..0000000000
--- a/modules/@angular/router/build/es6/src/create_router_state.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { RouterStateSnapshot, RouterState } from './router_state';
-export declare function createRouterState(curr: RouterStateSnapshot, prevState: RouterState): RouterState;
diff --git a/modules/@angular/router/build/es6/src/create_router_state.js b/modules/@angular/router/build/es6/src/create_router_state.js
deleted file mode 100644
index 649da2865f..0000000000
--- a/modules/@angular/router/build/es6/src/create_router_state.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { RouterState, ActivatedRoute } from './router_state';
-import { TreeNode } from './utils/tree';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-export function createRouterState(curr, prevState) {
-    const root = createNode(curr._root, prevState ? prevState._root : undefined);
-    const queryParams = prevState ? prevState.queryParams : new BehaviorSubject(curr.queryParams);
-    const fragment = prevState ? prevState.fragment : new BehaviorSubject(curr.fragment);
-    return new RouterState(root, queryParams, fragment, curr);
-}
-function createNode(curr, prevState) {
-    if (prevState && equalRouteSnapshots(prevState.value.snapshot, curr.value)) {
-        const value = prevState.value;
-        value._futureSnapshot = curr.value;
-        const children = createOrReuseChildren(curr, prevState);
-        return new TreeNode(value, children);
-    }
-    else {
-        const value = createActivatedRoute(curr.value);
-        const children = curr.children.map(c => createNode(c));
-        return new TreeNode(value, children);
-    }
-}
-function createOrReuseChildren(curr, prevState) {
-    return curr.children.map(child => {
-        const index = prevState.children.findIndex(p => equalRouteSnapshots(p.value.snapshot, child.value));
-        if (index >= 0) {
-            return createNode(child, prevState.children[index]);
-        }
-        else {
-            return createNode(child);
-        }
-    });
-}
-function createActivatedRoute(c) {
-    return new ActivatedRoute(new BehaviorSubject(c.urlSegments), new BehaviorSubject(c.params), c.outlet, c.component, c);
-}
-function equalRouteSnapshots(a, b) {
-    return a._routeConfig === b._routeConfig;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX3JvdXRlcl9zdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jcmVhdGVfcm91dGVyX3N0YXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJPQUFPLEVBQStDLFdBQVcsRUFBRSxjQUFjLEVBQUUsTUFBTSxnQkFBZ0I7T0FDbEcsRUFBRSxRQUFRLEVBQUUsTUFBTSxjQUFjO09BQ2hDLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCO0FBRXRELGtDQUFrQyxJQUF5QixFQUFFLFNBQXNCO0lBQ2pGLE1BQU0sSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLFNBQVMsR0FBRyxTQUFTLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQyxDQUFDO0lBQzdFLE1BQU0sV0FBVyxHQUFHLFNBQVMsR0FBRyxTQUFTLENBQUMsV0FBVyxHQUFHLElBQUksZUFBZSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUM5RixNQUFNLFFBQVEsR0FBRyxTQUFTLEdBQUcsU0FBUyxDQUFDLFFBQVEsR0FBRyxJQUFJLGVBQWUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDckYsTUFBTSxDQUFDLElBQUksV0FBVyxDQUFDLElBQUksRUFBRSxXQUFXLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO0FBQzVELENBQUM7QUFFRCxvQkFBb0IsSUFBcUMsRUFBRSxTQUFtQztJQUM1RixFQUFFLENBQUMsQ0FBQyxTQUFTLElBQUksbUJBQW1CLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMzRSxNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsS0FBSyxDQUFDO1FBQzlCLEtBQUssQ0FBQyxlQUFlLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQztRQUVuQyxNQUFNLFFBQVEsR0FBRyxxQkFBcUIsQ0FBQyxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDeEQsTUFBTSxDQUFDLElBQUksUUFBUSxDQUFpQixLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFFdkQsQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sTUFBTSxLQUFLLEdBQUcsb0JBQW9CLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQy9DLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2RCxNQUFNLENBQUMsSUFBSSxRQUFRLENBQWlCLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQztJQUN2RCxDQUFDO0FBQ0gsQ0FBQztBQUVELCtCQUErQixJQUFxQyxFQUFFLFNBQWtDO0lBQ3RHLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxLQUFLO1FBQzVCLE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUNwRyxFQUFFLENBQUMsQ0FBQyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNmLE1BQU0sQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLFNBQVMsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUN0RCxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDTixNQUFNLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzNCLENBQUM7SUFDSCxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUM7QUFFRCw4QkFBOEIsQ0FBd0I7SUFDcEQsTUFBTSxDQUFDLElBQUksY0FBYyxDQUFDLElBQUksZUFBZSxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsRUFBRSxJQUFJLGVBQWUsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQ3pILENBQUM7QUFFRCw2QkFBNkIsQ0FBeUIsRUFBRSxDQUF5QjtJQUMvRSxNQUFNLENBQUMsQ0FBQyxDQUFDLFlBQVksS0FBSyxDQUFDLENBQUMsWUFBWSxDQUFDO0FBQzNDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSb3V0ZXJTdGF0ZVNuYXBzaG90LCBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBSb3V0ZXJTdGF0ZSwgQWN0aXZhdGVkUm91dGUgfSBmcm9tICcuL3JvdXRlcl9zdGF0ZSc7XG5pbXBvcnQgeyBUcmVlTm9kZSB9IGZyb20gJy4vdXRpbHMvdHJlZSc7XG5pbXBvcnQgeyBCZWhhdmlvclN1YmplY3QgfSBmcm9tICdyeGpzL0JlaGF2aW9yU3ViamVjdCc7XG5cbmV4cG9ydCBmdW5jdGlvbiBjcmVhdGVSb3V0ZXJTdGF0ZShjdXJyOiBSb3V0ZXJTdGF0ZVNuYXBzaG90LCBwcmV2U3RhdGU6IFJvdXRlclN0YXRlKTogUm91dGVyU3RhdGUge1xuICBjb25zdCByb290ID0gY3JlYXRlTm9kZShjdXJyLl9yb290LCBwcmV2U3RhdGUgPyBwcmV2U3RhdGUuX3Jvb3QgOiB1bmRlZmluZWQpO1xuICBjb25zdCBxdWVyeVBhcmFtcyA9IHByZXZTdGF0ZSA/IHByZXZTdGF0ZS5xdWVyeVBhcmFtcyA6IG5ldyBCZWhhdmlvclN1YmplY3QoY3Vyci5xdWVyeVBhcmFtcyk7XG4gIGNvbnN0IGZyYWdtZW50ID0gcHJldlN0YXRlID8gcHJldlN0YXRlLmZyYWdtZW50IDogbmV3IEJlaGF2aW9yU3ViamVjdChjdXJyLmZyYWdtZW50KTtcbiAgcmV0dXJuIG5ldyBSb3V0ZXJTdGF0ZShyb290LCBxdWVyeVBhcmFtcywgZnJhZ21lbnQsIGN1cnIpO1xufVxuXG5mdW5jdGlvbiBjcmVhdGVOb2RlKGN1cnI6VHJlZU5vZGU8QWN0aXZhdGVkUm91dGVTbmFwc2hvdD4sIHByZXZTdGF0ZT86VHJlZU5vZGU8QWN0aXZhdGVkUm91dGU+KTpUcmVlTm9kZTxBY3RpdmF0ZWRSb3V0ZT4ge1xuICBpZiAocHJldlN0YXRlICYmIGVxdWFsUm91dGVTbmFwc2hvdHMocHJldlN0YXRlLnZhbHVlLnNuYXBzaG90LCBjdXJyLnZhbHVlKSkge1xuICAgIGNvbnN0IHZhbHVlID0gcHJldlN0YXRlLnZhbHVlO1xuICAgIHZhbHVlLl9mdXR1cmVTbmFwc2hvdCA9IGN1cnIudmFsdWU7XG4gICAgXG4gICAgY29uc3QgY2hpbGRyZW4gPSBjcmVhdGVPclJldXNlQ2hpbGRyZW4oY3VyciwgcHJldlN0YXRlKTtcbiAgICByZXR1cm4gbmV3IFRyZWVOb2RlPEFjdGl2YXRlZFJvdXRlPih2YWx1ZSwgY2hpbGRyZW4pO1xuXG4gIH0gZWxzZSB7XG4gICAgY29uc3QgdmFsdWUgPSBjcmVhdGVBY3RpdmF0ZWRSb3V0ZShjdXJyLnZhbHVlKTtcbiAgICBjb25zdCBjaGlsZHJlbiA9IGN1cnIuY2hpbGRyZW4ubWFwKGMgPT4gY3JlYXRlTm9kZShjKSk7XG4gICAgcmV0dXJuIG5ldyBUcmVlTm9kZTxBY3RpdmF0ZWRSb3V0ZT4odmFsdWUsIGNoaWxkcmVuKTtcbiAgfVxufVxuXG5mdW5jdGlvbiBjcmVhdGVPclJldXNlQ2hpbGRyZW4oY3VycjpUcmVlTm9kZTxBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90PiwgcHJldlN0YXRlOlRyZWVOb2RlPEFjdGl2YXRlZFJvdXRlPikge1xuICByZXR1cm4gY3Vyci5jaGlsZHJlbi5tYXAoY2hpbGQgPT4ge1xuICAgIGNvbnN0IGluZGV4ID0gcHJldlN0YXRlLmNoaWxkcmVuLmZpbmRJbmRleChwID0+IGVxdWFsUm91dGVTbmFwc2hvdHMocC52YWx1ZS5zbmFwc2hvdCwgY2hpbGQudmFsdWUpKTtcbiAgICBpZiAoaW5kZXggPj0gMCkge1xuICAgICAgcmV0dXJuIGNyZWF0ZU5vZGUoY2hpbGQsIHByZXZTdGF0ZS5jaGlsZHJlbltpbmRleF0pO1xuICAgIH0gZWxzZSB7XG4gICAgICByZXR1cm4gY3JlYXRlTm9kZShjaGlsZCk7XG4gICAgfVxuICB9KTtcbn1cblxuZnVuY3Rpb24gY3JlYXRlQWN0aXZhdGVkUm91dGUoYzpBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90KSB7XG4gIHJldHVybiBuZXcgQWN0aXZhdGVkUm91dGUobmV3IEJlaGF2aW9yU3ViamVjdChjLnVybFNlZ21lbnRzKSwgbmV3IEJlaGF2aW9yU3ViamVjdChjLnBhcmFtcyksIGMub3V0bGV0LCBjLmNvbXBvbmVudCwgYyk7XG59XG5cbmZ1bmN0aW9uIGVxdWFsUm91dGVTbmFwc2hvdHMoYTogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgYjogQWN0aXZhdGVkUm91dGVTbmFwc2hvdCk6IGJvb2xlYW4ge1xuICByZXR1cm4gYS5fcm91dGVDb25maWcgPT09IGIuX3JvdXRlQ29uZmlnO1xufSJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/create_url_tree.d.ts b/modules/@angular/router/build/es6/src/create_url_tree.d.ts
deleted file mode 100644
index 999cea0d39..0000000000
--- a/modules/@angular/router/build/es6/src/create_url_tree.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { UrlTree } from './url_tree';
-import { ActivatedRoute } from './router_state';
-import { Params } from './shared';
-export declare function createUrlTree(route: ActivatedRoute, urlTree: UrlTree, commands: any[], queryParameters: Params | undefined, fragment: string | undefined): UrlTree;
diff --git a/modules/@angular/router/build/es6/src/create_url_tree.js b/modules/@angular/router/build/es6/src/create_url_tree.js
deleted file mode 100644
index 575e656fcf..0000000000
--- a/modules/@angular/router/build/es6/src/create_url_tree.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import { UrlTree, UrlSegment } from './url_tree';
-import { TreeNode } from './utils/tree';
-import { forEach, shallowEqual } from './utils/collection';
-import { PRIMARY_OUTLET } from './shared';
-export function createUrlTree(route, urlTree, commands, queryParameters, fragment) {
-    if (commands.length === 0) {
-        return tree(urlTree._root, urlTree, queryParameters, fragment);
-    }
-    const normalizedCommands = normalizeCommands(commands);
-    if (navigateToRoot(normalizedCommands)) {
-        return tree(new TreeNode(urlTree.root, []), urlTree, queryParameters, fragment);
-    }
-    const startingNode = findStartingNode(normalizedCommands, urlTree, route);
-    const updated = normalizedCommands.commands.length > 0 ?
-        updateMany(startingNode.children.slice(0), normalizedCommands.commands) :
-        [];
-    const newRoot = constructNewTree(urlTree._root, startingNode, updated);
-    return tree(newRoot, urlTree, queryParameters, fragment);
-}
-function tree(root, urlTree, queryParameters, fragment) {
-    const q = queryParameters ? stringify(queryParameters) : urlTree.queryParameters;
-    const f = fragment ? fragment : urlTree.fragment;
-    return new UrlTree(root, q, f);
-}
-function navigateToRoot(normalizedChange) {
-    return normalizedChange.isAbsolute && normalizedChange.commands.length === 1 &&
-        normalizedChange.commands[0] == "/";
-}
-class NormalizedNavigationCommands {
-    constructor(isAbsolute, numberOfDoubleDots, commands) {
-        this.isAbsolute = isAbsolute;
-        this.numberOfDoubleDots = numberOfDoubleDots;
-        this.commands = commands;
-    }
-}
-function normalizeCommands(commands) {
-    if ((typeof commands[0] === "string") && commands.length === 1 && commands[0] == "/") {
-        return new NormalizedNavigationCommands(true, 0, commands);
-    }
-    let numberOfDoubleDots = 0;
-    let isAbsolute = false;
-    const res = [];
-    for (let i = 0; i < commands.length; ++i) {
-        const c = commands[i];
-        if (!(typeof c === "string")) {
-            res.push(c);
-            continue;
-        }
-        const parts = c.split('/');
-        for (let j = 0; j < parts.length; ++j) {
-            let cc = parts[j];
-            if (i == 0) {
-                if (j == 0 && cc == ".") {
-                }
-                else if (j == 0 && cc == "") {
-                    isAbsolute = true;
-                }
-                else if (cc == "..") {
-                    numberOfDoubleDots++;
-                }
-                else if (cc != '') {
-                    res.push(cc);
-                }
-            }
-            else {
-                if (cc != '') {
-                    res.push(cc);
-                }
-            }
-        }
-    }
-    return new NormalizedNavigationCommands(isAbsolute, numberOfDoubleDots, res);
-}
-function findStartingNode(normalizedChange, urlTree, route) {
-    if (normalizedChange.isAbsolute) {
-        return urlTree._root;
-    }
-    else {
-        const urlSegment = findUrlSegment(route, urlTree, normalizedChange.numberOfDoubleDots);
-        return findMatchingNode(urlSegment, urlTree._root);
-    }
-}
-function findUrlSegment(route, urlTree, numberOfDoubleDots) {
-    const urlSegment = route.snapshot._lastUrlSegment;
-    const path = urlTree.pathFromRoot(urlSegment);
-    if (path.length <= numberOfDoubleDots) {
-        throw new Error("Invalid number of '../'");
-    }
-    return path[path.length - 1 - numberOfDoubleDots];
-}
-function findMatchingNode(segment, node) {
-    if (node.value === segment)
-        return node;
-    for (let c of node.children) {
-        const r = findMatchingNode(segment, c);
-        if (r)
-            return r;
-    }
-    throw new Error(`Cannot find url segment '${segment}'`);
-}
-function constructNewTree(node, original, updated) {
-    if (node === original) {
-        return new TreeNode(node.value, updated);
-    }
-    else {
-        return new TreeNode(node.value, node.children.map(c => constructNewTree(c, original, updated)));
-    }
-}
-function updateMany(nodes, commands) {
-    const outlet = getOutlet(commands);
-    const nodesInRightOutlet = nodes.filter(c => c.value.outlet === outlet);
-    if (nodesInRightOutlet.length > 0) {
-        const nodeRightOutlet = nodesInRightOutlet[0];
-        nodes[nodes.indexOf(nodeRightOutlet)] = update(nodeRightOutlet, commands);
-    }
-    else {
-        nodes.push(update(null, commands));
-    }
-    return nodes;
-}
-function getPath(commands) {
-    if (!(typeof commands[0] === "string"))
-        return commands[0];
-    const parts = commands[0].toString().split(":");
-    return parts.length > 1 ? parts[1] : commands[0];
-}
-function getOutlet(commands) {
-    if (!(typeof commands[0] === "string"))
-        return PRIMARY_OUTLET;
-    const parts = commands[0].toString().split(":");
-    return parts.length > 1 ? parts[0] : PRIMARY_OUTLET;
-}
-function update(node, commands) {
-    const rest = commands.slice(1);
-    const next = rest.length === 0 ? null : rest[0];
-    const outlet = getOutlet(commands);
-    const path = getPath(commands);
-    if (!node && !(typeof next === 'object')) {
-        const urlSegment = new UrlSegment(path, {}, outlet);
-        const children = rest.length === 0 ? [] : [update(null, rest)];
-        return new TreeNode(urlSegment, children);
-    }
-    else if (!node && typeof next === 'object') {
-        const urlSegment = new UrlSegment(path, stringify(next), outlet);
-        return recurse(urlSegment, node, rest.slice(1));
-    }
-    else if (node && outlet !== node.value.outlet) {
-        return node;
-    }
-    else if (node && typeof path === 'object') {
-        const newSegment = new UrlSegment(node.value.path, stringify(path), node.value.outlet);
-        return recurse(newSegment, node, rest);
-    }
-    else if (node && typeof next === 'object' && compare(path, stringify(next), node.value)) {
-        return recurse(node.value, node, rest.slice(1));
-    }
-    else if (node && typeof next === 'object') {
-        const urlSegment = new UrlSegment(path, stringify(next), outlet);
-        return recurse(urlSegment, node, rest.slice(1));
-    }
-    else if (node && compare(path, {}, node.value)) {
-        return recurse(node.value, node, rest);
-    }
-    else {
-        const urlSegment = new UrlSegment(path, {}, outlet);
-        return recurse(urlSegment, node, rest);
-    }
-}
-function stringify(params) {
-    const res = {};
-    forEach(params, (v, k) => res[k] = v.toString());
-    return res;
-}
-function compare(path, params, segment) {
-    return path == segment.path && shallowEqual(params, segment.parameters);
-}
-function recurse(urlSegment, node, rest) {
-    if (rest.length === 0) {
-        return new TreeNode(urlSegment, []);
-    }
-    const children = node ? node.children.slice(0) : [];
-    return new TreeNode(urlSegment, updateMany(children, rest));
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create_url_tree.js","sourceRoot":"","sources":["../../../src/create_url_tree.ts"],"names":[],"mappings":"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","sourcesContent":["import { UrlTree, UrlSegment, equalUrlSegments } from './url_tree';\nimport { TreeNode } from './utils/tree';\nimport { forEach, shallowEqual } from './utils/collection';\nimport { RouterState, ActivatedRoute } from './router_state';\nimport { Params, PRIMARY_OUTLET } from './shared';\n\nexport function createUrlTree(route: ActivatedRoute, urlTree: UrlTree, commands: any[], \n                              queryParameters: Params | undefined, fragment: string | undefined): UrlTree {\n  if (commands.length === 0) {\n    return tree(urlTree._root, urlTree, queryParameters, fragment);\n  }\n\n  const normalizedCommands = normalizeCommands(commands);\n  if (navigateToRoot(normalizedCommands)) {\n    return tree(new TreeNode<UrlSegment>(urlTree.root, []), urlTree, queryParameters, fragment);\n  }\n\n  const startingNode = findStartingNode(normalizedCommands, urlTree, route);\n  const updated = normalizedCommands.commands.length > 0 ?\n      updateMany(startingNode.children.slice(0), normalizedCommands.commands) :\n      [];\n  const newRoot = constructNewTree(urlTree._root, startingNode, updated);\n\n  return tree(newRoot, urlTree, queryParameters, fragment);\n}\n\nfunction tree(root: TreeNode<UrlSegment>, urlTree: UrlTree, queryParameters: Params | undefined, fragment: string | undefined): UrlTree {\n  const q = queryParameters ? stringify(queryParameters) : urlTree.queryParameters;\n  const f = fragment ? fragment : urlTree.fragment;\n  return new UrlTree(root, q, f);\n}\n\nfunction navigateToRoot(normalizedChange: NormalizedNavigationCommands): boolean {\n  return normalizedChange.isAbsolute && normalizedChange.commands.length === 1 &&\n    normalizedChange.commands[0] == \"/\";\n}\n\nclass NormalizedNavigationCommands {\n  constructor(public isAbsolute: boolean, public numberOfDoubleDots: number,\n              public commands: any[]) {}\n}\n\nfunction normalizeCommands(commands: any[]): NormalizedNavigationCommands {\n  if ((typeof commands[0] === \"string\") && commands.length === 1 && commands[0] == \"/\") {\n    return new NormalizedNavigationCommands(true, 0, commands);\n  }\n\n  let numberOfDoubleDots = 0;\n  let isAbsolute = false;\n  const res = [];\n\n  for (let i = 0; i < commands.length; ++i) {\n    const c = commands[i];\n\n    if (!(typeof c === \"string\")) {\n      res.push(c);\n      continue;\n    }\n\n    const parts = c.split('/');\n    for (let j = 0; j < parts.length; ++j) {\n      let cc = parts[j];\n\n      // first exp is treated in a special way\n      if (i == 0) {\n        if (j == 0 && cc == \".\") {  //  './a'\n          // skip it\n        } else if (j == 0 && cc == \"\") {  //  '/a'\n          isAbsolute = true;\n        } else if (cc == \"..\") {  //  '../a'\n          numberOfDoubleDots++;\n        } else if (cc != '') {\n          res.push(cc);\n        }\n\n      } else {\n        if (cc != '') {\n          res.push(cc);\n        }\n      }\n    }\n  }\n\n  return new NormalizedNavigationCommands(isAbsolute, numberOfDoubleDots, res);\n}\n\nfunction findStartingNode(normalizedChange: NormalizedNavigationCommands, urlTree: UrlTree,\n                           route: ActivatedRoute): TreeNode<UrlSegment> {\n  if (normalizedChange.isAbsolute) {\n    return urlTree._root;\n  } else {\n    const urlSegment =\n      findUrlSegment(route, urlTree, normalizedChange.numberOfDoubleDots);\n    return findMatchingNode(urlSegment, urlTree._root);\n  }\n}\n\nfunction findUrlSegment(route: ActivatedRoute, urlTree: UrlTree, numberOfDoubleDots: number): UrlSegment {\n  const urlSegment = route.snapshot._lastUrlSegment;\n  const path = urlTree.pathFromRoot(urlSegment);\n  if (path.length <= numberOfDoubleDots) {\n    throw new Error(\"Invalid number of '../'\");\n  }\n  return path[path.length - 1 - numberOfDoubleDots];\n}\n\nfunction findMatchingNode(segment: UrlSegment, node: TreeNode<UrlSegment>): TreeNode<UrlSegment> {\n  if (node.value === segment) return node;\n  for (let c of node.children) {\n    const r = findMatchingNode(segment, c);\n    if (r) return r;\n  }\n  throw new Error(`Cannot find url segment '${segment}'`);\n}\n\nfunction constructNewTree(node: TreeNode<UrlSegment>, original: TreeNode<UrlSegment>,\n                          updated: TreeNode<UrlSegment>[]): TreeNode<UrlSegment> {\n  if (node === original) {\n    return new TreeNode<UrlSegment>(node.value, updated);\n  } else {\n    return new TreeNode<UrlSegment>(\n      node.value, node.children.map(c => constructNewTree(c, original, updated)));\n  }\n}\n\nfunction updateMany(nodes: TreeNode<UrlSegment>[], commands: any[]): TreeNode<UrlSegment>[] {\n  const outlet = getOutlet(commands);\n  const nodesInRightOutlet = nodes.filter(c => c.value.outlet === outlet);\n  if (nodesInRightOutlet.length > 0) {\n    const nodeRightOutlet = nodesInRightOutlet[0];  // there can be only one\n    nodes[nodes.indexOf(nodeRightOutlet)] = update(nodeRightOutlet, commands);\n  } else {\n    nodes.push(update(null, commands));\n  }\n  return nodes;\n}\n\nfunction getPath(commands: any[]): any {\n  if (!(typeof commands[0] === \"string\")) return commands[0];\n  const parts = commands[0].toString().split(\":\");\n  return parts.length > 1 ? parts[1] : commands[0];\n}\n\nfunction getOutlet(commands: any[]): string {\n  if (!(typeof commands[0] === \"string\")) return PRIMARY_OUTLET;\n  const parts = commands[0].toString().split(\":\");\n  return parts.length > 1 ? parts[0] : PRIMARY_OUTLET;\n}\n\nfunction update(node: TreeNode<UrlSegment>|null, commands: any[]): TreeNode<UrlSegment> {\n  const rest = commands.slice(1);\n  const next = rest.length === 0 ? null : rest[0];\n  const outlet = getOutlet(commands);\n  const path = getPath(commands);\n\n  // reach the end of the tree => create new tree nodes.\n  if (!node && !(typeof next === 'object')) {\n    const urlSegment = new UrlSegment(path, {}, outlet);\n    const children = rest.length === 0 ? [] : [update(null, rest)];\n    return new TreeNode<UrlSegment>(urlSegment, children);\n\n  } else if (!node && typeof next === 'object') {\n    const urlSegment = new UrlSegment(path, stringify(next), outlet);\n    return recurse(urlSegment, node, rest.slice(1));\n\n    // different outlet => preserve the subtree\n  } else if (node && outlet !== node.value.outlet) {\n    return node;\n\n    // params command\n  } else if (node && typeof path === 'object') {\n    const newSegment = new UrlSegment(node.value.path, stringify(path), node.value.outlet);\n    return recurse(newSegment, node, rest);\n\n    // next one is a params command && can reuse the node\n  } else if (node && typeof next === 'object' && compare(path, stringify(next), node.value)) {\n    return recurse(node.value, node, rest.slice(1));\n\n    // next one is a params command && cannot reuse the node\n  } else if (node && typeof next === 'object') {\n    const urlSegment = new UrlSegment(path, stringify(next), outlet);\n    return recurse(urlSegment, node, rest.slice(1));\n\n    // next one is not a params command && can reuse the node\n  } else if (node && compare(path, {}, node.value)) {\n    return recurse(node.value, node, rest);\n\n    // next one is not a params command && cannot reuse the node\n  } else {\n    const urlSegment = new UrlSegment(path, {}, outlet);\n    return recurse(urlSegment, node, rest);\n  }\n}\n\nfunction stringify(params: {[key: string]: any}): {[key: string]: string} {\n  const res = {};\n  forEach(params, (v, k) => res[k] = v.toString());\n  return res;\n}\n\nfunction compare(path: string, params: {[key: string]: any}, segment: UrlSegment): boolean {\n  return path == segment.path && shallowEqual(params, segment.parameters);\n}\n\nfunction recurse(urlSegment: UrlSegment, node: TreeNode<UrlSegment> | null,\n                  rest: any[]): TreeNode<UrlSegment> {\n  if (rest.length === 0) {\n    return new TreeNode<UrlSegment>(urlSegment, []);\n  }\n  const children = node ? node.children.slice(0) : [];\n  return new TreeNode<UrlSegment>(urlSegment, updateMany(children, rest));\n}"]}
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/directives/router_link.d.ts b/modules/@angular/router/build/es6/src/directives/router_link.d.ts
deleted file mode 100644
index 5ce81cb7fc..0000000000
--- a/modules/@angular/router/build/es6/src/directives/router_link.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Router } from '../router';
-import { ActivatedRoute } from '../router_state';
-export declare class RouterLink {
-    private router;
-    private route;
-    target: string;
-    private commands;
-    href: string;
-    constructor(router: Router, route: ActivatedRoute);
-    routerLink: any[] | string;
-    onClick(): boolean;
-    private updateTargetUrlAndHref();
-}
diff --git a/modules/@angular/router/build/es6/src/directives/router_link.js b/modules/@angular/router/build/es6/src/directives/router_link.js
deleted file mode 100644
index 513d9923ec..0000000000
--- a/modules/@angular/router/build/es6/src/directives/router_link.js
+++ /dev/null
@@ -1,65 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Directive, HostListener, HostBinding, Input } from '@angular/core';
-import { Router } from '../router';
-import { ActivatedRoute } from '../router_state';
-export let RouterLink = class RouterLink {
-    constructor(router, route) {
-        this.router = router;
-        this.route = route;
-        this.commands = [];
-    }
-    set routerLink(data) {
-        if (Array.isArray(data)) {
-            this.commands = data;
-        }
-        else {
-            this.commands = [data];
-        }
-        this.updateTargetUrlAndHref();
-    }
-    onClick() {
-        if (!(typeof this.target === "string") || this.target == '_self') {
-            this.router.navigate(this.commands, { relativeTo: this.route });
-            return false;
-        }
-        return true;
-    }
-    updateTargetUrlAndHref() {
-        const tree = this.router.createUrlTree(this.commands, { relativeTo: this.route });
-        if (tree) {
-            this.href = this.router.serializeUrl(tree);
-        }
-    }
-};
-__decorate([
-    Input(), 
-    __metadata('design:type', String)
-], RouterLink.prototype, "target", void 0);
-__decorate([
-    HostBinding(), 
-    __metadata('design:type', String)
-], RouterLink.prototype, "href", void 0);
-__decorate([
-    Input(), 
-    __metadata('design:type', Object), 
-    __metadata('design:paramtypes', [Object])
-], RouterLink.prototype, "routerLink", null);
-__decorate([
-    HostListener("click"), 
-    __metadata('design:type', Function), 
-    __metadata('design:paramtypes', []), 
-    __metadata('design:returntype', Boolean)
-], RouterLink.prototype, "onClick", null);
-RouterLink = __decorate([
-    Directive({ selector: '[routerLink]' }), 
-    __metadata('design:paramtypes', [Router, ActivatedRoute])
-], RouterLink);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyX2xpbmsuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvZGlyZWN0aXZlcy9yb3V0ZXJfbGluay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7T0FBTyxFQUNMLFNBQVMsRUFDVCxZQUFZLEVBQ1osV0FBVyxFQUNYLEtBQUssRUFDTixNQUFNLGVBQWU7T0FDZixFQUFDLE1BQU0sRUFBQyxNQUFNLFdBQVc7T0FDekIsRUFBQyxjQUFjLEVBQUMsTUFBTSxpQkFBaUI7QUE0QjlDO0lBVUUsWUFBb0IsTUFBYyxFQUFVLEtBQXFCO1FBQTdDLFdBQU0sR0FBTixNQUFNLENBQVE7UUFBVSxVQUFLLEdBQUwsS0FBSyxDQUFnQjtRQVJ6RCxhQUFRLEdBQVUsRUFBRSxDQUFDO0lBUXVDLENBQUM7SUFHckUsSUFBSSxVQUFVLENBQUMsSUFBb0I7UUFDakMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDeEIsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUM7UUFDdkIsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ04sSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3pCLENBQUM7UUFDRCxJQUFJLENBQUMsc0JBQXNCLEVBQUUsQ0FBQztJQUNoQyxDQUFDO0lBR0QsT0FBTztRQUVMLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLElBQUksQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLElBQUksSUFBSSxDQUFDLE1BQU0sSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQ2pFLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLEtBQUssRUFBQyxDQUFDLENBQUM7WUFDOUQsTUFBTSxDQUFDLEtBQUssQ0FBQztRQUNmLENBQUM7UUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVPLHNCQUFzQjtRQUM1QixNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxLQUFLLEVBQUMsQ0FBQyxDQUFDO1FBQ2hGLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7WUFDVCxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzdDLENBQUM7SUFDSCxDQUFDO0FBQ0gsQ0FBQztBQXJDQztJQUFDLEtBQUssRUFBRTs7MENBQUE7QUFJUjtJQUFDLFdBQVcsRUFBRTs7d0NBQUE7QUFPZDtJQUFDLEtBQUssRUFBRTs7OzRDQUFBO0FBVVI7SUFBQyxZQUFZLENBQUMsT0FBTyxDQUFDOzs7O3lDQUFBO0FBdkJ4QjtJQUFDLFNBQVMsQ0FBQyxFQUFDLFFBQVEsRUFBRSxjQUFjLEVBQUMsQ0FBQzs7Y0FBQTtBQXVDckMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBEaXJlY3RpdmUsXG4gIEhvc3RMaXN0ZW5lcixcbiAgSG9zdEJpbmRpbmcsXG4gIElucHV0XG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtSb3V0ZXJ9IGZyb20gJy4uL3JvdXRlcic7XG5pbXBvcnQge0FjdGl2YXRlZFJvdXRlfSBmcm9tICcuLi9yb3V0ZXJfc3RhdGUnO1xuXG4vKipcbiAqIFRoZSBSb3V0ZXJMaW5rIGRpcmVjdGl2ZSBsZXRzIHlvdSBsaW5rIHRvIHNwZWNpZmljIHBhcnRzIG9mIHlvdXIgYXBwLlxuICpcbiAqIENvbnNpZGVyIHRoZSBmb2xsb3dpbmcgcm91dGUgY29uZmlndXJhdGlvbjpcblxuICogYGBgXG4gKiBbeyBwYXRoOiAnL3VzZXInLCBjb21wb25lbnQ6IFVzZXJDbXAgfV1cbiAqIGBgYFxuICpcbiAqIFdoZW4gbGlua2luZyB0byB0aGlzIGBVc2VyYCByb3V0ZSwgeW91IGNhbiB3cml0ZTpcbiAqXG4gKiBgYGBcbiAqIDxhIFtyb3V0ZXJMaW5rXT1cIlsnL3VzZXInXVwiPmxpbmsgdG8gdXNlciBjb21wb25lbnQ8L2E+XG4gKiBgYGBcbiAqXG4gKiBSb3V0ZXJMaW5rIGV4cGVjdHMgdGhlIHZhbHVlIHRvIGJlIGFuIGFycmF5IG9mIHBhdGggc2VnbWVudHMsIGZvbGxvd2VkIGJ5IHRoZSBwYXJhbXNcbiAqIGZvciB0aGF0IGxldmVsIG9mIHJvdXRpbmcuIEZvciBpbnN0YW5jZSBgWycvdGVhbScsIHt0ZWFtSWQ6IDF9LCAndXNlcicsIHt1c2VySWQ6IDJ9XWBcbiAqIG1lYW5zIHRoYXQgd2Ugd2FudCB0byBnZW5lcmF0ZSBhIGxpbmsgdG8gYC90ZWFtO3RlYW1JZD0xL3VzZXI7dXNlcklkPTJgLlxuICpcbiAqIFRoZSBmaXJzdCBzZWdtZW50IG5hbWUgY2FuIGJlIHByZXBlbmRlZCB3aXRoIGAvYCwgYC4vYCwgb3IgYC4uL2AuXG4gKiBJZiB0aGUgc2VnbWVudCBiZWdpbnMgd2l0aCBgL2AsIHRoZSByb3V0ZXIgd2lsbCBsb29rIHVwIHRoZSByb3V0ZSBmcm9tIHRoZSByb290IG9mIHRoZSBhcHAuXG4gKiBJZiB0aGUgc2VnbWVudCBiZWdpbnMgd2l0aCBgLi9gLCBvciBkb2Vzbid0IGJlZ2luIHdpdGggYSBzbGFzaCwgdGhlIHJvdXRlciB3aWxsXG4gKiBpbnN0ZWFkIGxvb2sgaW4gdGhlIGN1cnJlbnQgY29tcG9uZW50J3MgY2hpbGRyZW4gZm9yIHRoZSByb3V0ZS5cbiAqIEFuZCBpZiB0aGUgc2VnbWVudCBiZWdpbnMgd2l0aCBgLi4vYCwgdGhlIHJvdXRlciB3aWxsIGdvIHVwIG9uZSBsZXZlbC5cbiAqL1xuQERpcmVjdGl2ZSh7c2VsZWN0b3I6ICdbcm91dGVyTGlua10nfSlcbmV4cG9ydCBjbGFzcyBSb3V0ZXJMaW5rIHtcbiAgQElucHV0KCkgdGFyZ2V0OiBzdHJpbmc7XG4gIHByaXZhdGUgY29tbWFuZHM6IGFueVtdID0gW107XG5cbiAgLy8gdGhlIHVybCBkaXNwbGF5ZWQgb24gdGhlIGFuY2hvciBlbGVtZW50LlxuICBASG9zdEJpbmRpbmcoKSBocmVmOiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIEBpbnRlcm5hbFxuICAgKi9cbiAgY29uc3RydWN0b3IocHJpdmF0ZSByb3V0ZXI6IFJvdXRlciwgcHJpdmF0ZSByb3V0ZTogQWN0aXZhdGVkUm91dGUpIHt9XG5cbiAgQElucHV0KClcbiAgc2V0IHJvdXRlckxpbmsoZGF0YTogYW55W10gfCBzdHJpbmcpIHtcbiAgICBpZiAoQXJyYXkuaXNBcnJheShkYXRhKSkge1xuICAgICAgdGhpcy5jb21tYW5kcyA9IGRhdGE7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRoaXMuY29tbWFuZHMgPSBbZGF0YV07XG4gICAgfVxuICAgIHRoaXMudXBkYXRlVGFyZ2V0VXJsQW5kSHJlZigpO1xuICB9XG4gIFxuICBASG9zdExpc3RlbmVyKFwiY2xpY2tcIilcbiAgb25DbGljaygpOiBib29sZWFuIHtcbiAgICAvLyBJZiBubyB0YXJnZXQsIG9yIGlmIHRhcmdldCBpcyBfc2VsZiwgcHJldmVudCBkZWZhdWx0IGJyb3dzZXIgYmVoYXZpb3JcbiAgICBpZiAoISh0eXBlb2YgdGhpcy50YXJnZXQgPT09IFwic3RyaW5nXCIpIHx8IHRoaXMudGFyZ2V0ID09ICdfc2VsZicpIHtcbiAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKHRoaXMuY29tbWFuZHMsIHtyZWxhdGl2ZVRvOiB0aGlzLnJvdXRlfSk7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfVxuICAgIHJldHVybiB0cnVlO1xuICB9XG5cbiAgcHJpdmF0ZSB1cGRhdGVUYXJnZXRVcmxBbmRIcmVmKCk6IHZvaWQge1xuICAgIGNvbnN0IHRyZWUgPSB0aGlzLnJvdXRlci5jcmVhdGVVcmxUcmVlKHRoaXMuY29tbWFuZHMsIHtyZWxhdGl2ZVRvOiB0aGlzLnJvdXRlfSk7XG4gICAgaWYgKHRyZWUpIHtcbiAgICAgIHRoaXMuaHJlZiA9IHRoaXMucm91dGVyLnNlcmlhbGl6ZVVybCh0cmVlKTtcbiAgICB9XG4gIH1cbn1cbiJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/directives/router_outlet.d.ts b/modules/@angular/router/build/es6/src/directives/router_outlet.d.ts
deleted file mode 100644
index d67ccb3f79..0000000000
--- a/modules/@angular/router/build/es6/src/directives/router_outlet.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ViewContainerRef, ComponentFactory, ResolvedReflectiveProvider } from '@angular/core';
-import { RouterOutletMap } from '../router_outlet_map';
-export declare class RouterOutlet {
-    private location;
-    private activated;
-    outletMap: RouterOutletMap;
-    constructor(parentOutletMap: RouterOutletMap, location: ViewContainerRef, name: string);
-    readonly isActivated: boolean;
-    readonly component: Object;
-    deactivate(): void;
-    activate(factory: ComponentFactory<any>, providers: ResolvedReflectiveProvider[], outletMap: RouterOutletMap): void;
-}
diff --git a/modules/@angular/router/build/es6/src/directives/router_outlet.js b/modules/@angular/router/build/es6/src/directives/router_outlet.js
deleted file mode 100644
index 6843004bdf..0000000000
--- a/modules/@angular/router/build/es6/src/directives/router_outlet.js
+++ /dev/null
@@ -1,44 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-import { Directive, ViewContainerRef, Attribute, ReflectiveInjector } from '@angular/core';
-import { RouterOutletMap } from '../router_outlet_map';
-import { PRIMARY_OUTLET } from '../shared';
-export let RouterOutlet = class RouterOutlet {
-    constructor(parentOutletMap, location, name) {
-        this.location = location;
-        parentOutletMap.registerOutlet(name ? name : PRIMARY_OUTLET, this);
-    }
-    get isActivated() { return !!this.activated; }
-    get component() {
-        if (!this.activated)
-            throw new Error("Outlet is not activated");
-        return this.activated.instance;
-    }
-    deactivate() {
-        if (this.activated) {
-            this.activated.destroy();
-            this.activated = null;
-        }
-    }
-    activate(factory, providers, outletMap) {
-        this.outletMap = outletMap;
-        const inj = ReflectiveInjector.fromResolvedProviders(providers, this.location.parentInjector);
-        this.activated = this.location.createComponent(factory, this.location.length, inj, []);
-    }
-};
-RouterOutlet = __decorate([
-    Directive({ selector: 'router-outlet' }),
-    __param(2, Attribute('name')), 
-    __metadata('design:paramtypes', [RouterOutletMap, ViewContainerRef, String])
-], RouterOutlet);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyX291dGxldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9kaXJlY3RpdmVzL3JvdXRlcl9vdXRsZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O09BQU8sRUFBVyxTQUFTLEVBQUUsZ0JBQWdCLEVBQUUsU0FBUyxFQUE4RCxrQkFBa0IsRUFBQyxNQUFNLGVBQWU7T0FDdkosRUFBQyxlQUFlLEVBQUMsTUFBTSxzQkFBc0I7T0FDN0MsRUFBQyxjQUFjLEVBQUMsTUFBTSxXQUFXO0FBR3hDO0lBT0UsWUFBWSxlQUErQixFQUFVLFFBQXlCLEVBQy9DLElBQVc7UUFEVyxhQUFRLEdBQVIsUUFBUSxDQUFpQjtRQUU1RSxlQUFlLENBQUMsY0FBYyxDQUFDLElBQUksR0FBRyxJQUFJLEdBQUcsY0FBYyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ3JFLENBQUM7SUFFRCxJQUFJLFdBQVcsS0FBYyxNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO0lBQ3ZELElBQUksU0FBUztRQUNYLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztZQUFDLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLENBQUMsQ0FBQztRQUNoRSxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUM7SUFDakMsQ0FBQztJQUVELFVBQVU7UUFDUixFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztZQUNuQixJQUFJLENBQUMsU0FBUyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ3pCLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDO1FBQ3hCLENBQUM7SUFDSCxDQUFDO0lBRUQsUUFBUSxDQUFDLE9BQThCLEVBQUUsU0FBdUMsRUFDdkUsU0FBMEI7UUFDakMsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7UUFDM0IsTUFBTSxHQUFHLEdBQUcsa0JBQWtCLENBQUMscUJBQXFCLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDOUYsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3pGLENBQUM7QUFDSCxDQUFDO0FBaENEO0lBQUMsU0FBUyxDQUFDLEVBQUMsUUFBUSxFQUFFLGVBQWUsRUFBQyxDQUFDO2VBU3hCLFNBQVMsQ0FBQyxNQUFNLENBQUM7O2dCQVRPO0FBZ0N0QyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7SW5qZWN0b3IsIERpcmVjdGl2ZSwgVmlld0NvbnRhaW5lclJlZiwgQXR0cmlidXRlLCBDb21wb25lbnRSZWYsIENvbXBvbmVudEZhY3RvcnksIFJlc29sdmVkUmVmbGVjdGl2ZVByb3ZpZGVyLCBSZWZsZWN0aXZlSW5qZWN0b3J9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtSb3V0ZXJPdXRsZXRNYXB9IGZyb20gJy4uL3JvdXRlcl9vdXRsZXRfbWFwJztcbmltcG9ydCB7UFJJTUFSWV9PVVRMRVR9IGZyb20gJy4uL3NoYXJlZCc7XG5cbkBEaXJlY3RpdmUoe3NlbGVjdG9yOiAncm91dGVyLW91dGxldCd9KVxuZXhwb3J0IGNsYXNzIFJvdXRlck91dGxldCB7XG4gIHByaXZhdGUgYWN0aXZhdGVkOkNvbXBvbmVudFJlZjxhbnk+fG51bGw7XG4gIHB1YmxpYyBvdXRsZXRNYXA6Um91dGVyT3V0bGV0TWFwO1xuXG4gIC8qKlxuICAgKiBAaW50ZXJuYWxcbiAgICovXG4gIGNvbnN0cnVjdG9yKHBhcmVudE91dGxldE1hcDpSb3V0ZXJPdXRsZXRNYXAsIHByaXZhdGUgbG9jYXRpb246Vmlld0NvbnRhaW5lclJlZixcbiAgICAgICAgICAgICAgQEF0dHJpYnV0ZSgnbmFtZScpIG5hbWU6c3RyaW5nKSB7XG4gICAgcGFyZW50T3V0bGV0TWFwLnJlZ2lzdGVyT3V0bGV0KG5hbWUgPyBuYW1lIDogUFJJTUFSWV9PVVRMRVQsIHRoaXMpO1xuICB9XG5cbiAgZ2V0IGlzQWN0aXZhdGVkKCk6IGJvb2xlYW4geyByZXR1cm4gISF0aGlzLmFjdGl2YXRlZDsgfVxuICBnZXQgY29tcG9uZW50KCk6IE9iamVjdCB7XG4gICAgaWYgKCF0aGlzLmFjdGl2YXRlZCkgdGhyb3cgbmV3IEVycm9yKFwiT3V0bGV0IGlzIG5vdCBhY3RpdmF0ZWRcIik7XG4gICAgcmV0dXJuIHRoaXMuYWN0aXZhdGVkLmluc3RhbmNlO1xuICB9XG5cbiAgZGVhY3RpdmF0ZSgpOiB2b2lkIHtcbiAgICBpZiAodGhpcy5hY3RpdmF0ZWQpIHtcbiAgICAgIHRoaXMuYWN0aXZhdGVkLmRlc3Ryb3koKTtcbiAgICAgIHRoaXMuYWN0aXZhdGVkID0gbnVsbDtcbiAgICB9XG4gIH1cblxuICBhY3RpdmF0ZShmYWN0b3J5OiBDb21wb25lbnRGYWN0b3J5PGFueT4sIHByb3ZpZGVyczogUmVzb2x2ZWRSZWZsZWN0aXZlUHJvdmlkZXJbXSxcbiAgICAgICAgICAgb3V0bGV0TWFwOiBSb3V0ZXJPdXRsZXRNYXApOiB2b2lkIHtcbiAgICB0aGlzLm91dGxldE1hcCA9IG91dGxldE1hcDtcbiAgICBjb25zdCBpbmogPSBSZWZsZWN0aXZlSW5qZWN0b3IuZnJvbVJlc29sdmVkUHJvdmlkZXJzKHByb3ZpZGVycywgdGhpcy5sb2NhdGlvbi5wYXJlbnRJbmplY3Rvcik7XG4gICAgdGhpcy5hY3RpdmF0ZWQgPSB0aGlzLmxvY2F0aW9uLmNyZWF0ZUNvbXBvbmVudChmYWN0b3J5LCB0aGlzLmxvY2F0aW9uLmxlbmd0aCwgaW5qLCBbXSk7XG4gIH1cbn1cbiJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/index.d.ts b/modules/@angular/router/build/es6/src/index.d.ts
deleted file mode 100644
index f0c682f846..0000000000
--- a/modules/@angular/router/build/es6/src/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export { Router, Event, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from './router';
-export { UrlSerializer, DefaultUrlSerializer } from './url_serializer';
-export { RouterState, ActivatedRoute, RouterStateSnapshot, ActivatedRouteSnapshot } from './router_state';
-export { UrlTree, UrlSegment } from './url_tree';
-export { RouterOutletMap } from './router_outlet_map';
-export { RouterConfig, Route } from './config';
-export { Params, PRIMARY_OUTLET } from './shared';
-export { provideRouter } from './router_providers';
-export { CanActivate, CanDeactivate } from './interfaces';
-import { RouterOutlet } from './directives/router_outlet';
-import { RouterLink } from './directives/router_link';
-export declare const ROUTER_DIRECTIVES: (typeof RouterOutlet | typeof RouterLink)[];
diff --git a/modules/@angular/router/build/es6/src/index.js b/modules/@angular/router/build/es6/src/index.js
deleted file mode 100644
index ffe29979a1..0000000000
--- a/modules/@angular/router/build/es6/src/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export { Router, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from './router';
-export { UrlSerializer, DefaultUrlSerializer } from './url_serializer';
-export { RouterState, ActivatedRoute, RouterStateSnapshot, ActivatedRouteSnapshot } from './router_state';
-export { UrlTree, UrlSegment } from './url_tree';
-export { RouterOutletMap } from './router_outlet_map';
-export { PRIMARY_OUTLET } from './shared';
-export { provideRouter } from './router_providers';
-import { RouterOutlet } from './directives/router_outlet';
-import { RouterLink } from './directives/router_link';
-export const ROUTER_DIRECTIVES = [RouterOutlet, RouterLink];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsU0FBUyxNQUFNLEVBQVMsZUFBZSxFQUFFLGFBQWEsRUFBRSxnQkFBZ0IsRUFBRSxlQUFlLFFBQVEsVUFBVSxDQUFDO0FBQzVHLFNBQVMsYUFBYSxFQUFFLG9CQUFvQixRQUFRLGtCQUFrQixDQUFDO0FBQ3ZFLFNBQVMsV0FBVyxFQUFFLGNBQWMsRUFBRSxtQkFBbUIsRUFBRSxzQkFBc0IsUUFBUSxnQkFBZ0IsQ0FBQztBQUMxRyxTQUFTLE9BQU8sRUFBRSxVQUFVLFFBQU8sWUFBWSxDQUFDO0FBQ2hELFNBQVMsZUFBZSxRQUFRLHFCQUFxQixDQUFDO0FBRXRELFNBQWlCLGNBQWMsUUFBUSxVQUFVLENBQUM7QUFDbEQsU0FBUyxhQUFhLFFBQVEsb0JBQW9CLENBQUM7QUFDTyxPQUVuRCxFQUFFLFlBQVksRUFBRSxNQUFNLDRCQUE0QjtPQUNsRCxFQUFFLFVBQVUsRUFBRSxNQUFNLDBCQUEwQjtBQUVyRCxPQUFPLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxZQUFZLEVBQUUsVUFBVSxDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgeyBSb3V0ZXIsIEV2ZW50LCBOYXZpZ2F0aW9uU3RhcnQsIE5hdmlnYXRpb25FbmQsIE5hdmlnYXRpb25DYW5jZWwsIE5hdmlnYXRpb25FcnJvciB9IGZyb20gJy4vcm91dGVyJztcbmV4cG9ydCB7IFVybFNlcmlhbGl6ZXIsIERlZmF1bHRVcmxTZXJpYWxpemVyIH0gZnJvbSAnLi91cmxfc2VyaWFsaXplcic7XG5leHBvcnQgeyBSb3V0ZXJTdGF0ZSwgQWN0aXZhdGVkUm91dGUsIFJvdXRlclN0YXRlU25hcHNob3QsIEFjdGl2YXRlZFJvdXRlU25hcHNob3QgfSBmcm9tICcuL3JvdXRlcl9zdGF0ZSc7XG5leHBvcnQgeyBVcmxUcmVlLCBVcmxTZWdtZW50fSBmcm9tICcuL3VybF90cmVlJztcbmV4cG9ydCB7IFJvdXRlck91dGxldE1hcCB9IGZyb20gJy4vcm91dGVyX291dGxldF9tYXAnO1xuZXhwb3J0IHsgUm91dGVyQ29uZmlnLCBSb3V0ZSB9IGZyb20gJy4vY29uZmlnJztcbmV4cG9ydCB7IFBhcmFtcywgUFJJTUFSWV9PVVRMRVQgfSBmcm9tICcuL3NoYXJlZCc7XG5leHBvcnQgeyBwcm92aWRlUm91dGVyIH0gZnJvbSAnLi9yb3V0ZXJfcHJvdmlkZXJzJztcbmV4cG9ydCB7IENhbkFjdGl2YXRlLCBDYW5EZWFjdGl2YXRlIH0gZnJvbSAnLi9pbnRlcmZhY2VzJztcblxuaW1wb3J0IHsgUm91dGVyT3V0bGV0IH0gZnJvbSAnLi9kaXJlY3RpdmVzL3JvdXRlcl9vdXRsZXQnO1xuaW1wb3J0IHsgUm91dGVyTGluayB9IGZyb20gJy4vZGlyZWN0aXZlcy9yb3V0ZXJfbGluayc7XG5cbmV4cG9ydCBjb25zdCBST1VURVJfRElSRUNUSVZFUyA9IFtSb3V0ZXJPdXRsZXQsIFJvdXRlckxpbmtdOyJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/interfaces.d.ts b/modules/@angular/router/build/es6/src/interfaces.d.ts
deleted file mode 100644
index ded9c1ede9..0000000000
--- a/modules/@angular/router/build/es6/src/interfaces.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Observable } from 'rxjs/Observable';
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from './router_state';
-export interface CanActivate {
-    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean;
-}
-export interface CanDeactivate<T> {
-    canDeactivate(component: T, route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean;
-}
diff --git a/modules/@angular/router/build/es6/src/interfaces.js b/modules/@angular/router/build/es6/src/interfaces.js
deleted file mode 100644
index 39aff3b19f..0000000000
--- a/modules/@angular/router/build/es6/src/interfaces.js
+++ /dev/null
@@ -1 +0,0 @@
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge09ic2VydmFibGV9IGZyb20gJ3J4anMvT2JzZXJ2YWJsZSc7XG5pbXBvcnQge0FjdGl2YXRlZFJvdXRlU25hcHNob3QsIFJvdXRlclN0YXRlU25hcHNob3R9IGZyb20gJy4vcm91dGVyX3N0YXRlJztcblxuLyoqXG4gKiBBbiBpbnRlcmZhY2UgYSBjbGFzcyBjYW4gaW1wbGVtZW50IHRvIGJlIGEgZ3VhcmQgZGVjaWRpbmcgaWYgYSByb3V0ZSBjYW4gYmUgYWN0aXZhdGVkLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIENhbkFjdGl2YXRlIHtcbiAgY2FuQWN0aXZhdGUocm91dGU6QWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgc3RhdGU6Um91dGVyU3RhdGVTbmFwc2hvdCk6T2JzZXJ2YWJsZTxib29sZWFuPiB8IGJvb2xlYW47XG59XG5cbi8qKlxuICogQW4gaW50ZXJmYWNlIGEgY2xhc3MgY2FuIGltcGxlbWVudCB0byBiZSBhIGd1YXJkIGRlY2lkaW5nIGlmIGEgcm91dGUgY2FuIGJlIGRlYWN0aXZhdGVkLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIENhbkRlYWN0aXZhdGU8VD4ge1xuICBjYW5EZWFjdGl2YXRlKGNvbXBvbmVudDpULCByb3V0ZTpBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBzdGF0ZTpSb3V0ZXJTdGF0ZVNuYXBzaG90KTpPYnNlcnZhYmxlPGJvb2xlYW4+IHwgYm9vbGVhbjtcbn0iXX0=
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/recognize.d.ts b/modules/@angular/router/build/es6/src/recognize.d.ts
deleted file mode 100644
index fbfa415c1f..0000000000
--- a/modules/@angular/router/build/es6/src/recognize.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { UrlTree } from './url_tree';
-import { RouterStateSnapshot } from './router_state';
-import { RouterConfig } from './config';
-import { Type } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-export declare function recognize(rootComponentType: Type, config: RouterConfig, url: UrlTree): Observable<RouterStateSnapshot>;
diff --git a/modules/@angular/router/build/es6/src/recognize.js b/modules/@angular/router/build/es6/src/recognize.js
deleted file mode 100644
index 88bd4fee6a..0000000000
--- a/modules/@angular/router/build/es6/src/recognize.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import { flatten, first, merge } from './utils/collection';
-import { TreeNode } from './utils/tree';
-import { RouterStateSnapshot, ActivatedRouteSnapshot } from './router_state';
-import { PRIMARY_OUTLET } from './shared';
-import { Observable } from 'rxjs/Observable';
-export function recognize(rootComponentType, config, url) {
-    try {
-        const match = new MatchResult(rootComponentType, config, [url.root], {}, url._root.children, [], PRIMARY_OUTLET, null, url.root);
-        const roots = constructActivatedRoute(match);
-        const res = new RouterStateSnapshot(roots[0], url.queryParameters, url.fragment);
-        return new Observable(obs => {
-            obs.next(res);
-            obs.complete();
-        });
-    }
-    catch (e) {
-        return new Observable(obs => obs.error(e));
-    }
-}
-function constructActivatedRoute(match) {
-    const activatedRoute = createActivatedRouteSnapshot(match);
-    const children = match.leftOverUrl.length > 0 ?
-        recognizeMany(match.children, match.leftOverUrl) : recognizeLeftOvers(match.children, match.lastUrlSegment);
-    checkOutletNameUniqueness(children);
-    children.sort((a, b) => {
-        if (a.value.outlet === PRIMARY_OUTLET)
-            return -1;
-        if (b.value.outlet === PRIMARY_OUTLET)
-            return 1;
-        return a.value.outlet.localeCompare(b.value.outlet);
-    });
-    return [new TreeNode(activatedRoute, children)];
-}
-function recognizeLeftOvers(config, lastUrlSegment) {
-    if (!config)
-        return [];
-    const mIndex = matchIndex(config, [], lastUrlSegment);
-    return mIndex ? constructActivatedRoute(mIndex) : [];
-}
-function recognizeMany(config, urls) {
-    return flatten(urls.map(url => recognizeOne(config, url)));
-}
-function createActivatedRouteSnapshot(match) {
-    return new ActivatedRouteSnapshot(match.consumedUrlSegments, match.parameters, match.outlet, match.component, match.route, match.lastUrlSegment);
-}
-function recognizeOne(config, url) {
-    const m = match(config, url);
-    const primary = constructActivatedRoute(m);
-    const secondary = recognizeMany(config, m.secondary);
-    const res = primary.concat(secondary);
-    checkOutletNameUniqueness(res);
-    return res;
-}
-function checkOutletNameUniqueness(nodes) {
-    let names = {};
-    nodes.forEach(n => {
-        let routeWithSameOutletName = names[n.value.outlet];
-        if (routeWithSameOutletName) {
-            const p = routeWithSameOutletName.urlSegments.map(s => s.toString()).join("/");
-            const c = n.value.urlSegments.map(s => s.toString()).join("/");
-            throw new Error(`Two segments cannot have the same outlet name: '${p}' and '${c}'.`);
-        }
-        names[n.value.outlet] = n.value;
-    });
-    return nodes;
-}
-function match(config, url) {
-    const m = matchNonIndex(config, url);
-    if (m)
-        return m;
-    const mIndex = matchIndex(config, [url], url.value);
-    if (mIndex)
-        return mIndex;
-    const availableRoutes = config.map(r => {
-        const outlet = !r.outlet ? '' : `${r.outlet}:`;
-        return `'${outlet}${r.path}'`;
-    }).join(", ");
-    throw new Error(`Cannot match any routes. Current segment: '${url.value}'. Available routes: [${availableRoutes}].`);
-}
-function matchNonIndex(config, url) {
-    for (let r of config) {
-        let m = matchWithParts(r, url);
-        if (m)
-            return m;
-    }
-    return null;
-}
-function matchIndex(config, leftOverUrls, lastUrlSegment) {
-    for (let r of config) {
-        if (r.index) {
-            const outlet = r.outlet ? r.outlet : PRIMARY_OUTLET;
-            const children = r.children ? r.children : [];
-            return new MatchResult(r.component, children, [], lastUrlSegment.parameters, leftOverUrls, [], outlet, r, lastUrlSegment);
-        }
-    }
-    return null;
-}
-function matchWithParts(route, url) {
-    if (!route.path)
-        return null;
-    if ((route.outlet ? route.outlet : PRIMARY_OUTLET) !== url.value.outlet)
-        return null;
-    const path = route.path.startsWith("/") ? route.path.substring(1) : route.path;
-    if (path === "**") {
-        const consumedUrl = [];
-        let u = url;
-        while (u) {
-            consumedUrl.push(u.value);
-            u = first(u.children);
-        }
-        const last = consumedUrl[consumedUrl.length - 1];
-        return new MatchResult(route.component, [], consumedUrl, last.parameters, [], [], PRIMARY_OUTLET, route, last);
-    }
-    const parts = path.split("/");
-    const positionalParams = {};
-    const consumedUrlSegments = [];
-    let lastParent = null;
-    let lastSegment = null;
-    let current = url;
-    for (let i = 0; i < parts.length; ++i) {
-        if (!current)
-            return null;
-        const p = parts[i];
-        const isLastSegment = i === parts.length - 1;
-        const isLastParent = i === parts.length - 2;
-        const isPosParam = p.startsWith(":");
-        if (!isPosParam && p != current.value.path)
-            return null;
-        if (isLastSegment) {
-            lastSegment = current;
-        }
-        if (isLastParent) {
-            lastParent = current;
-        }
-        if (isPosParam) {
-            positionalParams[p.substring(1)] = current.value.path;
-        }
-        consumedUrlSegments.push(current.value);
-        current = first(current.children);
-    }
-    if (!lastSegment)
-        throw "Cannot be reached";
-    const p = lastSegment.value.parameters;
-    const parameters = merge(p, positionalParams);
-    const secondarySubtrees = lastParent ? lastParent.children.slice(1) : [];
-    const children = route.children ? route.children : [];
-    const outlet = route.outlet ? route.outlet : PRIMARY_OUTLET;
-    return new MatchResult(route.component, children, consumedUrlSegments, parameters, lastSegment.children, secondarySubtrees, outlet, route, lastSegment.value);
-}
-class MatchResult {
-    constructor(component, children, consumedUrlSegments, parameters, leftOverUrl, secondary, outlet, route, lastUrlSegment) {
-        this.component = component;
-        this.children = children;
-        this.consumedUrlSegments = consumedUrlSegments;
-        this.parameters = parameters;
-        this.leftOverUrl = leftOverUrl;
-        this.secondary = secondary;
-        this.outlet = outlet;
-        this.route = route;
-        this.lastUrlSegment = lastUrlSegment;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"recognize.js","sourceRoot":"","sources":["../../../src/recognize.ts"],"names":[],"mappings":"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","sourcesContent":["import { UrlTree, UrlSegment } from './url_tree';\nimport { flatten, first, merge } from './utils/collection';\nimport { TreeNode } from './utils/tree';\nimport { RouterStateSnapshot, ActivatedRouteSnapshot } from './router_state';\nimport { Params, PRIMARY_OUTLET } from './shared';\nimport { RouterConfig, Route } from './config';\nimport { Type } from '@angular/core';\nimport { Observable } from 'rxjs/Observable';\n\nexport function recognize(rootComponentType: Type, config: RouterConfig, url: UrlTree): Observable<RouterStateSnapshot> {\n  try {\n    const match = new MatchResult(rootComponentType, config, [url.root], {}, url._root.children, [], PRIMARY_OUTLET, null, url.root);\n    const roots = constructActivatedRoute(match);\n    const res = new RouterStateSnapshot(roots[0], url.queryParameters, url.fragment);\n    return new Observable<RouterStateSnapshot>(obs => {\n      obs.next(res);\n      obs.complete();\n    });\n  } catch(e) {\n    return new Observable<RouterStateSnapshot>(obs => obs.error(e));\n  }\n}\n\nfunction constructActivatedRoute(match: MatchResult): TreeNode<ActivatedRouteSnapshot>[] {\n  const activatedRoute = createActivatedRouteSnapshot(match);\n  const children = match.leftOverUrl.length > 0 ?\n    recognizeMany(match.children, match.leftOverUrl) : recognizeLeftOvers(match.children, match.lastUrlSegment);\n  checkOutletNameUniqueness(children);\n  children.sort((a, b) => {\n    if (a.value.outlet === PRIMARY_OUTLET) return -1;\n    if (b.value.outlet === PRIMARY_OUTLET) return 1;\n    return a.value.outlet.localeCompare(b.value.outlet)\n  });\n  return [new TreeNode<ActivatedRouteSnapshot>(activatedRoute, children)];\n}\n\nfunction recognizeLeftOvers(config: Route[], lastUrlSegment: UrlSegment): TreeNode<ActivatedRouteSnapshot>[] {\n  if (!config) return [];\n  const mIndex = matchIndex(config, [], lastUrlSegment);\n  return mIndex ? constructActivatedRoute(mIndex) : [];\n}\n\nfunction recognizeMany(config: Route[], urls: TreeNode<UrlSegment>[]): TreeNode<ActivatedRouteSnapshot>[] {\n  return flatten(urls.map(url => recognizeOne(config, url)));\n}\n\nfunction createActivatedRouteSnapshot(match: MatchResult): ActivatedRouteSnapshot {\n  return new ActivatedRouteSnapshot(match.consumedUrlSegments, match.parameters, match.outlet, match.component, match.route, match.lastUrlSegment);\n}\n\nfunction recognizeOne(config: Route[], url: TreeNode<UrlSegment>): TreeNode<ActivatedRouteSnapshot>[] {\n  const m = match(config, url);\n  const primary = constructActivatedRoute(m);\n  const secondary = recognizeMany(config, m.secondary);\n  const res = primary.concat(secondary);\n  checkOutletNameUniqueness(res);\n  return res;\n}\n\nfunction checkOutletNameUniqueness(nodes: TreeNode<ActivatedRouteSnapshot>[]): TreeNode<ActivatedRouteSnapshot>[] {\n  let names = {};\n  nodes.forEach(n => {\n    let routeWithSameOutletName = names[n.value.outlet];\n    if (routeWithSameOutletName) {\n      const p = routeWithSameOutletName.urlSegments.map(s => s.toString()).join(\"/\");\n      const c = n.value.urlSegments.map(s => s.toString()).join(\"/\");\n      throw new Error(`Two segments cannot have the same outlet name: '${p}' and '${c}'.`);\n    }\n    names[n.value.outlet] = n.value;\n  });\n  return nodes;\n}\n\nfunction match(config: Route[], url: TreeNode<UrlSegment>): MatchResult {\n  const m = matchNonIndex(config, url);\n  if (m) return m;\n\n  const mIndex = matchIndex(config, [url], url.value);\n  if (mIndex) return mIndex;\n\n  const availableRoutes = config.map(r => {\n    const outlet = !r.outlet ? '' : `${r.outlet}:`;\n    return `'${outlet}${r.path}'`;\n  }).join(\", \");\n  throw new Error(\n    `Cannot match any routes. Current segment: '${url.value}'. Available routes: [${availableRoutes}].`);\n}\n\nfunction matchNonIndex(config: Route[], url: TreeNode<UrlSegment>): MatchResult | null {\n  for (let r of config) {\n    let m = matchWithParts(r, url);\n    if (m) return m;\n  }\n  return null;\n}\n\nfunction matchIndex(config: Route[], leftOverUrls: TreeNode<UrlSegment>[], lastUrlSegment: UrlSegment): MatchResult | null {\n  for (let r of config) {\n    if (r.index) {\n      const outlet = r.outlet ? r.outlet : PRIMARY_OUTLET;\n      const children = r.children ? r.children : [];\n      return new MatchResult(r.component, children, [], lastUrlSegment.parameters, leftOverUrls, [], outlet, r, lastUrlSegment);\n    }\n  }\n  return null;\n}\n\nfunction matchWithParts(route: Route, url: TreeNode<UrlSegment>): MatchResult | null {\n  if (!route.path) return null;\n  if ((route.outlet ? route.outlet : PRIMARY_OUTLET) !== url.value.outlet) return null;\n\n  const path = route.path.startsWith(\"/\") ? route.path.substring(1) : route.path;\n  if (path === \"**\") {\n    const consumedUrl = [];\n    let u:TreeNode<UrlSegment>|null = url;\n    while (u) {\n      consumedUrl.push(u.value);\n      u = first(u.children);\n    }\n    const last = consumedUrl[consumedUrl.length - 1];\n    return new MatchResult(route.component, [], consumedUrl, last.parameters, [], [], PRIMARY_OUTLET, route, last);\n  }\n\n  const parts = path.split(\"/\");\n  const positionalParams = {};\n  const consumedUrlSegments = [];\n\n  let lastParent: TreeNode<UrlSegment>|null = null;\n  let lastSegment: TreeNode<UrlSegment>|null = null;\n\n  let current: TreeNode<UrlSegment>|null = url;\n  for (let i = 0; i < parts.length; ++i) {\n    if (!current) return null;\n\n    const p = parts[i];\n    const isLastSegment = i === parts.length - 1;\n    const isLastParent = i === parts.length - 2;\n    const isPosParam = p.startsWith(\":\");\n\n    if (!isPosParam && p != current.value.path) return null;\n    if (isLastSegment) {\n      lastSegment = current;\n    }\n    if (isLastParent) {\n      lastParent = current;\n    }\n\n    if (isPosParam) {\n      positionalParams[p.substring(1)] = current.value.path;\n    }\n\n    consumedUrlSegments.push(current.value);\n\n    current = first(current.children);\n  }\n\n  if (!lastSegment) throw \"Cannot be reached\";\n\n  const p = lastSegment.value.parameters;\n  const parameters = <{[key: string]: string}>merge(p, positionalParams);\n  const secondarySubtrees = lastParent ? lastParent.children.slice(1) : [];\n  const children = route.children ? route.children : [];\n  const outlet = route.outlet ? route.outlet : PRIMARY_OUTLET;\n\n  return new MatchResult(route.component, children, consumedUrlSegments, parameters, lastSegment.children,\n    secondarySubtrees, outlet, route, lastSegment.value);\n}\n\nclass MatchResult {\n  constructor(public component: Type | string,\n              public children: Route[],\n              public consumedUrlSegments: UrlSegment[],\n              public parameters: {[key: string]: string},\n              public leftOverUrl: TreeNode<UrlSegment>[],\n              public secondary: TreeNode<UrlSegment>[],\n              public outlet: string,\n              public route: Route | null,\n              public lastUrlSegment: UrlSegment\n  ) {}\n}"]}
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/resolve.d.ts b/modules/@angular/router/build/es6/src/resolve.d.ts
deleted file mode 100644
index edd764fbc7..0000000000
--- a/modules/@angular/router/build/es6/src/resolve.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { RouterStateSnapshot } from './router_state';
-import { ComponentResolver } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/toPromise';
-export declare function resolve(resolver: ComponentResolver, state: RouterStateSnapshot): Observable<RouterStateSnapshot>;
diff --git a/modules/@angular/router/build/es6/src/resolve.js b/modules/@angular/router/build/es6/src/resolve.js
deleted file mode 100644
index d66341025d..0000000000
--- a/modules/@angular/router/build/es6/src/resolve.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'rxjs/add/operator/map';
-import { forkJoin } from 'rxjs/observable/forkJoin';
-import { fromPromise } from 'rxjs/observable/fromPromise';
-import 'rxjs/add/operator/toPromise';
-export function resolve(resolver, state) {
-    return resolveNode(resolver, state._root).map(_ => state);
-}
-function resolveNode(resolver, node) {
-    if (node.children.length === 0) {
-        return fromPromise(resolver.resolveComponent(node.value.component).then(factory => {
-            node.value._resolvedComponentFactory = factory;
-            return node.value;
-        }));
-    }
-    else {
-        const c = node.children.map(c => resolveNode(resolver, c).toPromise());
-        return forkJoin(c).map(_ => resolver.resolveComponent(node.value.component).then(factory => {
-            node.value._resolvedComponentFactory = factory;
-            return node.value;
-        }));
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9yZXNvbHZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJPQUlPLHVCQUF1QjtPQUN2QixFQUFDLFFBQVEsRUFBQyxNQUFNLDBCQUEwQjtPQUMxQyxFQUFDLFdBQVcsRUFBQyxNQUFNLDZCQUE2QjtPQUNoRCw2QkFBNkI7QUFFcEMsd0JBQXdCLFFBQTJCLEVBQUUsS0FBMEI7SUFDN0UsTUFBTSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDLENBQUM7QUFDNUQsQ0FBQztBQUVELHFCQUFxQixRQUEyQixFQUFFLElBQXNDO0lBQ3RGLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDL0IsTUFBTSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLENBQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTztZQUNsRixJQUFJLENBQUMsS0FBSyxDQUFDLHlCQUF5QixHQUFHLE9BQU8sQ0FBQztZQUMvQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztRQUNwQixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRU4sQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLFdBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQztRQUN2RSxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksUUFBUSxDQUFDLGdCQUFnQixDQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU87WUFDM0YsSUFBSSxDQUFDLEtBQUssQ0FBQyx5QkFBeUIsR0FBRyxPQUFPLENBQUM7WUFDL0MsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUM7UUFDcEIsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNOLENBQUM7QUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUm91dGVyU3RhdGVTbmFwc2hvdCwgQWN0aXZhdGVkUm91dGVTbmFwc2hvdCB9IGZyb20gJy4vcm91dGVyX3N0YXRlJztcbmltcG9ydCB7IFRyZWVOb2RlIH0gZnJvbSAnLi91dGlscy90cmVlJztcbmltcG9ydCB7IENvbXBvbmVudFJlc29sdmVyIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcy9PYnNlcnZhYmxlJztcbmltcG9ydCAncnhqcy9hZGQvb3BlcmF0b3IvbWFwJztcbmltcG9ydCB7Zm9ya0pvaW59IGZyb20gJ3J4anMvb2JzZXJ2YWJsZS9mb3JrSm9pbic7XG5pbXBvcnQge2Zyb21Qcm9taXNlfSBmcm9tICdyeGpzL29ic2VydmFibGUvZnJvbVByb21pc2UnO1xuaW1wb3J0ICdyeGpzL2FkZC9vcGVyYXRvci90b1Byb21pc2UnO1xuXG5leHBvcnQgZnVuY3Rpb24gcmVzb2x2ZShyZXNvbHZlcjogQ29tcG9uZW50UmVzb2x2ZXIsIHN0YXRlOiBSb3V0ZXJTdGF0ZVNuYXBzaG90KTogT2JzZXJ2YWJsZTxSb3V0ZXJTdGF0ZVNuYXBzaG90PiB7XG4gIHJldHVybiByZXNvbHZlTm9kZShyZXNvbHZlciwgc3RhdGUuX3Jvb3QpLm1hcChfID0+IHN0YXRlKTtcbn1cblxuZnVuY3Rpb24gcmVzb2x2ZU5vZGUocmVzb2x2ZXI6IENvbXBvbmVudFJlc29sdmVyLCBub2RlOiBUcmVlTm9kZTxBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90Pik6IE9ic2VydmFibGU8YW55PiB7XG4gIGlmIChub2RlLmNoaWxkcmVuLmxlbmd0aCA9PT0gMCkge1xuICAgIHJldHVybiBmcm9tUHJvbWlzZShyZXNvbHZlci5yZXNvbHZlQ29tcG9uZW50KDxhbnk+bm9kZS52YWx1ZS5jb21wb25lbnQpLnRoZW4oZmFjdG9yeSA9PiB7XG4gICAgICBub2RlLnZhbHVlLl9yZXNvbHZlZENvbXBvbmVudEZhY3RvcnkgPSBmYWN0b3J5O1xuICAgICAgcmV0dXJuIG5vZGUudmFsdWU7XG4gICAgfSkpO1xuICAgIFxuICB9IGVsc2Uge1xuICAgIGNvbnN0IGMgPSBub2RlLmNoaWxkcmVuLm1hcChjID0+IHJlc29sdmVOb2RlKHJlc29sdmVyLCBjKS50b1Byb21pc2UoKSk7XG4gICAgcmV0dXJuIGZvcmtKb2luKGMpLm1hcChfID0+IHJlc29sdmVyLnJlc29sdmVDb21wb25lbnQoPGFueT5ub2RlLnZhbHVlLmNvbXBvbmVudCkudGhlbihmYWN0b3J5ID0+IHtcbiAgICAgIG5vZGUudmFsdWUuX3Jlc29sdmVkQ29tcG9uZW50RmFjdG9yeSA9IGZhY3Rvcnk7XG4gICAgICByZXR1cm4gbm9kZS52YWx1ZTtcbiAgICB9KSk7XG4gIH1cbn0iXX0=
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/router.d.ts b/modules/@angular/router/build/es6/src/router.d.ts
deleted file mode 100644
index 79f6a5a224..0000000000
--- a/modules/@angular/router/build/es6/src/router.d.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { ComponentResolver, Type, Injector } from '@angular/core';
-import { Location } from '@angular/common';
-import { UrlSerializer } from './url_serializer';
-import { RouterOutletMap } from './router_outlet_map';
-import { UrlTree } from './url_tree';
-import { Params } from './shared';
-import { RouterState, ActivatedRoute } from './router_state';
-import { RouterConfig } from './config';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/scan';
-import 'rxjs/add/operator/mergeMap';
-import 'rxjs/add/operator/concat';
-import 'rxjs/add/operator/concatMap';
-export interface NavigationExtras {
-    relativeTo?: ActivatedRoute;
-    queryParameters?: Params;
-    fragment?: string;
-}
-export declare class NavigationStart {
-    id: number;
-    url: UrlTree;
-    constructor(id: number, url: UrlTree);
-}
-export declare class NavigationEnd {
-    id: number;
-    url: UrlTree;
-    constructor(id: number, url: UrlTree);
-}
-export declare class NavigationCancel {
-    id: number;
-    url: UrlTree;
-    constructor(id: number, url: UrlTree);
-}
-export declare class NavigationError {
-    id: number;
-    url: UrlTree;
-    error: any;
-    constructor(id: number, url: UrlTree, error: any);
-}
-export declare type Event = NavigationStart | NavigationEnd | NavigationCancel | NavigationError;
-export declare class Router {
-    private rootComponentType;
-    private resolver;
-    private urlSerializer;
-    private outletMap;
-    private location;
-    private injector;
-    private currentUrlTree;
-    private currentRouterState;
-    private config;
-    private locationSubscription;
-    private routerEvents;
-    private navigationId;
-    constructor(rootComponentType: Type, resolver: ComponentResolver, urlSerializer: UrlSerializer, outletMap: RouterOutletMap, location: Location, injector: Injector);
-    readonly routerState: RouterState;
-    readonly urlTree: UrlTree;
-    readonly events: Observable<Event>;
-    navigateByUrl(url: string): Promise<boolean>;
-    resetConfig(config: RouterConfig): void;
-    dispose(): void;
-    createUrlTree(commands: any[], {relativeTo, queryParameters, fragment}?: NavigationExtras): UrlTree;
-    navigate(commands: any[], extras?: NavigationExtras): Promise<boolean>;
-    serializeUrl(url: UrlTree): string;
-    parseUrl(url: string): UrlTree;
-    private scheduleNavigation(url, pop);
-    private setUpLocationChangeListener();
-    private runNavigate(url, pop, id);
-}
diff --git a/modules/@angular/router/build/es6/src/router.js b/modules/@angular/router/build/es6/src/router.js
deleted file mode 100644
index 907945ab99..0000000000
--- a/modules/@angular/router/build/es6/src/router.js
+++ /dev/null
@@ -1,303 +0,0 @@
-import { ReflectiveInjector } from '@angular/core';
-import { RouterOutletMap } from './router_outlet_map';
-import { recognize } from './recognize';
-import { resolve } from './resolve';
-import { createRouterState } from './create_router_state';
-import { createEmptyUrlTree } from './url_tree';
-import { PRIMARY_OUTLET } from './shared';
-import { createEmptyState, ActivatedRoute, advanceActivatedRoute } from './router_state';
-import { createUrlTree } from './create_url_tree';
-import { forEach, and, shallowEqual } from './utils/collection';
-import { Subject } from 'rxjs/Subject';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/scan';
-import 'rxjs/add/operator/mergeMap';
-import 'rxjs/add/operator/concat';
-import 'rxjs/add/operator/concatMap';
-import { of } from 'rxjs/observable/of';
-import { forkJoin } from 'rxjs/observable/forkJoin';
-export class NavigationStart {
-    constructor(id, url) {
-        this.id = id;
-        this.url = url;
-    }
-}
-export class NavigationEnd {
-    constructor(id, url) {
-        this.id = id;
-        this.url = url;
-    }
-}
-export class NavigationCancel {
-    constructor(id, url) {
-        this.id = id;
-        this.url = url;
-    }
-}
-export class NavigationError {
-    constructor(id, url, error) {
-        this.id = id;
-        this.url = url;
-        this.error = error;
-    }
-}
-export class Router {
-    constructor(rootComponentType, resolver, urlSerializer, outletMap, location, injector) {
-        this.rootComponentType = rootComponentType;
-        this.resolver = resolver;
-        this.urlSerializer = urlSerializer;
-        this.outletMap = outletMap;
-        this.location = location;
-        this.injector = injector;
-        this.navigationId = 0;
-        this.routerEvents = new Subject();
-        this.currentUrlTree = createEmptyUrlTree();
-        this.currentRouterState = createEmptyState(rootComponentType);
-        this.setUpLocationChangeListener();
-        this.navigateByUrl(this.location.path());
-    }
-    get routerState() {
-        return this.currentRouterState;
-    }
-    get urlTree() {
-        return this.currentUrlTree;
-    }
-    get events() {
-        return this.routerEvents;
-    }
-    navigateByUrl(url) {
-        const urlTree = this.urlSerializer.parse(url);
-        return this.scheduleNavigation(urlTree, false);
-    }
-    resetConfig(config) {
-        this.config = config;
-    }
-    dispose() { this.locationSubscription.unsubscribe(); }
-    createUrlTree(commands, { relativeTo, queryParameters, fragment } = {}) {
-        const a = relativeTo ? relativeTo : this.routerState.root;
-        return createUrlTree(a, this.currentUrlTree, commands, queryParameters, fragment);
-    }
-    navigate(commands, extras = {}) {
-        return this.scheduleNavigation(this.createUrlTree(commands, extras), false);
-    }
-    serializeUrl(url) { return this.urlSerializer.serialize(url); }
-    parseUrl(url) { return this.urlSerializer.parse(url); }
-    scheduleNavigation(url, pop) {
-        const id = ++this.navigationId;
-        this.routerEvents.next(new NavigationStart(id, url));
-        return Promise.resolve().then((_) => this.runNavigate(url, false, id));
-    }
-    setUpLocationChangeListener() {
-        this.locationSubscription = this.location.subscribe((change) => {
-            return this.scheduleNavigation(this.urlSerializer.parse(change['url']), change['pop']);
-        });
-    }
-    runNavigate(url, pop, id) {
-        if (id !== this.navigationId) {
-            this.routerEvents.next(new NavigationCancel(id, url));
-            return Promise.resolve(false);
-        }
-        return new Promise((resolvePromise, rejectPromise) => {
-            let state;
-            recognize(this.rootComponentType, this.config, url).mergeMap((newRouterStateSnapshot) => {
-                return resolve(this.resolver, newRouterStateSnapshot);
-            }).map((routerStateSnapshot) => {
-                return createRouterState(routerStateSnapshot, this.currentRouterState);
-            }).map((newState) => {
-                state = newState;
-            }).mergeMap(_ => {
-                return new GuardChecks(state.snapshot, this.currentRouterState.snapshot, this.injector).check(this.outletMap);
-            }).forEach((shouldActivate) => {
-                if (!shouldActivate || id !== this.navigationId) {
-                    this.routerEvents.next(new NavigationCancel(id, url));
-                    return Promise.resolve(false);
-                }
-                new ActivateRoutes(state, this.currentRouterState).activate(this.outletMap);
-                this.currentUrlTree = url;
-                this.currentRouterState = state;
-                if (!pop) {
-                    this.location.go(this.urlSerializer.serialize(url));
-                }
-            }).then(() => {
-                this.routerEvents.next(new NavigationEnd(id, url));
-                resolvePromise(true);
-            }, e => {
-                this.routerEvents.next(new NavigationError(id, url, e));
-                rejectPromise(e);
-            });
-        });
-    }
-}
-class CanActivate {
-    constructor(route) {
-        this.route = route;
-    }
-}
-class CanDeactivate {
-    constructor(component, route) {
-        this.component = component;
-        this.route = route;
-    }
-}
-class GuardChecks {
-    constructor(future, curr, injector) {
-        this.future = future;
-        this.curr = curr;
-        this.injector = injector;
-        this.checks = [];
-    }
-    check(parentOutletMap) {
-        const futureRoot = this.future._root;
-        const currRoot = this.curr ? this.curr._root : null;
-        this.traverseChildRoutes(futureRoot, currRoot, parentOutletMap);
-        if (this.checks.length === 0)
-            return of(true);
-        return forkJoin(this.checks.map(s => {
-            if (s instanceof CanActivate) {
-                return this.runCanActivate(s.route);
-            }
-            else if (s instanceof CanDeactivate) {
-                return this.runCanDeactivate(s.component, s.route);
-            }
-            else {
-                throw new Error("Cannot be reached");
-            }
-        })).map(and);
-    }
-    traverseChildRoutes(futureNode, currNode, outletMap) {
-        const prevChildren = nodeChildrenAsMap(currNode);
-        futureNode.children.forEach(c => {
-            this.traverseRoutes(c, prevChildren[c.value.outlet], outletMap);
-            delete prevChildren[c.value.outlet];
-        });
-        forEach(prevChildren, (v, k) => this.deactivateOutletAndItChildren(v, outletMap._outlets[k]));
-    }
-    traverseRoutes(futureNode, currNode, parentOutletMap) {
-        const future = futureNode.value;
-        const curr = currNode ? currNode.value : null;
-        const outlet = parentOutletMap ? parentOutletMap._outlets[futureNode.value.outlet] : null;
-        if (curr && future._routeConfig === curr._routeConfig) {
-            if (!shallowEqual(future.params, curr.params)) {
-                this.checks.push(new CanDeactivate(outlet.component, curr), new CanActivate(future));
-            }
-            this.traverseChildRoutes(futureNode, currNode, outlet ? outlet.outletMap : null);
-        }
-        else {
-            this.deactivateOutletAndItChildren(curr, outlet);
-            this.checks.push(new CanActivate(future));
-            this.traverseChildRoutes(futureNode, null, outlet ? outlet.outletMap : null);
-        }
-    }
-    deactivateOutletAndItChildren(route, outlet) {
-        if (outlet && outlet.isActivated) {
-            forEach(outlet.outletMap._outlets, (v, k) => this.deactivateOutletAndItChildren(v, outlet.outletMap._outlets[k]));
-            this.checks.push(new CanDeactivate(outlet.component, route));
-        }
-    }
-    runCanActivate(future) {
-        const canActivate = future._routeConfig ? future._routeConfig.canActivate : null;
-        if (!canActivate || canActivate.length === 0)
-            return of(true);
-        return forkJoin(canActivate.map(c => {
-            const guard = this.injector.get(c);
-            if (guard.canActivate) {
-                return of(guard.canActivate(future, this.future));
-            }
-            else {
-                return of(guard(future, this.future));
-            }
-        })).map(and);
-    }
-    runCanDeactivate(component, curr) {
-        const canDeactivate = curr._routeConfig ? curr._routeConfig.canDeactivate : null;
-        if (!canDeactivate || canDeactivate.length === 0)
-            return of(true);
-        return forkJoin(canDeactivate.map(c => {
-            const guard = this.injector.get(c);
-            if (guard.canDeactivate) {
-                return of(guard.canDeactivate(component, curr, this.curr));
-            }
-            else {
-                return of(guard(component, curr, this.curr));
-            }
-        })).map(and);
-    }
-}
-class ActivateRoutes {
-    constructor(futureState, currState) {
-        this.futureState = futureState;
-        this.currState = currState;
-    }
-    activate(parentOutletMap) {
-        const futureRoot = this.futureState._root;
-        const currRoot = this.currState ? this.currState._root : null;
-        pushQueryParamsAndFragment(this.futureState);
-        this.activateChildRoutes(futureRoot, currRoot, parentOutletMap);
-    }
-    activateChildRoutes(futureNode, currNode, outletMap) {
-        const prevChildren = nodeChildrenAsMap(currNode);
-        futureNode.children.forEach(c => {
-            this.activateRoutes(c, prevChildren[c.value.outlet], outletMap);
-            delete prevChildren[c.value.outlet];
-        });
-        forEach(prevChildren, (v, k) => this.deactivateOutletAndItChildren(outletMap._outlets[k]));
-    }
-    activateRoutes(futureNode, currNode, parentOutletMap) {
-        const future = futureNode.value;
-        const curr = currNode ? currNode.value : null;
-        const outlet = getOutlet(parentOutletMap, futureNode.value);
-        if (future === curr) {
-            advanceActivatedRoute(future);
-            this.activateChildRoutes(futureNode, currNode, outlet.outletMap);
-        }
-        else {
-            this.deactivateOutletAndItChildren(outlet);
-            const outletMap = new RouterOutletMap();
-            this.activateNewRoutes(outletMap, future, outlet);
-            this.activateChildRoutes(futureNode, null, outletMap);
-        }
-    }
-    activateNewRoutes(outletMap, future, outlet) {
-        const resolved = ReflectiveInjector.resolve([
-            { provide: ActivatedRoute, useValue: future },
-            { provide: RouterOutletMap, useValue: outletMap }
-        ]);
-        outlet.activate(future._futureSnapshot._resolvedComponentFactory, resolved, outletMap);
-        advanceActivatedRoute(future);
-    }
-    deactivateOutletAndItChildren(outlet) {
-        if (outlet && outlet.isActivated) {
-            forEach(outlet.outletMap._outlets, (v, k) => this.deactivateOutletAndItChildren(v));
-            outlet.deactivate();
-        }
-    }
-}
-function pushQueryParamsAndFragment(state) {
-    if (!shallowEqual(state.snapshot.queryParams, state.queryParams.value)) {
-        state.queryParams.next(state.snapshot.queryParams);
-    }
-    if (state.snapshot.fragment !== state.fragment.value) {
-        state.fragment.next(state.snapshot.fragment);
-    }
-}
-function nodeChildrenAsMap(node) {
-    return node ?
-        node.children.reduce((m, c) => {
-            m[c.value.outlet] = c;
-            return m;
-        }, {}) :
-        {};
-}
-function getOutlet(outletMap, route) {
-    let outlet = outletMap._outlets[route.outlet];
-    if (!outlet) {
-        if (route.outlet === PRIMARY_OUTLET) {
-            throw new Error(`Cannot find primary outlet`);
-        }
-        else {
-            throw new Error(`Cannot find the outlet ${route.outlet}`);
-        }
-    }
-    return outlet;
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/router.ts"],"names":[],"mappings":"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","sourcesContent":["import { ComponentResolver, ReflectiveInjector, Type, Injector } from '@angular/core';\nimport { Location } from '@angular/common';\nimport { UrlSerializer } from './url_serializer';\nimport { RouterOutletMap } from './router_outlet_map';\nimport { recognize } from './recognize';\nimport { resolve } from './resolve';\nimport { createRouterState } from './create_router_state';\nimport { TreeNode } from './utils/tree';\nimport { UrlTree, createEmptyUrlTree } from './url_tree';\nimport { PRIMARY_OUTLET, Params } from './shared';\nimport { createEmptyState, RouterState, RouterStateSnapshot, ActivatedRoute, ActivatedRouteSnapshot, advanceActivatedRoute} from './router_state';\nimport { RouterConfig } from './config';\nimport { RouterOutlet } from './directives/router_outlet';\nimport { createUrlTree } from './create_url_tree';\nimport { forEach, and, shallowEqual } from './utils/collection';\nimport { Observable } from 'rxjs/Observable';\nimport { Subscription } from 'rxjs/Subscription';\nimport { Subject } from 'rxjs/Subject';\nimport 'rxjs/add/operator/map';\nimport 'rxjs/add/operator/scan';\nimport 'rxjs/add/operator/mergeMap';\nimport 'rxjs/add/operator/concat';\nimport 'rxjs/add/operator/concatMap';\nimport {of} from 'rxjs/observable/of';\nimport {forkJoin} from 'rxjs/observable/forkJoin';\n\nexport interface NavigationExtras { relativeTo?: ActivatedRoute; queryParameters?: Params; fragment?: string; }\n\n/**\n * An event triggered when a navigation starts\n */\nexport class NavigationStart { constructor(public id:number, public url:UrlTree) {} }\n\n/**\n * An event triggered when a navigation ends successfully\n */\nexport class NavigationEnd { constructor(public id:number, public url:UrlTree) {} }\n\n/**\n * An event triggered when a navigation is canceled\n */\nexport class NavigationCancel { constructor(public id:number, public url:UrlTree) {} }\n\n/**\n * An event triggered when a navigation fails due to unexpected error\n */\nexport class NavigationError { constructor(public id:number, public url:UrlTree, public error:any) {} }\n\nexport type Event = NavigationStart | NavigationEnd | NavigationCancel | NavigationError;\n\n/**\n * The `Router` is responsible for mapping URLs to components.\n */\nexport class Router {\n  private currentUrlTree: UrlTree;\n  private currentRouterState: RouterState;\n  private config: RouterConfig;\n  private locationSubscription: Subscription;\n  private routerEvents: Subject<Event>;\n  private navigationId: number = 0;\n\n  /**\n   * @internal\n   */\n  constructor(private rootComponentType:Type, private resolver: ComponentResolver, private urlSerializer: UrlSerializer, private outletMap: RouterOutletMap, private location: Location, private injector: Injector) {\n    this.routerEvents = new Subject<Event>();\n    this.currentUrlTree = createEmptyUrlTree();\n    this.currentRouterState = createEmptyState(rootComponentType);\n    this.setUpLocationChangeListener();\n    this.navigateByUrl(this.location.path());\n  }\n\n  /**\n   * Returns the current route state.\n   */\n  get routerState(): RouterState {\n    return this.currentRouterState;\n  }\n\n  /**\n   * Returns the current url tree.\n   */\n  get urlTree(): UrlTree {\n    return this.currentUrlTree;\n  }\n\n  /**\n   * Returns an observable of route events\n   */\n  get events(): Observable<Event> {\n    return this.routerEvents;\n  }\n\n  /**\n   * Navigate based on the provided url. This navigation is always absolute.\n   *\n   * Returns a promise that:\n   * - is resolved with 'true' when navigation succeeds\n   * - is resolved with 'false' when navigation fails\n   * - is rejected when an error happens\n   *\n   * ### Usage\n   *\n   * ```\n   * router.navigateByUrl(\"/team/33/user/11\");\n   * ```\n   */\n  navigateByUrl(url: string): Promise<boolean> {\n    const urlTree = this.urlSerializer.parse(url);\n    return this.scheduleNavigation(urlTree, false);\n  }\n\n  /**\n   * Resets the configuration used for navigation and generating links.\n   *\n   * ### Usage\n   *\n   * ```\n   * router.resetConfig([\n   *  { path: 'team/:id', component: TeamCmp, children: [\n   *    { path: 'simple', component: SimpleCmp },\n   *    { path: 'user/:name', component: UserCmp }\n   *  ] }\n   * ]);\n   * ```\n   */\n  resetConfig(config: RouterConfig): void {\n    this.config = config;\n  }\n\n  /**\n   * @internal\n   */\n  dispose(): void { this.locationSubscription.unsubscribe(); }\n\n  /**\n   * Applies an array of commands to the current url tree and creates\n   * a new url tree.\n   *\n   * When given an activate route, applies the given commands starting from the route.\n   * When not given a route, applies the given command starting from the root.\n   *\n   * ### Usage\n   *\n   * ```\n   * // create /team/33/user/11\n   * router.createUrlTree(['/team', 33, 'user', 11]);\n   *\n   * // create /team/33;expand=true/user/11\n   * router.createUrlTree(['/team', 33, {expand: true}, 'user', 11]);\n   *\n   * // you can collapse static fragments like this\n   * router.createUrlTree(['/team/33/user', userId]);\n   *\n   * // assuming the current url is `/team/33/user/11` and the route points to `user/11`\n   *\n   * // navigate to /team/33/user/11/details\n   * router.createUrlTree(['details'], {relativeTo: route});\n   *\n   * // navigate to /team/33/user/22\n   * router.createUrlTree(['../22'], {relativeTo: route});\n   *\n   * // navigate to /team/44/user/22\n   * router.createUrlTree(['../../team/44/user/22'], {relativeTo: route});\n   * ```\n   */\n  createUrlTree(commands: any[], {relativeTo, queryParameters, fragment}: NavigationExtras = {}): UrlTree {\n    const a = relativeTo ? relativeTo : this.routerState.root;\n    return createUrlTree(a, this.currentUrlTree, commands, queryParameters, fragment);\n  }\n\n\n  /**\n   * Navigate based on the provided array of commands and a starting point.\n   * If no starting route is provided, the navigation is absolute.\n   *\n   * Returns a promise that:\n   * - is resolved with 'true' when navigation succeeds\n   * - is resolved with 'false' when navigation fails\n   * - is rejected when an error happens\n   *\n   * ### Usage\n   *\n   * ```\n   * router.navigate(['team', 33, 'team', '11], {relativeTo: route});\n   * ```\n   */\n  navigate(commands: any[], extras: NavigationExtras = {}): Promise<boolean> {\n    return this.scheduleNavigation(this.createUrlTree(commands, extras), false);\n  }\n\n  /**\n   * Serializes a {@link UrlTree} into a string.\n   */\n  serializeUrl(url: UrlTree): string { return this.urlSerializer.serialize(url); }\n\n  /**\n   * Parse a string into a {@link UrlTree}.\n   */\n  parseUrl(url: string): UrlTree { return this.urlSerializer.parse(url); }\n\n  private scheduleNavigation(url: UrlTree, pop: boolean):Promise<boolean> {\n    const id = ++ this.navigationId;\n    this.routerEvents.next(new NavigationStart(id, url));\n    return Promise.resolve().then((_) => this.runNavigate(url, false, id));\n  }\n\n  private setUpLocationChangeListener(): void {\n    this.locationSubscription = <any>this.location.subscribe((change) => {\n      return this.scheduleNavigation(this.urlSerializer.parse(change['url']), change['pop']);\n    });\n  }\n\n  private runNavigate(url: UrlTree, pop: boolean, id: number):Promise<boolean> {\n    if (id !== this.navigationId) {\n      this.routerEvents.next(new NavigationCancel(id, url));\n      return Promise.resolve(false);\n    }\n\n    return new Promise((resolvePromise, rejectPromise) => {\n      let state;\n      recognize(this.rootComponentType, this.config, url).mergeMap((newRouterStateSnapshot) => {\n        return resolve(this.resolver, newRouterStateSnapshot);\n\n      }).map((routerStateSnapshot) => {\n        return createRouterState(routerStateSnapshot, this.currentRouterState);\n\n      }).map((newState:RouterState) => {\n        state = newState;\n\n      }).mergeMap(_ => {\n        return new GuardChecks(state.snapshot, this.currentRouterState.snapshot, this.injector).check(this.outletMap);\n\n      }).forEach((shouldActivate) => {\n        if (!shouldActivate || id !== this.navigationId) {\n          this.routerEvents.next(new NavigationCancel(id, url));\n          return Promise.resolve(false);\n        }\n\n        new ActivateRoutes(state, this.currentRouterState).activate(this.outletMap);\n\n        this.currentUrlTree = url;\n        this.currentRouterState = state;\n        if (!pop) {\n          this.location.go(this.urlSerializer.serialize(url));\n        }\n      }).then(() => {\n        this.routerEvents.next(new NavigationEnd(id, url));\n        resolvePromise(true);\n\n      }, e => {\n        this.routerEvents.next(new NavigationError(id, url, e));\n        rejectPromise(e);\n      });\n    });\n  }\n}\n\nclass CanActivate { constructor(public route: ActivatedRouteSnapshot) {}}\nclass CanDeactivate { constructor(public component: Object, public route: ActivatedRouteSnapshot) {}}\n\nclass GuardChecks {\n  private checks = [];\n  constructor(private future: RouterStateSnapshot, private curr: RouterStateSnapshot, private injector: Injector) {}\n\n  check(parentOutletMap: RouterOutletMap): Observable<boolean> {\n    const futureRoot = this.future._root;\n    const currRoot = this.curr ? this.curr._root : null;\n    this.traverseChildRoutes(futureRoot, currRoot, parentOutletMap);\n    if (this.checks.length === 0) return of(true);\n    return forkJoin(this.checks.map(s => {\n      if (s instanceof CanActivate) {\n        return this.runCanActivate(s.route)\n      } else if (s instanceof CanDeactivate) {\n        return this.runCanDeactivate(s.component, s.route);\n      } else {\n        throw new Error(\"Cannot be reached\");\n      }\n    })).map(and);\n  }\n\n  private traverseChildRoutes(futureNode: TreeNode<ActivatedRouteSnapshot>,\n                              currNode: TreeNode<ActivatedRouteSnapshot> | null,\n                              outletMap: RouterOutletMap | null): void {\n    const prevChildren = nodeChildrenAsMap(currNode);\n    futureNode.children.forEach(c => {\n      this.traverseRoutes(c, prevChildren[c.value.outlet], outletMap);\n      delete prevChildren[c.value.outlet];\n    });\n    forEach(prevChildren, (v, k) => this.deactivateOutletAndItChildren(v, outletMap._outlets[k]));\n  }\n\n  traverseRoutes(futureNode: TreeNode<ActivatedRouteSnapshot>, currNode: TreeNode<ActivatedRouteSnapshot> | null,\n                 parentOutletMap: RouterOutletMap | null): void {\n    const future = futureNode.value;\n    const curr = currNode ? currNode.value : null;\n    const outlet = parentOutletMap ? parentOutletMap._outlets[futureNode.value.outlet] : null;\n\n    if (curr && future._routeConfig === curr._routeConfig) {\n      if (!shallowEqual(future.params, curr.params)) {\n        this.checks.push(new CanDeactivate(outlet.component, curr), new CanActivate(future));\n      }\n      this.traverseChildRoutes(futureNode, currNode, outlet ? outlet.outletMap : null);\n    } else {\n      this.deactivateOutletAndItChildren(curr, outlet);\n      this.checks.push(new CanActivate(future));\n      this.traverseChildRoutes(futureNode, null, outlet ? outlet.outletMap : null);\n    }\n  }\n\n  private deactivateOutletAndItChildren(route: ActivatedRouteSnapshot, outlet: RouterOutlet): void {\n    if (outlet && outlet.isActivated) {\n      forEach(outlet.outletMap._outlets, (v, k) => this.deactivateOutletAndItChildren(v, outlet.outletMap._outlets[k]));\n      this.checks.push(new CanDeactivate(outlet.component, route))\n    }\n  }\n\n  private runCanActivate(future: ActivatedRouteSnapshot): Observable<boolean> {\n    const canActivate = future._routeConfig ? future._routeConfig.canActivate : null;\n    if (!canActivate || canActivate.length === 0) return of(true);\n    return forkJoin(canActivate.map(c => {\n      const guard = this.injector.get(c);\n      if (guard.canActivate) {\n        return of(guard.canActivate(future, this.future));\n      } else {\n        return of(guard(future, this.future));\n      }\n    })).map(and);\n  }\n\n  private runCanDeactivate(component: Object, curr: ActivatedRouteSnapshot): Observable<boolean> {\n    const canDeactivate = curr._routeConfig ? curr._routeConfig.canDeactivate : null;\n    if (!canDeactivate || canDeactivate.length === 0) return of(true);\n    return forkJoin(canDeactivate.map(c => {\n      const guard = this.injector.get(c);\n      if (guard.canDeactivate) {\n        return of(guard.canDeactivate(component, curr, this.curr));\n      } else {\n        return of(guard(component, curr, this.curr));\n      }\n    })).map(and);\n  }\n}\n\nclass ActivateRoutes {\n  constructor(private futureState: RouterState, private currState: RouterState) {}\n\n  activate(parentOutletMap: RouterOutletMap):void {\n    const futureRoot = this.futureState._root;\n    const currRoot = this.currState ? this.currState._root : null;\n\n    pushQueryParamsAndFragment(this.futureState);\n    this.activateChildRoutes(futureRoot, currRoot, parentOutletMap);\n  }\n\n  private activateChildRoutes(futureNode: TreeNode<ActivatedRoute>,\n                              currNode: TreeNode<ActivatedRoute> | null,\n                              outletMap: RouterOutletMap): void {\n    const prevChildren = nodeChildrenAsMap(currNode);\n    futureNode.children.forEach(c => {\n      this.activateRoutes(c, prevChildren[c.value.outlet], outletMap);\n      delete prevChildren[c.value.outlet];\n    });\n    forEach(prevChildren, (v, k) => this.deactivateOutletAndItChildren(outletMap._outlets[k]));\n  }\n\n  activateRoutes(futureNode: TreeNode<ActivatedRoute>, currNode: TreeNode<ActivatedRoute> | null,\n                 parentOutletMap: RouterOutletMap): void {\n    const future = futureNode.value;\n    const curr = currNode ? currNode.value : null;\n    const outlet = getOutlet(parentOutletMap, futureNode.value);\n\n    if (future === curr) {\n      advanceActivatedRoute(future);\n      this.activateChildRoutes(futureNode, currNode, outlet.outletMap);\n    } else {\n      this.deactivateOutletAndItChildren(outlet);\n      const outletMap = new RouterOutletMap();\n      this.activateNewRoutes(outletMap, future, outlet);\n      this.activateChildRoutes(futureNode, null, outletMap);\n    }\n  }\n\n  private activateNewRoutes(outletMap: RouterOutletMap, future: ActivatedRoute, outlet: RouterOutlet): void {\n    const resolved = ReflectiveInjector.resolve([\n      {provide: ActivatedRoute, useValue: future},\n      {provide: RouterOutletMap, useValue: outletMap}\n    ]);\n    outlet.activate(future._futureSnapshot._resolvedComponentFactory, resolved, outletMap);\n    advanceActivatedRoute(future);\n  }\n\n  private deactivateOutletAndItChildren(outlet: RouterOutlet): void {\n    if (outlet && outlet.isActivated) {\n      forEach(outlet.outletMap._outlets, (v, k) => this.deactivateOutletAndItChildren(v));\n      outlet.deactivate();\n    }\n  }\n}\n\nfunction pushQueryParamsAndFragment(state: RouterState): void {\n  if (!shallowEqual(state.snapshot.queryParams, (<any>state.queryParams).value)) {\n    (<any>state.queryParams).next(state.snapshot.queryParams);\n  }\n\n  if (state.snapshot.fragment !== (<any>state.fragment).value) {\n    (<any>state.fragment).next(state.snapshot.fragment);\n  }\n}\n\nfunction nodeChildrenAsMap(node: TreeNode<any>|null) {\n  return node ?\n    node.children.reduce(\n      (m, c) => {\n        m[c.value.outlet] = c;\n        return m;\n      },\n      {}) :\n  {};\n}\n\nfunction getOutlet(outletMap: RouterOutletMap, route: ActivatedRoute): RouterOutlet {\n  let outlet = outletMap._outlets[route.outlet];\n  if (!outlet) {\n    if (route.outlet === PRIMARY_OUTLET) {\n      throw new Error(`Cannot find primary outlet`);\n    } else {\n      throw new Error(`Cannot find the outlet ${route.outlet}`);\n    }\n  }\n  return outlet;\n}\n"]}
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/router_outlet_map.d.ts b/modules/@angular/router/build/es6/src/router_outlet_map.d.ts
deleted file mode 100644
index df50474269..0000000000
--- a/modules/@angular/router/build/es6/src/router_outlet_map.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { RouterOutlet } from './directives/router_outlet';
-export declare class RouterOutletMap {
-    _outlets: {
-        [name: string]: RouterOutlet;
-    };
-    registerOutlet(name: string, outlet: RouterOutlet): void;
-}
diff --git a/modules/@angular/router/build/es6/src/router_outlet_map.js b/modules/@angular/router/build/es6/src/router_outlet_map.js
deleted file mode 100644
index 111d0035ab..0000000000
--- a/modules/@angular/router/build/es6/src/router_outlet_map.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export class RouterOutletMap {
-    constructor() {
-        this._outlets = {};
-    }
-    registerOutlet(name, outlet) { this._outlets[name] = outlet; }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyX291dGxldF9tYXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcm91dGVyX291dGxldF9tYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBS0E7SUFBQTtRQUVFLGFBQVEsR0FBbUMsRUFBRSxDQUFDO0lBRWhELENBQUM7SUFEQyxjQUFjLENBQUMsSUFBWSxFQUFFLE1BQW9CLElBQVUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsR0FBRyxNQUFNLENBQUMsQ0FBQyxDQUFDO0FBQzVGLENBQUM7QUFBQSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJvdXRlck91dGxldCB9IGZyb20gJy4vZGlyZWN0aXZlcy9yb3V0ZXJfb3V0bGV0JztcblxuLyoqXG4gKiBAaW50ZXJuYWxcbiAqL1xuZXhwb3J0IGNsYXNzIFJvdXRlck91dGxldE1hcCB7XG4gIC8qKiBAaW50ZXJuYWwgKi9cbiAgX291dGxldHM6IHtbbmFtZTogc3RyaW5nXTogUm91dGVyT3V0bGV0fSA9IHt9O1xuICByZWdpc3Rlck91dGxldChuYW1lOiBzdHJpbmcsIG91dGxldDogUm91dGVyT3V0bGV0KTogdm9pZCB7IHRoaXMuX291dGxldHNbbmFtZV0gPSBvdXRsZXQ7IH1cbn1cbiJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/router_providers.d.ts b/modules/@angular/router/build/es6/src/router_providers.d.ts
deleted file mode 100644
index dea74761c8..0000000000
--- a/modules/@angular/router/build/es6/src/router_providers.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { RouterConfig } from './config';
-export declare function provideRouter(config: RouterConfig): any[];
diff --git a/modules/@angular/router/build/es6/src/router_providers.js b/modules/@angular/router/build/es6/src/router_providers.js
deleted file mode 100644
index 621d815f6f..0000000000
--- a/modules/@angular/router/build/es6/src/router_providers.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import * as common from './common_router_providers';
-import { BrowserPlatformLocation } from '@angular/platform-browser';
-import { PlatformLocation } from '@angular/common';
-export function provideRouter(config) {
-    return [
-        { provide: PlatformLocation, useClass: BrowserPlatformLocation },
-        ...common.provideRouter(config)
-    ];
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyX3Byb3ZpZGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9yb3V0ZXJfcHJvdmlkZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJPQUNPLEtBQUssTUFBTSxNQUFNLDJCQUEyQjtPQUM1QyxFQUFDLHVCQUF1QixFQUFDLE1BQU0sMkJBQTJCO09BQzFELEVBQUMsZ0JBQWdCLEVBQUMsTUFBTSxpQkFBaUI7QUFvQmhELDhCQUE4QixNQUFvQjtJQUNoRCxNQUFNLENBQUM7UUFDTCxFQUFDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxRQUFRLEVBQUUsdUJBQXVCLEVBQUM7UUFDOUQsR0FBRyxNQUFNLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQztLQUNoQyxDQUFDO0FBQ0osQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJvdXRlckNvbmZpZyB9IGZyb20gJy4vY29uZmlnJztcbmltcG9ydCAqIGFzIGNvbW1vbiBmcm9tICcuL2NvbW1vbl9yb3V0ZXJfcHJvdmlkZXJzJztcbmltcG9ydCB7QnJvd3NlclBsYXRmb3JtTG9jYXRpb259IGZyb20gJ0Bhbmd1bGFyL3BsYXRmb3JtLWJyb3dzZXInO1xuaW1wb3J0IHtQbGF0Zm9ybUxvY2F0aW9ufSBmcm9tICdAYW5ndWxhci9jb21tb24nO1xuXG4vKipcbiAqIEEgbGlzdCBvZiB7QGxpbmsgUHJvdmlkZXJ9cy4gVG8gdXNlIHRoZSByb3V0ZXIsIHlvdSBtdXN0IGFkZCB0aGlzIHRvIHlvdXIgYXBwbGljYXRpb24uXG4gKlxuICogIyMjIEV4YW1wbGVcbiAqXG4gKiBgYGBcbiAqIEBDb21wb25lbnQoe2RpcmVjdGl2ZXM6IFtST1VURVJfRElSRUNUSVZFU119KVxuICogY2xhc3MgQXBwQ21wIHtcbiAqICAgLy8gLi4uXG4gKiB9XG4gKiBcbiAqIGNvbnN0IHJvdXRlciA9IFtcbiAqICAge3BhdGg6ICcvaG9tZScsIGNvbXBvbmVudDogSG9tZX1cbiAqIF07XG4gKlxuICogYm9vdHN0cmFwKEFwcENtcCwgW3Byb3ZpZGVSb3V0ZXIocm91dGVyKV0pO1xuICogYGBgXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBwcm92aWRlUm91dGVyKGNvbmZpZzogUm91dGVyQ29uZmlnKTphbnlbXSB7XG4gIHJldHVybiBbXG4gICAge3Byb3ZpZGU6IFBsYXRmb3JtTG9jYXRpb24sIHVzZUNsYXNzOiBCcm93c2VyUGxhdGZvcm1Mb2NhdGlvbn0sXG4gICAgLi4uY29tbW9uLnByb3ZpZGVSb3V0ZXIoY29uZmlnKVxuICBdO1xufVxuIl19
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/router_state.d.ts b/modules/@angular/router/build/es6/src/router_state.d.ts
deleted file mode 100644
index 0a2493803c..0000000000
--- a/modules/@angular/router/build/es6/src/router_state.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Tree, TreeNode } from './utils/tree';
-import { UrlSegment } from './url_tree';
-import { Route } from './config';
-import { Params } from './shared';
-import { Observable } from 'rxjs/Observable';
-import { Type, ComponentFactory } from '@angular/core';
-export declare class RouterState extends Tree<ActivatedRoute> {
-    queryParams: Observable<Params>;
-    fragment: Observable<string>;
-    snapshot: RouterStateSnapshot;
-    constructor(root: TreeNode<ActivatedRoute>, queryParams: Observable<Params>, fragment: Observable<string>, snapshot: RouterStateSnapshot);
-}
-export declare function createEmptyState(rootComponent: Type): RouterState;
-export declare class ActivatedRoute {
-    urlSegments: Observable<UrlSegment[]>;
-    params: Observable<Params>;
-    outlet: string;
-    component: Type | string;
-    _futureSnapshot: ActivatedRouteSnapshot;
-    snapshot: ActivatedRouteSnapshot;
-    constructor(urlSegments: Observable<UrlSegment[]>, params: Observable<Params>, outlet: string, component: Type | string, futureSnapshot: ActivatedRouteSnapshot);
-}
-export declare class ActivatedRouteSnapshot {
-    urlSegments: UrlSegment[];
-    params: Params;
-    outlet: string;
-    component: Type | string;
-    _resolvedComponentFactory: ComponentFactory<any>;
-    _routeConfig: Route | null;
-    _lastUrlSegment: UrlSegment;
-    constructor(urlSegments: UrlSegment[], params: Params, outlet: string, component: Type | string, routeConfig: Route | null, lastUrlSegment: UrlSegment);
-}
-export declare class RouterStateSnapshot extends Tree<ActivatedRouteSnapshot> {
-    queryParams: Params;
-    fragment: string | null;
-    constructor(root: TreeNode<ActivatedRouteSnapshot>, queryParams: Params, fragment: string | null);
-}
-export declare function advanceActivatedRoute(route: ActivatedRoute): void;
diff --git a/modules/@angular/router/build/es6/src/router_state.js b/modules/@angular/router/build/es6/src/router_state.js
deleted file mode 100644
index 4c8b23b4a8..0000000000
--- a/modules/@angular/router/build/es6/src/router_state.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Tree, TreeNode } from './utils/tree';
-import { shallowEqual } from './utils/collection';
-import { UrlSegment } from './url_tree';
-import { PRIMARY_OUTLET } from './shared';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-export class RouterState extends Tree {
-    constructor(root, queryParams, fragment, snapshot) {
-        super(root);
-        this.queryParams = queryParams;
-        this.fragment = fragment;
-        this.snapshot = snapshot;
-    }
-}
-export function createEmptyState(rootComponent) {
-    const snapshot = createEmptyStateSnapshot(rootComponent);
-    const emptyUrl = new BehaviorSubject([new UrlSegment("", {}, PRIMARY_OUTLET)]);
-    const emptyParams = new BehaviorSubject({});
-    const emptyQueryParams = new BehaviorSubject({});
-    const fragment = new BehaviorSubject("");
-    const activated = new ActivatedRoute(emptyUrl, emptyParams, PRIMARY_OUTLET, rootComponent, snapshot.root);
-    activated.snapshot = snapshot.root;
-    return new RouterState(new TreeNode(activated, []), emptyQueryParams, fragment, snapshot);
-}
-function createEmptyStateSnapshot(rootComponent) {
-    const rootUrlSegment = new UrlSegment("", {}, PRIMARY_OUTLET);
-    const emptyUrl = [rootUrlSegment];
-    const emptyParams = {};
-    const emptyQueryParams = {};
-    const fragment = "";
-    const activated = new ActivatedRouteSnapshot(emptyUrl, emptyParams, PRIMARY_OUTLET, rootComponent, null, rootUrlSegment);
-    return new RouterStateSnapshot(new TreeNode(activated, []), emptyQueryParams, fragment);
-}
-export class ActivatedRoute {
-    constructor(urlSegments, params, outlet, component, futureSnapshot) {
-        this.urlSegments = urlSegments;
-        this.params = params;
-        this.outlet = outlet;
-        this.component = component;
-        this._futureSnapshot = futureSnapshot;
-    }
-}
-export class ActivatedRouteSnapshot {
-    constructor(urlSegments, params, outlet, component, routeConfig, lastUrlSegment) {
-        this.urlSegments = urlSegments;
-        this.params = params;
-        this.outlet = outlet;
-        this.component = component;
-        this._routeConfig = routeConfig;
-        this._lastUrlSegment = lastUrlSegment;
-    }
-}
-export class RouterStateSnapshot extends Tree {
-    constructor(root, queryParams, fragment) {
-        super(root);
-        this.queryParams = queryParams;
-        this.fragment = fragment;
-    }
-}
-export function advanceActivatedRoute(route) {
-    if (route.snapshot && !shallowEqual(route.snapshot.params, route._futureSnapshot.params)) {
-        route.snapshot = route._futureSnapshot;
-        route.urlSegments.next(route.snapshot.urlSegments);
-        route.params.next(route.snapshot.params);
-    }
-    else {
-        route.snapshot = route._futureSnapshot;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"router_state.js","sourceRoot":"","sources":["../../../src/router_state.ts"],"names":[],"mappings":"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","sourcesContent":["import { Tree, TreeNode } from './utils/tree';\nimport { shallowEqual } from './utils/collection';\nimport { UrlSegment } from './url_tree';\nimport { Route } from './config';\nimport { Params, PRIMARY_OUTLET } from './shared';\nimport { Observable } from 'rxjs/Observable';\nimport { BehaviorSubject } from 'rxjs/BehaviorSubject';\nimport { Type, ComponentFactory } from '@angular/core';\n\n/**\n * The state of the router.\n *\n * ### Usage\n *\n * ```\n * class MyComponent {\n *   constructor(router: Router) {\n *     const state = router.routerState;\n *     const id: Observable<string> = state.firstChild(state.root).params.map(p => p.id);\n *     const isDebug: Observable<string> = state.queryParams.map(q => q.debug);\n *   }\n * }\n * ```\n */\nexport class RouterState extends Tree<ActivatedRoute> {\n  /**\n   * @internal\n   */\n  constructor(root: TreeNode<ActivatedRoute>, public queryParams: Observable<Params>, public fragment: Observable<string>, public snapshot: RouterStateSnapshot) {\n    super(root);\n  }\n}\n\nexport function createEmptyState(rootComponent: Type): RouterState {\n  const snapshot = createEmptyStateSnapshot(rootComponent);\n  const emptyUrl = new BehaviorSubject([new UrlSegment(\"\", {}, PRIMARY_OUTLET)]);\n  const emptyParams = new BehaviorSubject({});\n  const emptyQueryParams = new BehaviorSubject({});\n  const fragment = new BehaviorSubject(\"\");\n  const activated = new ActivatedRoute(emptyUrl, emptyParams, PRIMARY_OUTLET, rootComponent, snapshot.root);\n  activated.snapshot = snapshot.root;\n  return new RouterState(new TreeNode<ActivatedRoute>(activated, []), emptyQueryParams, fragment, snapshot);\n}\n\nfunction createEmptyStateSnapshot(rootComponent: Type): RouterStateSnapshot {\n  const rootUrlSegment = new UrlSegment(\"\", {}, PRIMARY_OUTLET);\n  const emptyUrl = [rootUrlSegment];\n  const emptyParams = {};\n  const emptyQueryParams = {};\n  const fragment = \"\";\n  const activated = new ActivatedRouteSnapshot(emptyUrl, emptyParams, PRIMARY_OUTLET, rootComponent, null, rootUrlSegment);\n  return new RouterStateSnapshot(new TreeNode<ActivatedRouteSnapshot>(activated, []), emptyQueryParams, fragment);\n}\n\n/**\n * Contains the information about a component loaded in an outlet. The information is provided through\n * the params and urlSegments observables.\n *\n * ### Usage\n *\n * ```\n * class MyComponent {\n *   constructor(route: ActivatedRoute) {\n *     const id: Observable<string> = route.params.map(p => p.id);\n *   }\n * }\n * ```\n */\nexport class ActivatedRoute {\n  /** @internal */\n  _futureSnapshot: ActivatedRouteSnapshot;\n  snapshot: ActivatedRouteSnapshot;\n\n  /**\n   * @internal\n   */\n  constructor(public urlSegments: Observable<UrlSegment[]>,\n              public params: Observable<Params>,\n              public outlet: string,\n              public component: Type | string,\n              futureSnapshot: ActivatedRouteSnapshot\n  ) {\n    this._futureSnapshot = futureSnapshot;\n  }\n}\n\n/**\n * Contains the information about a component loaded in an outlet at a particular moment in time.\n *\n * ### Usage\n *\n * ```\n * class MyComponent {\n *   constructor(route: ActivatedRoute) {\n *     const id: string = route.snapshot.params.id;\n *   }\n * }\n * ```\n */\nexport class ActivatedRouteSnapshot {\n  /**\n   * @internal\n   */\n  _resolvedComponentFactory: ComponentFactory<any>;\n  \n  /** @internal **/\n  _routeConfig: Route | null;\n\n  /** @internal **/\n  _lastUrlSegment: UrlSegment;\n\n  /**\n   * @internal\n   */\n  constructor(public urlSegments: UrlSegment[],\n              public params: Params,\n              public outlet: string,\n              public component: Type | string, \n              routeConfig: Route | null,\n              lastUrlSegment: UrlSegment) {\n    this._routeConfig = routeConfig;\n    this._lastUrlSegment = lastUrlSegment;\n  }\n}\n\n/**\n * The state of the router at a particular moment in time.\n *\n * ### Usage\n *\n * ```\n * class MyComponent {\n *   constructor(router: Router) {\n *     const snapshot = router.routerState.snapshot;\n *   }\n * }\n * ```\n */\nexport class RouterStateSnapshot extends Tree<ActivatedRouteSnapshot> {\n  /**\n   * @internal\n   */\n  constructor(root: TreeNode<ActivatedRouteSnapshot>, public queryParams: Params, public fragment: string | null) {\n    super(root);\n  }\n}\n\n/**\n * The expectation is that the activate route is created with the right set of parameters.\n * So we push new values into the observables only when they are not the initial values.\n * And we detect that by checking if the snapshot field is set.\n */\nexport function advanceActivatedRoute(route: ActivatedRoute): void {\n  if (route.snapshot && !shallowEqual(route.snapshot.params, route._futureSnapshot.params)) {\n    route.snapshot = route._futureSnapshot;\n    (<any>route.urlSegments).next(route.snapshot.urlSegments);\n    (<any>route.params).next(route.snapshot.params);\n  } else {\n    route.snapshot = route._futureSnapshot;\n  }\n}"]}
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/shared.d.ts b/modules/@angular/router/build/es6/src/shared.d.ts
deleted file mode 100644
index 2aacfdf7a6..0000000000
--- a/modules/@angular/router/build/es6/src/shared.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export declare const PRIMARY_OUTLET: string;
-export declare type Params = {
-    [key: string]: string;
-};
diff --git a/modules/@angular/router/build/es6/src/shared.js b/modules/@angular/router/build/es6/src/shared.js
deleted file mode 100644
index 9cc0b44dc9..0000000000
--- a/modules/@angular/router/build/es6/src/shared.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const PRIMARY_OUTLET = "PRIMARY_OUTLET";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NoYXJlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFJQSxPQUFPLE1BQU0sY0FBYyxHQUFXLGdCQUFnQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBOYW1lIG9mIHRoZSBwcmltYXJ5IG91dGxldC5cbiAqIEB0eXBlIHtzdHJpbmd9XG4gKi9cbmV4cG9ydCBjb25zdCBQUklNQVJZX09VVExFVDogc3RyaW5nID0gXCJQUklNQVJZX09VVExFVFwiO1xuXG4vKipcbiAqIEEgY29sbGVjdGlvbiBvZiBwYXJhbWV0ZXJzLlxuICovXG5leHBvcnQgdHlwZSBQYXJhbXMgPSB7IFtrZXk6IHN0cmluZ106IHN0cmluZyB9O1xuIl19
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/url_serializer.d.ts b/modules/@angular/router/build/es6/src/url_serializer.d.ts
deleted file mode 100644
index 509f6b4ea0..0000000000
--- a/modules/@angular/router/build/es6/src/url_serializer.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { UrlTree, UrlSegment } from './url_tree';
-export declare abstract class UrlSerializer {
-    abstract parse(url: string): UrlTree;
-    abstract serialize(tree: UrlTree): string;
-}
-export declare class DefaultUrlSerializer implements UrlSerializer {
-    parse(url: string): UrlTree;
-    serialize(tree: UrlTree): string;
-}
-export declare function serializeSegment(segment: UrlSegment): string;
diff --git a/modules/@angular/router/build/es6/src/url_serializer.js b/modules/@angular/router/build/es6/src/url_serializer.js
deleted file mode 100644
index 6a0ec4c9b7..0000000000
--- a/modules/@angular/router/build/es6/src/url_serializer.js
+++ /dev/null
@@ -1,212 +0,0 @@
-import { UrlTree, UrlSegment } from './url_tree';
-import { PRIMARY_OUTLET } from './shared';
-import { TreeNode } from './utils/tree';
-export class UrlSerializer {
-}
-export class DefaultUrlSerializer {
-    parse(url) {
-        const p = new UrlParser(url);
-        return new UrlTree(p.parseRootSegment(), p.parseQueryParams(), p.parseFragment());
-    }
-    serialize(tree) {
-        const node = serializeUrlTreeNode(tree._root);
-        const query = serializeQueryParams(tree.queryParameters);
-        const fragment = tree.fragment !== null ? `#${tree.fragment}` : '';
-        return `${node}${query}${fragment}`;
-    }
-}
-function serializeUrlTreeNode(node) {
-    return `${serializeSegment(node.value)}${serializeChildren(node)}`;
-}
-function serializeUrlTreeNodes(nodes) {
-    const primary = serializeSegment(nodes[0].value);
-    const secondaryNodes = nodes.slice(1);
-    const secondary = secondaryNodes.length > 0 ? `(${secondaryNodes.map(serializeUrlTreeNode).join("//")})` : "";
-    const children = serializeChildren(nodes[0]);
-    return `${primary}${secondary}${children}`;
-}
-function serializeChildren(node) {
-    if (node.children.length > 0) {
-        return `/${serializeUrlTreeNodes(node.children)}`;
-    }
-    else {
-        return "";
-    }
-}
-export function serializeSegment(segment) {
-    const outlet = segment.outlet === PRIMARY_OUTLET ? '' : `${segment.outlet}:`;
-    return `${outlet}${segment.path}${serializeParams(segment.parameters)}`;
-}
-function serializeParams(params) {
-    return pairs(params).map(p => `;${p.first}=${p.second}`).join("");
-}
-function serializeQueryParams(params) {
-    const strs = pairs(params).map(p => `${p.first}=${p.second}`);
-    return strs.length > 0 ? `?${strs.join("&")}` : "";
-}
-class Pair {
-    constructor(first, second) {
-        this.first = first;
-        this.second = second;
-    }
-}
-function pairs(obj) {
-    const res = [];
-    for (let prop in obj) {
-        if (obj.hasOwnProperty(prop)) {
-            res.push(new Pair(prop, obj[prop]));
-        }
-    }
-    return res;
-}
-const SEGMENT_RE = /^[^\/\(\)\?;=&#]+/;
-function matchUrlSegment(str) {
-    SEGMENT_RE.lastIndex = 0;
-    var match = SEGMENT_RE.exec(str);
-    return match ? match[0] : '';
-}
-const QUERY_PARAM_VALUE_RE = /^[^\(\)\?;&#]+/;
-function matchUrlQueryParamValue(str) {
-    QUERY_PARAM_VALUE_RE.lastIndex = 0;
-    const match = QUERY_PARAM_VALUE_RE.exec(str);
-    return match ? match[0] : '';
-}
-class UrlParser {
-    constructor(remaining) {
-        this.remaining = remaining;
-    }
-    peekStartsWith(str) { return this.remaining.startsWith(str); }
-    capture(str) {
-        if (!this.remaining.startsWith(str)) {
-            throw new Error(`Expected "${str}".`);
-        }
-        this.remaining = this.remaining.substring(str.length);
-    }
-    parseRootSegment() {
-        if (this.remaining == '' || this.remaining == '/') {
-            return new TreeNode(new UrlSegment('', {}, PRIMARY_OUTLET), []);
-        }
-        else {
-            const segments = this.parseSegments(false);
-            return new TreeNode(new UrlSegment('', {}, PRIMARY_OUTLET), segments);
-        }
-    }
-    parseSegments(hasOutletName) {
-        if (this.remaining.length == 0) {
-            return [];
-        }
-        if (this.peekStartsWith('/')) {
-            this.capture('/');
-        }
-        let path = matchUrlSegment(this.remaining);
-        this.capture(path);
-        let outletName;
-        if (hasOutletName) {
-            if (path.indexOf(":") === -1) {
-                throw new Error("Not outlet name is provided");
-            }
-            if (path.indexOf(":") > -1 && hasOutletName) {
-                let parts = path.split(":");
-                outletName = parts[0];
-                path = parts[1];
-            }
-        }
-        else {
-            if (path.indexOf(":") > -1) {
-                throw new Error("Not outlet name is allowed");
-            }
-            outletName = PRIMARY_OUTLET;
-        }
-        let matrixParams = {};
-        if (this.peekStartsWith(';')) {
-            matrixParams = this.parseMatrixParams();
-        }
-        let secondary = [];
-        if (this.peekStartsWith('(')) {
-            secondary = this.parseSecondarySegments();
-        }
-        let children = [];
-        if (this.peekStartsWith('/') && !this.peekStartsWith('//')) {
-            this.capture('/');
-            children = this.parseSegments(false);
-        }
-        const segment = new UrlSegment(path, matrixParams, outletName);
-        const node = new TreeNode(segment, children);
-        return [node].concat(secondary);
-    }
-    parseQueryParams() {
-        var params = {};
-        if (this.peekStartsWith('?')) {
-            this.capture('?');
-            this.parseQueryParam(params);
-            while (this.remaining.length > 0 && this.peekStartsWith('&')) {
-                this.capture('&');
-                this.parseQueryParam(params);
-            }
-        }
-        return params;
-    }
-    parseFragment() {
-        if (this.peekStartsWith('#')) {
-            return this.remaining.substring(1);
-        }
-        else {
-            return null;
-        }
-    }
-    parseMatrixParams() {
-        var params = {};
-        while (this.remaining.length > 0 && this.peekStartsWith(';')) {
-            this.capture(';');
-            this.parseParam(params);
-        }
-        return params;
-    }
-    parseParam(params) {
-        var key = matchUrlSegment(this.remaining);
-        if (!key) {
-            return;
-        }
-        this.capture(key);
-        var value = "true";
-        if (this.peekStartsWith('=')) {
-            this.capture('=');
-            var valueMatch = matchUrlSegment(this.remaining);
-            if (valueMatch) {
-                value = valueMatch;
-                this.capture(value);
-            }
-        }
-        params[key] = value;
-    }
-    parseQueryParam(params) {
-        var key = matchUrlSegment(this.remaining);
-        if (!key) {
-            return;
-        }
-        this.capture(key);
-        var value = "true";
-        if (this.peekStartsWith('=')) {
-            this.capture('=');
-            var valueMatch = matchUrlQueryParamValue(this.remaining);
-            if (valueMatch) {
-                value = valueMatch;
-                this.capture(value);
-            }
-        }
-        params[key] = value;
-    }
-    parseSecondarySegments() {
-        var segments = [];
-        this.capture('(');
-        while (!this.peekStartsWith(')') && this.remaining.length > 0) {
-            segments = segments.concat(this.parseSegments(true));
-            if (this.peekStartsWith('//')) {
-                this.capture('//');
-            }
-        }
-        this.capture(')');
-        return segments;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"url_serializer.js","sourceRoot":"","sources":["../../../src/url_serializer.ts"],"names":[],"mappings":"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","sourcesContent":["import { UrlTree, UrlSegment } from './url_tree';\nimport { PRIMARY_OUTLET } from './shared';\nimport { TreeNode } from './utils/tree';\n\n/**\n * Defines a way to serialize/deserialize a url tree.\n */\nexport abstract class UrlSerializer {\n  /**\n   * Parse a url into a {@Link UrlTree}\n   */\n  abstract parse(url: string): UrlTree;\n\n  /**\n   * Converts a {@Link UrlTree} into a url\n   */\n  abstract serialize(tree: UrlTree): string;\n}\n\n/**\n * A default implementation of the serialization.\n */\nexport class DefaultUrlSerializer implements UrlSerializer {\n  parse(url: string): UrlTree {\n    const p = new UrlParser(url);\n    return new UrlTree(p.parseRootSegment(), p.parseQueryParams(), p.parseFragment());\n  }\n\n  serialize(tree: UrlTree): string { \n    const node = serializeUrlTreeNode(tree._root);\n    const query = serializeQueryParams(tree.queryParameters);\n    const fragment = tree.fragment !== null ? `#${tree.fragment}` : '';\n    return `${node}${query}${fragment}`;\n  }\n}\n\nfunction serializeUrlTreeNode(node: TreeNode<UrlSegment>): string {\n  return `${serializeSegment(node.value)}${serializeChildren(node)}`;\n}\n\nfunction serializeUrlTreeNodes(nodes: TreeNode<UrlSegment>[]): string {\n  const primary = serializeSegment(nodes[0].value);\n  const secondaryNodes = nodes.slice(1);\n  const secondary = secondaryNodes.length > 0 ? `(${secondaryNodes.map(serializeUrlTreeNode).join(\"//\")})` : \"\";\n  const children = serializeChildren(nodes[0]);\n  return `${primary}${secondary}${children}`;\n}\n\nfunction serializeChildren(node: TreeNode<UrlSegment>): string {\n  if (node.children.length > 0) {\n    return `/${serializeUrlTreeNodes(node.children)}`;\n  } else {\n    return \"\";\n  }\n}\n\nexport function serializeSegment(segment: UrlSegment): string {\n  const outlet = segment.outlet === PRIMARY_OUTLET ? '' : `${segment.outlet}:`;\n  return `${outlet}${segment.path}${serializeParams(segment.parameters)}`;\n}\n\nfunction serializeParams(params: {[key: string]: string}): string {\n  return pairs(params).map(p => `;${p.first}=${p.second}`).join(\"\");\n}\n\nfunction serializeQueryParams(params: {[key: string]: string}): string {\n  const strs = pairs(params).map(p => `${p.first}=${p.second}`);\n  return strs.length > 0 ? `?${strs.join(\"&\")}` : \"\";\n}\n\nclass Pair<A,B> { constructor(public first:A, public second:B) {} }\nfunction pairs<T>(obj: {[key: string]: T}):Pair<string,T>[] {\n  const res = [];\n  for (let prop in obj) {\n    if (obj.hasOwnProperty(prop)) {\n      res.push(new Pair<string, T>(prop, obj[prop]));\n    }\n  }\n  return res;\n}\n\nconst SEGMENT_RE = /^[^\\/\\(\\)\\?;=&#]+/;\nfunction matchUrlSegment(str: string): string {\n  SEGMENT_RE.lastIndex = 0;\n  var match = SEGMENT_RE.exec(str);\n  return match ? match[0] : '';\n}\n\nconst QUERY_PARAM_VALUE_RE = /^[^\\(\\)\\?;&#]+/;\nfunction matchUrlQueryParamValue(str: string): string {\n  QUERY_PARAM_VALUE_RE.lastIndex = 0;\n  const match = QUERY_PARAM_VALUE_RE.exec(str);\n  return match ? match[0] : '';\n}\n\nclass UrlParser {\n  constructor(private remaining: string) {}\n\n  peekStartsWith(str: string): boolean { return this.remaining.startsWith(str); }\n\n  capture(str: string): void {\n    if (!this.remaining.startsWith(str)) {\n      throw new Error(`Expected \"${str}\".`);\n    }\n    this.remaining = this.remaining.substring(str.length);\n  }\n\n  parseRootSegment(): TreeNode<UrlSegment> {\n    if (this.remaining  == '' || this.remaining == '/') {\n      return new TreeNode<UrlSegment>(new UrlSegment('', {}, PRIMARY_OUTLET), []);\n    } else {\n      const segments = this.parseSegments(false);\n      return new TreeNode<UrlSegment>(new UrlSegment('', {}, PRIMARY_OUTLET), segments);\n    }\n  }\n\n  parseSegments(hasOutletName: boolean): TreeNode<UrlSegment>[] {\n    if (this.remaining.length == 0) {\n      return [];\n    }\n    if (this.peekStartsWith('/')) {\n      this.capture('/');\n    }\n    let path = matchUrlSegment(this.remaining);\n    this.capture(path);\n\n    let outletName;\n    if (hasOutletName) {\n      if (path.indexOf(\":\") === -1) {\n        throw new Error(\"Not outlet name is provided\");\n      }\n      if (path.indexOf(\":\") > -1 && hasOutletName) {\n        let parts = path.split(\":\");\n        outletName = parts[0];\n        path = parts[1];\n      }\n    } else {\n      if (path.indexOf(\":\") > -1) {\n        throw new Error(\"Not outlet name is allowed\");\n      }\n      outletName = PRIMARY_OUTLET;\n    }\n\n    let matrixParams: {[key: string]: any} = {};\n    if (this.peekStartsWith(';')) {\n      matrixParams = this.parseMatrixParams();\n    }\n\n    let secondary = [];\n    if (this.peekStartsWith('(')) {\n      secondary = this.parseSecondarySegments();\n    }\n\n    let children: TreeNode<UrlSegment>[] = [];\n    if (this.peekStartsWith('/') && !this.peekStartsWith('//')) {\n      this.capture('/');\n      children = this.parseSegments(false);\n    }\n\n    const segment = new UrlSegment(path, matrixParams, outletName);\n    const node = new TreeNode<UrlSegment>(segment, children);\n    return [node].concat(secondary);\n  }\n\n  parseQueryParams(): {[key: string]: any} {\n    var params: {[key: string]: any} = {};\n    if (this.peekStartsWith('?')) {\n      this.capture('?');\n      this.parseQueryParam(params);\n      while (this.remaining.length > 0 && this.peekStartsWith('&')) {\n        this.capture('&');\n        this.parseQueryParam(params);\n      }\n    }\n    return params;\n  }\n\n  parseFragment(): string | null {\n    if (this.peekStartsWith('#')) {\n      return this.remaining.substring(1);\n    } else {\n      return null;\n    }\n  }\n\n  parseMatrixParams(): {[key: string]: any} {\n    var params: {[key: string]: any} = {};\n    while (this.remaining.length > 0 && this.peekStartsWith(';')) {\n      this.capture(';');\n      this.parseParam(params);\n    }\n    return params;\n  }\n\n  parseParam(params: {[key: string]: any}): void {\n    var key = matchUrlSegment(this.remaining);\n    if (!key) {\n      return;\n    }\n    this.capture(key);\n    var value: any = \"true\";\n    if (this.peekStartsWith('=')) {\n      this.capture('=');\n      var valueMatch = matchUrlSegment(this.remaining);\n      if (valueMatch) {\n        value = valueMatch;\n        this.capture(value);\n      }\n    }\n\n    params[key] = value;\n  }\n\n  parseQueryParam(params: {[key: string]: any}): void {\n    var key = matchUrlSegment(this.remaining);\n    if (!key) {\n      return;\n    }\n    this.capture(key);\n    var value: any = \"true\";\n    if (this.peekStartsWith('=')) {\n      this.capture('=');\n      var valueMatch = matchUrlQueryParamValue(this.remaining);\n      if (valueMatch) {\n        value = valueMatch;\n        this.capture(value);\n      }\n    }\n    params[key] = value;\n  }\n\n  parseSecondarySegments(): TreeNode<UrlSegment>[] {\n    var segments = [];\n    this.capture('(');\n\n    while (!this.peekStartsWith(')') && this.remaining.length > 0) {\n      segments = segments.concat(this.parseSegments(true));\n      if (this.peekStartsWith('//')) {\n        this.capture('//');\n      }\n    }\n    this.capture(')');\n\n    return segments;\n  }\n}\n"]}
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/url_tree.d.ts b/modules/@angular/router/build/es6/src/url_tree.d.ts
deleted file mode 100644
index f9ea224dae..0000000000
--- a/modules/@angular/router/build/es6/src/url_tree.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Tree, TreeNode } from './utils/tree';
-export declare function createEmptyUrlTree(): UrlTree;
-export declare class UrlTree extends Tree<UrlSegment> {
-    queryParameters: {
-        [key: string]: string;
-    };
-    fragment: string | null;
-    constructor(root: TreeNode<UrlSegment>, queryParameters: {
-        [key: string]: string;
-    }, fragment: string | null);
-}
-export declare class UrlSegment {
-    path: string;
-    parameters: {
-        [key: string]: string;
-    };
-    outlet: string;
-    constructor(path: string, parameters: {
-        [key: string]: string;
-    }, outlet: string);
-    toString(): string;
-}
-export declare function equalUrlSegments(a: UrlSegment[], b: UrlSegment[]): boolean;
diff --git a/modules/@angular/router/build/es6/src/url_tree.js b/modules/@angular/router/build/es6/src/url_tree.js
deleted file mode 100644
index 197485284e..0000000000
--- a/modules/@angular/router/build/es6/src/url_tree.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Tree, TreeNode } from './utils/tree';
-import { shallowEqual } from './utils/collection';
-import { PRIMARY_OUTLET } from './shared';
-export function createEmptyUrlTree() {
-    return new UrlTree(new TreeNode(new UrlSegment("", {}, PRIMARY_OUTLET), []), {}, null);
-}
-export class UrlTree extends Tree {
-    constructor(root, queryParameters, fragment) {
-        super(root);
-        this.queryParameters = queryParameters;
-        this.fragment = fragment;
-    }
-}
-export class UrlSegment {
-    constructor(path, parameters, outlet) {
-        this.path = path;
-        this.parameters = parameters;
-        this.outlet = outlet;
-    }
-    toString() {
-        const params = [];
-        for (let prop in this.parameters) {
-            if (this.parameters.hasOwnProperty(prop)) {
-                params.push(`${prop}=${this.parameters[prop]}`);
-            }
-        }
-        const paramsString = params.length > 0 ? `(${params.join(',')})` : '';
-        const outlet = this.outlet === PRIMARY_OUTLET ? '' : `${this.outlet}:`;
-        return `${outlet}${this.path}${paramsString}`;
-    }
-}
-export function equalUrlSegments(a, b) {
-    if (a.length !== b.length)
-        return false;
-    for (let i = 0; i < a.length; ++i) {
-        if (a[i].path !== b[i].path)
-            return false;
-        if (!shallowEqual(a[i].parameters, b[i].parameters))
-            return false;
-    }
-    return true;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXJsX3RyZWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXJsX3RyZWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ik9BQU8sRUFBRSxJQUFJLEVBQUUsUUFBUSxFQUFFLE1BQU0sY0FBYztPQUN0QyxFQUFFLFlBQVksRUFBRSxNQUFNLG9CQUFvQjtPQUMxQyxFQUFFLGNBQWMsRUFBRSxNQUFNLFVBQVU7QUFFekM7SUFDRSxNQUFNLENBQUMsSUFBSSxPQUFPLENBQUMsSUFBSSxRQUFRLENBQWEsSUFBSSxVQUFVLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxjQUFjLENBQUMsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFDckcsQ0FBQztBQUtELDZCQUE2QixJQUFJO0lBSS9CLFlBQVksSUFBMEIsRUFBUyxlQUF3QyxFQUFTLFFBQXVCO1FBQ3JILE1BQU0sSUFBSSxDQUFDLENBQUM7UUFEaUMsb0JBQWUsR0FBZixlQUFlLENBQXlCO1FBQVMsYUFBUSxHQUFSLFFBQVEsQ0FBZTtJQUV2SCxDQUFDO0FBQ0gsQ0FBQztBQUVEO0lBSUUsWUFBbUIsSUFBWSxFQUFTLFVBQW1DLEVBQVMsTUFBYztRQUEvRSxTQUFJLEdBQUosSUFBSSxDQUFRO1FBQVMsZUFBVSxHQUFWLFVBQVUsQ0FBeUI7UUFBUyxXQUFNLEdBQU4sTUFBTSxDQUFRO0lBQUcsQ0FBQztJQUV0RyxRQUFRO1FBQ04sTUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ2xCLEdBQUcsQ0FBQyxDQUFDLElBQUksSUFBSSxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQ2pDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDekMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNsRCxDQUFDO1FBQ0gsQ0FBQztRQUNELE1BQU0sWUFBWSxHQUFHLE1BQU0sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxHQUFHLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxHQUFHLEVBQUUsQ0FBQztRQUN0RSxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxLQUFLLGNBQWMsR0FBRyxFQUFFLEdBQUcsR0FBRyxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDdkUsTUFBTSxDQUFDLEdBQUcsTUFBTSxHQUFHLElBQUksQ0FBQyxJQUFJLEdBQUcsWUFBWSxFQUFFLENBQUM7SUFDaEQsQ0FBQztBQUNILENBQUM7QUFFRCxpQ0FBaUMsQ0FBZSxFQUFFLENBQWU7SUFDL0QsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDO1FBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQztJQUN4QyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQztRQUNsQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFBQyxNQUFNLENBQUMsS0FBSyxDQUFDO1FBQzFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQztJQUNwRSxDQUFDO0lBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQztBQUNkLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUcmVlLCBUcmVlTm9kZSB9IGZyb20gJy4vdXRpbHMvdHJlZSc7XG5pbXBvcnQgeyBzaGFsbG93RXF1YWwgfSBmcm9tICcuL3V0aWxzL2NvbGxlY3Rpb24nO1xuaW1wb3J0IHsgUFJJTUFSWV9PVVRMRVQgfSBmcm9tICcuL3NoYXJlZCc7XG5cbmV4cG9ydCBmdW5jdGlvbiBjcmVhdGVFbXB0eVVybFRyZWUoKSB7XG4gIHJldHVybiBuZXcgVXJsVHJlZShuZXcgVHJlZU5vZGU8VXJsU2VnbWVudD4obmV3IFVybFNlZ21lbnQoXCJcIiwge30sIFBSSU1BUllfT1VUTEVUKSwgW10pLCB7fSwgbnVsbCk7XG59XG5cbi8qKlxuICogQSBVUkwgaW4gdGhlIHRyZWUgZm9ybS5cbiAqL1xuZXhwb3J0IGNsYXNzIFVybFRyZWUgZXh0ZW5kcyBUcmVlPFVybFNlZ21lbnQ+IHtcbiAgLyoqXG4gICAqIEBpbnRlcm5hbFxuICAgKi9cbiAgY29uc3RydWN0b3Iocm9vdDogVHJlZU5vZGU8VXJsU2VnbWVudD4sIHB1YmxpYyBxdWVyeVBhcmFtZXRlcnM6IHtba2V5OiBzdHJpbmddOiBzdHJpbmd9LCBwdWJsaWMgZnJhZ21lbnQ6IHN0cmluZyB8IG51bGwpIHtcbiAgICBzdXBlcihyb290KTtcbiAgfVxufVxuXG5leHBvcnQgY2xhc3MgVXJsU2VnbWVudCB7XG4gIC8qKlxuICAgKiBAaW50ZXJuYWxcbiAgICovXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyBwYXRoOiBzdHJpbmcsIHB1YmxpYyBwYXJhbWV0ZXJzOiB7W2tleTogc3RyaW5nXTogc3RyaW5nfSwgcHVibGljIG91dGxldDogc3RyaW5nKSB7fVxuXG4gIHRvU3RyaW5nKCkge1xuICAgIGNvbnN0IHBhcmFtcyA9IFtdO1xuICAgIGZvciAobGV0IHByb3AgaW4gdGhpcy5wYXJhbWV0ZXJzKSB7XG4gICAgICBpZiAodGhpcy5wYXJhbWV0ZXJzLmhhc093blByb3BlcnR5KHByb3ApKSB7XG4gICAgICAgIHBhcmFtcy5wdXNoKGAke3Byb3B9PSR7dGhpcy5wYXJhbWV0ZXJzW3Byb3BdfWApO1xuICAgICAgfVxuICAgIH1cbiAgICBjb25zdCBwYXJhbXNTdHJpbmcgPSBwYXJhbXMubGVuZ3RoID4gMCA/IGAoJHtwYXJhbXMuam9pbignLCcpfSlgIDogJyc7XG4gICAgY29uc3Qgb3V0bGV0ID0gdGhpcy5vdXRsZXQgPT09IFBSSU1BUllfT1VUTEVUID8gJycgOiBgJHt0aGlzLm91dGxldH06YDtcbiAgICByZXR1cm4gYCR7b3V0bGV0fSR7dGhpcy5wYXRofSR7cGFyYW1zU3RyaW5nfWA7XG4gIH1cbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGVxdWFsVXJsU2VnbWVudHMoYTogVXJsU2VnbWVudFtdLCBiOiBVcmxTZWdtZW50W10pOiBib29sZWFuIHtcbiAgaWYgKGEubGVuZ3RoICE9PSBiLmxlbmd0aCkgcmV0dXJuIGZhbHNlO1xuICBmb3IgKGxldCBpID0gMDsgaSA8IGEubGVuZ3RoOyArK2kpIHtcbiAgICBpZiAoYVtpXS5wYXRoICE9PSBiW2ldLnBhdGgpIHJldHVybiBmYWxzZTtcbiAgICBpZiAoIXNoYWxsb3dFcXVhbChhW2ldLnBhcmFtZXRlcnMsIGJbaV0ucGFyYW1ldGVycykpIHJldHVybiBmYWxzZTtcbiAgfVxuICByZXR1cm4gdHJ1ZTtcbn1cbiJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/utils/collection.d.ts b/modules/@angular/router/build/es6/src/utils/collection.d.ts
deleted file mode 100644
index 8b0d7d8a67..0000000000
--- a/modules/@angular/router/build/es6/src/utils/collection.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export declare function shallowEqual(a: {
-    [x: string]: any;
-}, b: {
-    [x: string]: any;
-}): boolean;
-export declare function flatten<T>(a: T[][]): T[];
-export declare function first<T>(a: T[]): T | null;
-export declare function and(bools: boolean[]): boolean;
-export declare function merge<V>(m1: {
-    [key: string]: V;
-}, m2: {
-    [key: string]: V;
-}): {
-    [key: string]: V;
-};
-export declare function forEach<K, V>(map: {
-    [key: string]: V;
-}, callback: Function): void;
diff --git a/modules/@angular/router/build/es6/src/utils/collection.js b/modules/@angular/router/build/es6/src/utils/collection.js
deleted file mode 100644
index f3ed6e7aec..0000000000
--- a/modules/@angular/router/build/es6/src/utils/collection.js
+++ /dev/null
@@ -1,52 +0,0 @@
-export function shallowEqual(a, b) {
-    var k1 = Object.keys(a);
-    var k2 = Object.keys(b);
-    if (k1.length != k2.length) {
-        return false;
-    }
-    var key;
-    for (var i = 0; i < k1.length; i++) {
-        key = k1[i];
-        if (a[key] !== b[key]) {
-            return false;
-        }
-    }
-    return true;
-}
-export function flatten(a) {
-    const target = [];
-    for (let i = 0; i < a.length; ++i) {
-        for (let j = 0; j < a[i].length; ++j) {
-            target.push(a[i][j]);
-        }
-    }
-    return target;
-}
-export function first(a) {
-    return a.length > 0 ? a[0] : null;
-}
-export function and(bools) {
-    return bools.reduce((a, b) => a && b, true);
-}
-export function merge(m1, m2) {
-    var m = {};
-    for (var attr in m1) {
-        if (m1.hasOwnProperty(attr)) {
-            m[attr] = m1[attr];
-        }
-    }
-    for (var attr in m2) {
-        if (m2.hasOwnProperty(attr)) {
-            m[attr] = m2[attr];
-        }
-    }
-    return m;
-}
-export function forEach(map, callback) {
-    for (var prop in map) {
-        if (map.hasOwnProperty(prop)) {
-            callback(map[prop], prop);
-        }
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy91dGlscy9jb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDZCQUE2QixDQUFtQixFQUFFLENBQW1CO0lBQ25FLElBQUksRUFBRSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDeEIsSUFBSSxFQUFFLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN4QixFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1FBQzNCLE1BQU0sQ0FBQyxLQUFLLENBQUM7SUFDZixDQUFDO0lBQ0QsSUFBSSxHQUFHLENBQUM7SUFDUixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNuQyxHQUFHLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ1osRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDdEIsTUFBTSxDQUFDLEtBQUssQ0FBQztRQUNmLENBQUM7SUFDSCxDQUFDO0lBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQztBQUNkLENBQUM7QUFFRCx3QkFBMkIsQ0FBUTtJQUNqQyxNQUFNLE1BQU0sR0FBRyxFQUFFLENBQUM7SUFDbEIsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUM7UUFDbEMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUM7WUFDckMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN2QixDQUFDO0lBQ0gsQ0FBQztJQUNELE1BQU0sQ0FBQyxNQUFNLENBQUM7QUFDaEIsQ0FBQztBQUVELHNCQUF5QixDQUFNO0lBQzdCLE1BQU0sQ0FBQyxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDO0FBQ3BDLENBQUM7QUFFRCxvQkFBb0IsS0FBZ0I7SUFDbEMsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFDN0MsQ0FBQztBQUVELHNCQUF5QixFQUFzQixFQUFFLEVBQXNCO0lBQ3JFLElBQUksQ0FBQyxHQUF1QixFQUFFLENBQUM7SUFFL0IsR0FBRyxDQUFDLENBQUMsSUFBSSxJQUFJLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztRQUNwQixFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM1QixDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3JCLENBQUM7SUFDSCxDQUFDO0lBRUQsR0FBRyxDQUFDLENBQUMsSUFBSSxJQUFJLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztRQUNwQixFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM1QixDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3JCLENBQUM7SUFDSCxDQUFDO0lBRUQsTUFBTSxDQUFDLENBQUMsQ0FBQztBQUNYLENBQUM7QUFFRCx3QkFBOEIsR0FBdUIsRUFBRSxRQUFxQztJQUMxRixHQUFHLENBQUMsQ0FBQyxJQUFJLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ3JCLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzdCLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDNUIsQ0FBQztJQUNILENBQUM7QUFDSCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIHNoYWxsb3dFcXVhbChhOiB7W3g6c3RyaW5nXTphbnl9LCBiOiB7W3g6c3RyaW5nXTphbnl9KTogYm9vbGVhbiB7XG4gIHZhciBrMSA9IE9iamVjdC5rZXlzKGEpO1xuICB2YXIgazIgPSBPYmplY3Qua2V5cyhiKTtcbiAgaWYgKGsxLmxlbmd0aCAhPSBrMi5sZW5ndGgpIHtcbiAgICByZXR1cm4gZmFsc2U7XG4gIH1cbiAgdmFyIGtleTtcbiAgZm9yICh2YXIgaSA9IDA7IGkgPCBrMS5sZW5ndGg7IGkrKykge1xuICAgIGtleSA9IGsxW2ldO1xuICAgIGlmIChhW2tleV0gIT09IGJba2V5XSkge1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH1cbiAgfVxuICByZXR1cm4gdHJ1ZTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGZsYXR0ZW48VD4oYTogVFtdW10pOiBUW10ge1xuICBjb25zdCB0YXJnZXQgPSBbXTtcbiAgZm9yIChsZXQgaSA9IDA7IGkgPCBhLmxlbmd0aDsgKytpKSB7XG4gICAgZm9yIChsZXQgaiA9IDA7IGogPCBhW2ldLmxlbmd0aDsgKytqKSB7XG4gICAgICB0YXJnZXQucHVzaChhW2ldW2pdKTtcbiAgICB9XG4gIH1cbiAgcmV0dXJuIHRhcmdldDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGZpcnN0PFQ+KGE6IFRbXSk6IFQgfCBudWxsIHtcbiAgcmV0dXJuIGEubGVuZ3RoID4gMCA/IGFbMF0gOiBudWxsO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gYW5kKGJvb2xzOiBib29sZWFuW10pOiBib29sZWFuIHtcbiAgcmV0dXJuIGJvb2xzLnJlZHVjZSgoYSxiKSA9PiBhICYmIGIsIHRydWUpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbWVyZ2U8Vj4obTE6IHtba2V5OiBzdHJpbmddOiBWfSwgbTI6IHtba2V5OiBzdHJpbmddOiBWfSk6IHtba2V5OiBzdHJpbmddOiBWfSB7XG4gIHZhciBtOiB7W2tleTogc3RyaW5nXTogVn0gPSB7fTtcblxuICBmb3IgKHZhciBhdHRyIGluIG0xKSB7XG4gICAgaWYgKG0xLmhhc093blByb3BlcnR5KGF0dHIpKSB7XG4gICAgICBtW2F0dHJdID0gbTFbYXR0cl07XG4gICAgfVxuICB9XG5cbiAgZm9yICh2YXIgYXR0ciBpbiBtMikge1xuICAgIGlmIChtMi5oYXNPd25Qcm9wZXJ0eShhdHRyKSkge1xuICAgICAgbVthdHRyXSA9IG0yW2F0dHJdO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBtO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZm9yRWFjaDxLLCBWPihtYXA6IHtba2V5OiBzdHJpbmddOiBWfSwgY2FsbGJhY2s6IC8qKFYsIEspID0+IHZvaWQqLyBGdW5jdGlvbik6IHZvaWQge1xuICBmb3IgKHZhciBwcm9wIGluIG1hcCkge1xuICAgIGlmIChtYXAuaGFzT3duUHJvcGVydHkocHJvcCkpIHtcbiAgICAgIGNhbGxiYWNrKG1hcFtwcm9wXSwgcHJvcCk7XG4gICAgfVxuICB9XG59Il19
\ No newline at end of file
diff --git a/modules/@angular/router/build/es6/src/utils/tree.d.ts b/modules/@angular/router/build/es6/src/utils/tree.d.ts
deleted file mode 100644
index 1b28a53874..0000000000
--- a/modules/@angular/router/build/es6/src/utils/tree.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export declare class Tree<T> {
-    _root: TreeNode<T>;
-    constructor(root: TreeNode<T>);
-    readonly root: T;
-    parent(t: T): T | null;
-    children(t: T): T[];
-    firstChild(t: T): T | null;
-    siblings(t: T): T[];
-    pathFromRoot(t: T): T[];
-    contains(tree: Tree<T>): boolean;
-}
-export declare class TreeNode<T> {
-    value: T;
-    children: TreeNode<T>[];
-    constructor(value: T, children: TreeNode<T>[]);
-}
diff --git a/modules/@angular/router/build/es6/src/utils/tree.js b/modules/@angular/router/build/es6/src/utils/tree.js
deleted file mode 100644
index 20926871fa..0000000000
--- a/modules/@angular/router/build/es6/src/utils/tree.js
+++ /dev/null
@@ -1,68 +0,0 @@
-export class Tree {
-    constructor(root) {
-        this._root = root;
-    }
-    get root() { return this._root.value; }
-    parent(t) {
-        const p = this.pathFromRoot(t);
-        return p.length > 1 ? p[p.length - 2] : null;
-    }
-    children(t) {
-        const n = findNode(t, this._root);
-        return n ? n.children.map(t => t.value) : [];
-    }
-    firstChild(t) {
-        const n = findNode(t, this._root);
-        return n && n.children.length > 0 ? n.children[0].value : null;
-    }
-    siblings(t) {
-        const p = findPath(t, this._root, []);
-        if (p.length < 2)
-            return [];
-        const c = p[p.length - 2].children.map(c => c.value);
-        return c.filter(cc => cc !== t);
-    }
-    pathFromRoot(t) { return findPath(t, this._root, []).map(s => s.value); }
-    contains(tree) { return contains(this._root, tree._root); }
-}
-function findNode(expected, c) {
-    if (expected === c.value)
-        return c;
-    for (let cc of c.children) {
-        const r = findNode(expected, cc);
-        if (r)
-            return r;
-    }
-    return null;
-}
-function findPath(expected, c, collected) {
-    collected.push(c);
-    if (expected === c.value)
-        return collected;
-    for (let cc of c.children) {
-        const cloned = collected.slice(0);
-        const r = findPath(expected, cc, cloned);
-        if (r)
-            return r;
-    }
-    return [];
-}
-function contains(tree, subtree) {
-    if (tree.value !== subtree.value)
-        return false;
-    for (let subtreeNode of subtree.children) {
-        const s = tree.children.filter(child => child.value === subtreeNode.value);
-        if (s.length === 0)
-            return false;
-        if (!contains(s[0], subtreeNode))
-            return false;
-    }
-    return true;
-}
-export class TreeNode {
-    constructor(value, children) {
-        this.value = value;
-        this.children = children;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy91dGlscy90cmVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBO0lBSUUsWUFBWSxJQUFpQjtRQUFJLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDO0lBQUMsQ0FBQztJQUVyRCxJQUFJLElBQUksS0FBUSxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO0lBRTFDLE1BQU0sQ0FBQyxDQUFJO1FBQ1QsTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUMvQixNQUFNLENBQUMsQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDO0lBQy9DLENBQUM7SUFFRCxRQUFRLENBQUMsQ0FBSTtRQUNYLE1BQU0sQ0FBQyxHQUFHLFFBQVEsQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ2xDLE1BQU0sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDL0MsQ0FBQztJQUVELFVBQVUsQ0FBQyxDQUFJO1FBQ2IsTUFBTSxDQUFDLEdBQUcsUUFBUSxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDbEMsTUFBTSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDO0lBQ2pFLENBQUM7SUFFRCxRQUFRLENBQUMsQ0FBSTtRQUNYLE1BQU0sQ0FBQyxHQUFHLFFBQVEsQ0FB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QUFNLENBQUMsS0FBSyxDQUFDO0lBQ2pELENBQUM7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQUVEO0lBQ0UsWUFBbUIsS0FBUSxFQUFTLFFBQXVCO1FBQXhDLFVBQUssR0FBTCxLQUFLLENBQUc7UUFBUyxhQUFRLEdBQVIsUUFBUSxDQUFlO0lBQUcsQ0FBQztBQUNqRSxDQUFDO0FBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgY2xhc3MgVHJlZTxUPiB7XG4gIC8qKiBAaW50ZXJuYWwgKi9cbiAgX3Jvb3Q6IFRyZWVOb2RlPFQ+O1xuXG4gIGNvbnN0cnVjdG9yKHJvb3Q6IFRyZWVOb2RlPFQ+KSB7IHRoaXMuX3Jvb3QgPSByb290OyB9XG5cbiAgZ2V0IHJvb3QoKTogVCB7IHJldHVybiB0aGlzLl9yb290LnZhbHVlOyB9XG5cbiAgcGFyZW50KHQ6IFQpOiBUIHwgbnVsbCB7XG4gICAgY29uc3QgcCA9IHRoaXMucGF0aEZyb21Sb290KHQpO1xuICAgIHJldHVybiBwLmxlbmd0aCA+IDEgPyBwW3AubGVuZ3RoIC0gMl0gOiBudWxsO1xuICB9XG5cbiAgY2hpbGRyZW4odDogVCk6IFRbXSB7XG4gICAgY29uc3QgbiA9IGZpbmROb2RlKHQsIHRoaXMuX3Jvb3QpO1xuICAgIHJldHVybiBuID8gbi5jaGlsZHJlbi5tYXAodCA9PiB0LnZhbHVlKSA6IFtdO1xuICB9XG5cbiAgZmlyc3RDaGlsZCh0OiBUKTogVCB8IG51bGwge1xuICAgIGNvbnN0IG4gPSBmaW5kTm9kZSh0LCB0aGlzLl9yb290KTtcbiAgICByZXR1cm4gbiAmJiBuLmNoaWxkcmVuLmxlbmd0aCA+IDAgPyBuLmNoaWxkcmVuWzBdLnZhbHVlIDogbnVsbDtcbiAgfVxuXG4gIHNpYmxpbmdzKHQ6IFQpOiBUW10ge1xuICAgIGNvbnN0IHAgPSBmaW5kUGF0aCh0LCB0aGlzLl9yb290LCBbXSk7XG4gICAgaWYgKHAubGVuZ3RoIDwgMikgcmV0dXJuIFtdO1xuXG4gICAgY29uc3QgYyA9IHBbcC5sZW5ndGggLSAyXS5jaGlsZHJlbi5tYXAoYyA9PiBjLnZhbHVlKTtcbiAgICByZXR1cm4gYy5maWx0ZXIoY2MgPT4gY2MgIT09IHQpO1xuICB9XG5cbiAgcGF0aEZyb21Sb290KHQ6IFQpOiBUW10geyByZXR1cm4gZmluZFBhdGgodCwgdGhpcy5fcm9vdCwgW10pLm1hcChzID0+IHMudmFsdWUpOyB9XG5cbiAgY29udGFpbnModHJlZTogVHJlZTxUPik6IGJvb2xlYW4geyByZXR1cm4gY29udGFpbnModGhpcy5fcm9vdCwgdHJlZS5fcm9vdCk7IH1cbn1cblxuZnVuY3Rpb24gZmluZE5vZGU8VD4oZXhwZWN0ZWQ6IFQsIGM6IFRyZWVOb2RlPFQ+KTogVHJlZU5vZGU8VD4gfCBudWxsIHtcbiAgaWYgKGV4cGVjdGVkID09PSBjLnZhbHVlKSByZXR1cm4gYztcbiAgZm9yIChsZXQgY2Mgb2YgYy5jaGlsZHJlbikge1xuICAgIGNvbnN0IHIgPSBmaW5kTm9kZShleHBlY3RlZCwgY2MpO1xuICAgIGlmIChyKSByZXR1cm4gcjtcbiAgfVxuICByZXR1cm4gbnVsbDtcbn1cblxuZnVuY3Rpb24gZmluZFBhdGg8VD4oZXhwZWN0ZWQ6IFQsIGM6IFRyZWVOb2RlPFQ+LCBjb2xsZWN0ZWQ6IFRyZWVOb2RlPFQ+W10pOiBUcmVlTm9kZTxUPltdIHtcbiAgY29sbGVjdGVkLnB1c2goYyk7XG4gIGlmIChleHBlY3RlZCA9PT0gYy52YWx1ZSkgcmV0dXJuIGNvbGxlY3RlZDtcblxuICBmb3IgKGxldCBjYyBvZiBjLmNoaWxkcmVuKSB7XG4gICAgY29uc3QgY2xvbmVkID0gY29sbGVjdGVkLnNsaWNlKDApO1xuICAgIGNvbnN0IHIgPSBmaW5kUGF0aChleHBlY3RlZCwgY2MsIGNsb25lZCk7XG4gICAgaWYgKHIpIHJldHVybiByO1xuICB9XG5cbiAgcmV0dXJuIFtdO1xufVxuXG5mdW5jdGlvbiBjb250YWluczxUPih0cmVlOiBUcmVlTm9kZTxUPiwgc3VidHJlZTogVHJlZU5vZGU8VD4pOiBib29sZWFuIHtcbiAgaWYgKHRyZWUudmFsdWUgIT09IHN1YnRyZWUudmFsdWUpIHJldHVybiBmYWxzZTtcblxuICBmb3IgKGxldCBzdWJ0cmVlTm9kZSBvZiBzdWJ0cmVlLmNoaWxkcmVuKSB7XG4gICAgY29uc3QgcyA9IHRyZWUuY2hpbGRyZW4uZmlsdGVyKGNoaWxkID0+IGNoaWxkLnZhbHVlID09PSBzdWJ0cmVlTm9kZS52YWx1ZSk7XG4gICAgaWYgKHMubGVuZ3RoID09PSAwKSByZXR1cm4gZmFsc2U7XG4gICAgaWYgKCFjb250YWlucyhzWzBdLCBzdWJ0cmVlTm9kZSkpIHJldHVybiBmYWxzZTtcbiAgfVxuXG4gIHJldHVybiB0cnVlO1xufVxuXG5leHBvcnQgY2xhc3MgVHJlZU5vZGU8VD4ge1xuICBjb25zdHJ1Y3RvcihwdWJsaWMgdmFsdWU6IFQsIHB1YmxpYyBjaGlsZHJlbjogVHJlZU5vZGU8VD5bXSkge31cbn0iXX0=
\ No newline at end of file
diff --git a/modules/@angular/router/build/package.json b/modules/@angular/router/build/package.json
deleted file mode 100644
index 312420f918..0000000000
--- a/modules/@angular/router/build/package.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "name": "vladivostok",
-  "version": "0.9.1",
-  "description": "",
-  "main": "./build/src/index.js",
-  "jsnext:main": "./build/es6/index.js",
-  "scripts": {
-    "karma": "karma start",
-    "test": "npm run build; karma start",
-    "build_watch": "rm -rf dist; tsc -w",
-    "build": "rm -rf dist; tsc",
-    "build_npm": "rm -rf dist && tsc -p tsconfig.publish.es5.json && tsc -p tsconfig.publish.es6.json",
-    "postbuild_npm": "cp package.json README.md dist/ && npm run rewrite_npm_package",
-    "rewrite_npm_package": "node --harmony_destructuring tools/rewrite-published-package.js",
-    "build_bundle": "cp -r src router && tsc typings/index.d.ts src/router.ts --rootDir . --module system -t es5 --outFile dist/bundles/router.js  --moduleResolution node --emitDecoratorMetadata --experimentalDecorators"
-  },
-  "keywords": [
-    "angular2",
-    "angular",
-    "router"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/angular/vladivostok.git"
-  },
-  "author": "vsavkin",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/angular/vladivostok/issues"
-  },
-  "homepage": "https://github.com/angular/vladivostok#readme",
-  "devDependencies": {
-    "es6-module-loader": "^0.17.10",
-    "es6-shim": "^0.35.0",
-    "gulp": "^3.9.0",
-    "gulp-jasmine": "^2.2.1",
-    "gulp-typescript": "^2.10.0",
-    "http-server": "^0.8.5",
-    "jasmine": "^2.4.1",
-    "jasmine-core": "^2.4.1",
-    "json": "^9.0.3",
-    "karma": "^0.13.19",
-    "karma-chrome-launcher": "^0.2.2",
-    "karma-firefox-launcher": "^0.1.7",
-    "karma-jasmine": "^0.3.6",
-    "karma-systemjs": "^0.10.0",
-    "karma-sourcemap-loader": "~0.3",
-    "parse5": "^1.3.2",
-    "protractor": "3.0.0",
-    "reflect-metadata": "0.1.2",
-    "systemjs": "^0.19.16",
-    "systemjs-builder": "^0.15.7",
-    "traceur": "0.0.96",
-    "tsd": "^0.6.5",
-    "typescript": "^1.9.0-dev.20160409",
-    "typings": "^1.0.4",
-    "zone.js": "^0.6.6"
-  },
-  "typings": "router.d.ts",
-  "peerDependencies": {
-    "@angular/common": "2.0.0-rc.1",
-    "@angular/compiler": "2.0.0-rc.1",
-    "@angular/core": "2.0.0-rc.1",
-    "@angular/platform-browser": "2.0.0-rc.1",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.1",
-    "rxjs": "5.0.0-beta.6"
-  }
-}
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/common_router_providers.d.ts b/modules/@angular/router/build/src/common_router_providers.d.ts
deleted file mode 100644
index dea74761c8..0000000000
--- a/modules/@angular/router/build/src/common_router_providers.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { RouterConfig } from './config';
-export declare function provideRouter(config: RouterConfig): any[];
diff --git a/modules/@angular/router/build/src/common_router_providers.js b/modules/@angular/router/build/src/common_router_providers.js
deleted file mode 100644
index 7f29cf6abb..0000000000
--- a/modules/@angular/router/build/src/common_router_providers.js
+++ /dev/null
@@ -1,32 +0,0 @@
-"use strict";
-var router_outlet_map_1 = require('./router_outlet_map');
-var url_serializer_1 = require('./url_serializer');
-var router_state_1 = require('./router_state');
-var router_1 = require('./router');
-var core_1 = require('@angular/core');
-var common_1 = require('@angular/common');
-function provideRouter(config) {
-    return [
-        common_1.Location,
-        { provide: common_1.LocationStrategy, useClass: common_1.PathLocationStrategy },
-        { provide: url_serializer_1.UrlSerializer, useClass: url_serializer_1.DefaultUrlSerializer },
-        {
-            provide: router_1.Router,
-            useFactory: function (ref, resolver, urlSerializer, outletMap, location, injector) {
-                if (ref.componentTypes.length == 0) {
-                    throw new Error("Bootstrap at least one component before injecting Router.");
-                }
-                var componentType = ref.componentTypes[0];
-                var r = new router_1.Router(componentType, resolver, urlSerializer, outletMap, location, injector);
-                r.resetConfig(config);
-                ref.registerDisposeListener(function () { return r.dispose(); });
-                return r;
-            },
-            deps: [core_1.ApplicationRef, core_1.ComponentResolver, url_serializer_1.UrlSerializer, router_outlet_map_1.RouterOutletMap, common_1.Location, core_1.Injector]
-        },
-        router_outlet_map_1.RouterOutletMap,
-        { provide: router_state_1.ActivatedRoute, useFactory: function (r) { return r.routerState.root; }, deps: [router_1.Router] },
-    ];
-}
-exports.provideRouter = provideRouter;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbW9uX3JvdXRlcl9wcm92aWRlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbW9uX3JvdXRlcl9wcm92aWRlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLGtDQUFnQyxxQkFBcUIsQ0FBQyxDQUFBO0FBQ3RELCtCQUFvRCxrQkFBa0IsQ0FBQyxDQUFBO0FBQ3ZFLDZCQUErQixnQkFBZ0IsQ0FBQyxDQUFBO0FBQ2hELHVCQUF1QixVQUFVLENBQUMsQ0FBQTtBQUVsQyxxQkFBNEQsZUFBZSxDQUFDLENBQUE7QUFDNUUsdUJBQWlFLGlCQUFpQixDQUFDLENBQUE7QUFvQm5GLHVCQUE4QixNQUFvQjtJQUNoRCxNQUFNLENBQUM7UUFDTCxpQkFBUTtRQUNSLEVBQUMsT0FBTyxFQUFFLHlCQUFnQixFQUFFLFFBQVEsRUFBRSw2QkFBb0IsRUFBQztRQUMzRCxFQUFDLE9BQU8sRUFBRSw4QkFBYSxFQUFFLFFBQVEsRUFBRSxxQ0FBb0IsRUFBQztRQUV4RDtZQUNFLE9BQU8sRUFBRSxlQUFNO1lBQ2YsVUFBVSxFQUFFLFVBQUMsR0FBRyxFQUFFLFFBQVEsRUFBRSxhQUFhLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxRQUFRO2dCQUN0RSxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLE1BQU0sSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNuQyxNQUFNLElBQUksS0FBSyxDQUFDLDJEQUEyRCxDQUFDLENBQUM7Z0JBQy9FLENBQUM7Z0JBQ0QsSUFBTSxhQUFhLEdBQUcsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDNUMsSUFBTSxDQUFDLEdBQUcsSUFBSSxlQUFNLENBQUMsYUFBYSxFQUFFLFFBQVEsRUFBRSxhQUFhLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQztnQkFDNUYsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQztnQkFDdEIsR0FBRyxDQUFDLHVCQUF1QixDQUFDLGNBQU0sT0FBQSxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQVgsQ0FBVyxDQUFDLENBQUM7Z0JBQy9DLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDWCxDQUFDO1lBQ0QsSUFBSSxFQUFFLENBQUMscUJBQWMsRUFBRSx3QkFBaUIsRUFBRSw4QkFBYSxFQUFFLG1DQUFlLEVBQUUsaUJBQVEsRUFBRSxlQUFRLENBQUM7U0FDOUY7UUFFRCxtQ0FBZTtRQUNmLEVBQUMsT0FBTyxFQUFFLDZCQUFjLEVBQUUsVUFBVSxFQUFFLFVBQUMsQ0FBQyxJQUFLLE9BQUEsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxJQUFJLEVBQWxCLENBQWtCLEVBQUUsSUFBSSxFQUFFLENBQUMsZUFBTSxDQUFDLEVBQUM7S0FDakYsQ0FBQztBQUNKLENBQUM7QUF4QmUscUJBQWEsZ0JBd0I1QixDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUm91dGVyT3V0bGV0TWFwIH0gZnJvbSAnLi9yb3V0ZXJfb3V0bGV0X21hcCc7XG5pbXBvcnQgeyBVcmxTZXJpYWxpemVyLCBEZWZhdWx0VXJsU2VyaWFsaXplciB9IGZyb20gJy4vdXJsX3NlcmlhbGl6ZXInO1xuaW1wb3J0IHsgQWN0aXZhdGVkUm91dGUgfSBmcm9tICcuL3JvdXRlcl9zdGF0ZSc7XG5pbXBvcnQgeyBSb3V0ZXIgfSBmcm9tICcuL3JvdXRlcic7XG5pbXBvcnQgeyBSb3V0ZXJDb25maWcgfSBmcm9tICcuL2NvbmZpZyc7XG5pbXBvcnQgeyBDb21wb25lbnRSZXNvbHZlciwgQXBwbGljYXRpb25SZWYsIEluamVjdG9yIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBMb2NhdGlvblN0cmF0ZWd5LCBQYXRoTG9jYXRpb25TdHJhdGVneSwgTG9jYXRpb24gfSBmcm9tICdAYW5ndWxhci9jb21tb24nO1xuXG4vKipcbiAqIEEgbGlzdCBvZiB7QGxpbmsgUHJvdmlkZXJ9cy4gVG8gdXNlIHRoZSByb3V0ZXIsIHlvdSBtdXN0IGFkZCB0aGlzIHRvIHlvdXIgYXBwbGljYXRpb24uXG4gKlxuICogIyMjIEV4YW1wbGVcbiAqXG4gKiBgYGBcbiAqIEBDb21wb25lbnQoe2RpcmVjdGl2ZXM6IFtST1VURVJfRElSRUNUSVZFU119KVxuICogY2xhc3MgQXBwQ21wIHtcbiAqICAgLy8gLi4uXG4gKiB9XG4gKlxuICogY29uc3Qgcm91dGVyID0gW1xuICogICB7cGF0aDogJy9ob21lJywgY29tcG9uZW50OiBIb21lfVxuICogXTtcbiAqXG4gKiBib290c3RyYXAoQXBwQ21wLCBbcHJvdmlkZVJvdXRlcihyb3V0ZXIpXSk7XG4gKiBgYGBcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHByb3ZpZGVSb3V0ZXIoY29uZmlnOiBSb3V0ZXJDb25maWcpOmFueVtdIHtcbiAgcmV0dXJuIFtcbiAgICBMb2NhdGlvbixcbiAgICB7cHJvdmlkZTogTG9jYXRpb25TdHJhdGVneSwgdXNlQ2xhc3M6IFBhdGhMb2NhdGlvblN0cmF0ZWd5fSxcbiAgICB7cHJvdmlkZTogVXJsU2VyaWFsaXplciwgdXNlQ2xhc3M6IERlZmF1bHRVcmxTZXJpYWxpemVyfSxcblxuICAgIHtcbiAgICAgIHByb3ZpZGU6IFJvdXRlcixcbiAgICAgIHVzZUZhY3Rvcnk6IChyZWYsIHJlc29sdmVyLCB1cmxTZXJpYWxpemVyLCBvdXRsZXRNYXAsIGxvY2F0aW9uLCBpbmplY3RvcikgPT4ge1xuICAgICAgICBpZiAocmVmLmNvbXBvbmVudFR5cGVzLmxlbmd0aCA9PSAwKSB7XG4gICAgICAgICAgdGhyb3cgbmV3IEVycm9yKFwiQm9vdHN0cmFwIGF0IGxlYXN0IG9uZSBjb21wb25lbnQgYmVmb3JlIGluamVjdGluZyBSb3V0ZXIuXCIpO1xuICAgICAgICB9XG4gICAgICAgIGNvbnN0IGNvbXBvbmVudFR5cGUgPSByZWYuY29tcG9uZW50VHlwZXNbMF07XG4gICAgICAgIGNvbnN0IHIgPSBuZXcgUm91dGVyKGNvbXBvbmVudFR5cGUsIHJlc29sdmVyLCB1cmxTZXJpYWxpemVyLCBvdXRsZXRNYXAsIGxvY2F0aW9uLCBpbmplY3Rvcik7XG4gICAgICAgIHIucmVzZXRDb25maWcoY29uZmlnKTtcbiAgICAgICAgcmVmLnJlZ2lzdGVyRGlzcG9zZUxpc3RlbmVyKCgpID0+IHIuZGlzcG9zZSgpKTtcbiAgICAgICAgcmV0dXJuIHI7XG4gICAgICB9LFxuICAgICAgZGVwczogW0FwcGxpY2F0aW9uUmVmLCBDb21wb25lbnRSZXNvbHZlciwgVXJsU2VyaWFsaXplciwgUm91dGVyT3V0bGV0TWFwLCBMb2NhdGlvbiwgSW5qZWN0b3JdXG4gICAgfSxcblxuICAgIFJvdXRlck91dGxldE1hcCxcbiAgICB7cHJvdmlkZTogQWN0aXZhdGVkUm91dGUsIHVzZUZhY3Rvcnk6IChyKSA9PiByLnJvdXRlclN0YXRlLnJvb3QsIGRlcHM6IFtSb3V0ZXJdfSxcbiAgXTtcbn1cbiJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/config.d.ts b/modules/@angular/router/build/src/config.d.ts
deleted file mode 100644
index 2074d71163..0000000000
--- a/modules/@angular/router/build/src/config.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Type } from '@angular/core';
-export declare type RouterConfig = Route[];
-export interface Route {
-    index?: boolean;
-    path?: string;
-    component: Type | string;
-    outlet?: string;
-    canActivate?: any[];
-    canDeactivate?: any[];
-    children?: Route[];
-}
diff --git a/modules/@angular/router/build/src/config.js b/modules/@angular/router/build/src/config.js
deleted file mode 100644
index b6bbebb9a9..0000000000
--- a/modules/@angular/router/build/src/config.js
+++ /dev/null
@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHlwZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5leHBvcnQgdHlwZSBSb3V0ZXJDb25maWcgPSBSb3V0ZVtdO1xuXG5leHBvcnQgaW50ZXJmYWNlIFJvdXRlIHtcbiAgaW5kZXg/OiBib29sZWFuO1xuICBwYXRoPzogc3RyaW5nO1xuICBjb21wb25lbnQ6IFR5cGUgfCBzdHJpbmc7XG4gIG91dGxldD86IHN0cmluZztcbiAgY2FuQWN0aXZhdGU/OiBhbnlbXSxcbiAgY2FuRGVhY3RpdmF0ZT86IGFueVtdLFxuICBjaGlsZHJlbj86IFJvdXRlW107XG59Il19
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/create_router_state.d.ts b/modules/@angular/router/build/src/create_router_state.d.ts
deleted file mode 100644
index 4ff54a3c73..0000000000
--- a/modules/@angular/router/build/src/create_router_state.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { RouterStateSnapshot, RouterState } from './router_state';
-export declare function createRouterState(curr: RouterStateSnapshot, prevState: RouterState): RouterState;
diff --git a/modules/@angular/router/build/src/create_router_state.js b/modules/@angular/router/build/src/create_router_state.js
deleted file mode 100644
index a78bf13a11..0000000000
--- a/modules/@angular/router/build/src/create_router_state.js
+++ /dev/null
@@ -1,42 +0,0 @@
-"use strict";
-var router_state_1 = require('./router_state');
-var tree_1 = require('./utils/tree');
-var BehaviorSubject_1 = require('rxjs/BehaviorSubject');
-function createRouterState(curr, prevState) {
-    var root = createNode(curr._root, prevState ? prevState._root : undefined);
-    var queryParams = prevState ? prevState.queryParams : new BehaviorSubject_1.BehaviorSubject(curr.queryParams);
-    var fragment = prevState ? prevState.fragment : new BehaviorSubject_1.BehaviorSubject(curr.fragment);
-    return new router_state_1.RouterState(root, queryParams, fragment, curr);
-}
-exports.createRouterState = createRouterState;
-function createNode(curr, prevState) {
-    if (prevState && equalRouteSnapshots(prevState.value.snapshot, curr.value)) {
-        var value = prevState.value;
-        value._futureSnapshot = curr.value;
-        var children = createOrReuseChildren(curr, prevState);
-        return new tree_1.TreeNode(value, children);
-    }
-    else {
-        var value = createActivatedRoute(curr.value);
-        var children = curr.children.map(function (c) { return createNode(c); });
-        return new tree_1.TreeNode(value, children);
-    }
-}
-function createOrReuseChildren(curr, prevState) {
-    return curr.children.map(function (child) {
-        var index = prevState.children.findIndex(function (p) { return equalRouteSnapshots(p.value.snapshot, child.value); });
-        if (index >= 0) {
-            return createNode(child, prevState.children[index]);
-        }
-        else {
-            return createNode(child);
-        }
-    });
-}
-function createActivatedRoute(c) {
-    return new router_state_1.ActivatedRoute(new BehaviorSubject_1.BehaviorSubject(c.urlSegments), new BehaviorSubject_1.BehaviorSubject(c.params), c.outlet, c.component, c);
-}
-function equalRouteSnapshots(a, b) {
-    return a._routeConfig === b._routeConfig;
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX3JvdXRlcl9zdGF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jcmVhdGVfcm91dGVyX3N0YXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSw2QkFBeUYsZ0JBQWdCLENBQUMsQ0FBQTtBQUMxRyxxQkFBeUIsY0FBYyxDQUFDLENBQUE7QUFDeEMsZ0NBQWdDLHNCQUFzQixDQUFDLENBQUE7QUFFdkQsMkJBQWtDLElBQXlCLEVBQUUsU0FBc0I7SUFDakYsSUFBTSxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsU0FBUyxHQUFHLFNBQVMsQ0FBQyxLQUFLLEdBQUcsU0FBUyxDQUFDLENBQUM7SUFDN0UsSUFBTSxXQUFXLEdBQUcsU0FBUyxHQUFHLFNBQVMsQ0FBQyxXQUFXLEdBQUcsSUFBSSxpQ0FBZSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUM5RixJQUFNLFFBQVEsR0FBRyxTQUFTLEdBQUcsU0FBUyxDQUFDLFFBQVEsR0FBRyxJQUFJLGlDQUFlLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3JGLE1BQU0sQ0FBQyxJQUFJLDBCQUFXLENBQUMsSUFBSSxFQUFFLFdBQVcsRUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFDNUQsQ0FBQztBQUxlLHlCQUFpQixvQkFLaEMsQ0FBQTtBQUVELG9CQUFvQixJQUFxQyxFQUFFLFNBQW1DO0lBQzVGLEVBQUUsQ0FBQyxDQUFDLFNBQVMsSUFBSSxtQkFBbUIsQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzNFLElBQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxLQUFLLENBQUM7UUFDOUIsS0FBSyxDQUFDLGVBQWUsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDO1FBRW5DLElBQU0sUUFBUSxHQUFHLHFCQUFxQixDQUFDLElBQUksRUFBRSxTQUFTLENBQUMsQ0FBQztRQUN4RCxNQUFNLENBQUMsSUFBSSxlQUFRLENBQWlCLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQztJQUV2RCxDQUFDO0lBQUMsSUFBSSxDQUFDLENBQUM7UUFDTixJQUFNLEtBQUssR0FBRyxvQkFBb0IsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDL0MsSUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsVUFBQSxDQUFDLElBQUksT0FBQSxVQUFVLENBQUMsQ0FBQyxDQUFDLEVBQWIsQ0FBYSxDQUFDLENBQUM7UUFDdkQsTUFBTSxDQUFDLElBQUksZUFBUSxDQUFpQixLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDdkQsQ0FBQztBQUNILENBQUM7QUFFRCwrQkFBK0IsSUFBcUMsRUFBRSxTQUFrQztJQUN0RyxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsVUFBQSxLQUFLO1FBQzVCLElBQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLFVBQUEsQ0FBQyxJQUFJLE9BQUEsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUUsS0FBSyxDQUFDLEtBQUssQ0FBQyxFQUFsRCxDQUFrRCxDQUFDLENBQUM7UUFDcEcsRUFBRSxDQUFDLENBQUMsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDZixNQUFNLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxTQUFTLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7UUFDdEQsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ04sTUFBTSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzQixDQUFDO0lBQ0gsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBRUQsOEJBQThCLENBQXdCO0lBQ3BELE1BQU0sQ0FBQyxJQUFJLDZCQUFjLENBQUMsSUFBSSxpQ0FBZSxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsRUFBRSxJQUFJLGlDQUFlLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQztBQUN6SCxDQUFDO0FBRUQsNkJBQTZCLENBQXlCLEVBQUUsQ0FBeUI7SUFDL0UsTUFBTSxDQUFDLENBQUMsQ0FBQyxZQUFZLEtBQUssQ0FBQyxDQUFDLFlBQVksQ0FBQztBQUMzQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgUm91dGVyU3RhdGVTbmFwc2hvdCwgQWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgUm91dGVyU3RhdGUsIEFjdGl2YXRlZFJvdXRlIH0gZnJvbSAnLi9yb3V0ZXJfc3RhdGUnO1xuaW1wb3J0IHsgVHJlZU5vZGUgfSBmcm9tICcuL3V0aWxzL3RyZWUnO1xuaW1wb3J0IHsgQmVoYXZpb3JTdWJqZWN0IH0gZnJvbSAncnhqcy9CZWhhdmlvclN1YmplY3QnO1xuXG5leHBvcnQgZnVuY3Rpb24gY3JlYXRlUm91dGVyU3RhdGUoY3VycjogUm91dGVyU3RhdGVTbmFwc2hvdCwgcHJldlN0YXRlOiBSb3V0ZXJTdGF0ZSk6IFJvdXRlclN0YXRlIHtcbiAgY29uc3Qgcm9vdCA9IGNyZWF0ZU5vZGUoY3Vyci5fcm9vdCwgcHJldlN0YXRlID8gcHJldlN0YXRlLl9yb290IDogdW5kZWZpbmVkKTtcbiAgY29uc3QgcXVlcnlQYXJhbXMgPSBwcmV2U3RhdGUgPyBwcmV2U3RhdGUucXVlcnlQYXJhbXMgOiBuZXcgQmVoYXZpb3JTdWJqZWN0KGN1cnIucXVlcnlQYXJhbXMpO1xuICBjb25zdCBmcmFnbWVudCA9IHByZXZTdGF0ZSA/IHByZXZTdGF0ZS5mcmFnbWVudCA6IG5ldyBCZWhhdmlvclN1YmplY3QoY3Vyci5mcmFnbWVudCk7XG4gIHJldHVybiBuZXcgUm91dGVyU3RhdGUocm9vdCwgcXVlcnlQYXJhbXMsIGZyYWdtZW50LCBjdXJyKTtcbn1cblxuZnVuY3Rpb24gY3JlYXRlTm9kZShjdXJyOlRyZWVOb2RlPEFjdGl2YXRlZFJvdXRlU25hcHNob3Q+LCBwcmV2U3RhdGU/OlRyZWVOb2RlPEFjdGl2YXRlZFJvdXRlPik6VHJlZU5vZGU8QWN0aXZhdGVkUm91dGU+IHtcbiAgaWYgKHByZXZTdGF0ZSAmJiBlcXVhbFJvdXRlU25hcHNob3RzKHByZXZTdGF0ZS52YWx1ZS5zbmFwc2hvdCwgY3Vyci52YWx1ZSkpIHtcbiAgICBjb25zdCB2YWx1ZSA9IHByZXZTdGF0ZS52YWx1ZTtcbiAgICB2YWx1ZS5fZnV0dXJlU25hcHNob3QgPSBjdXJyLnZhbHVlO1xuICAgIFxuICAgIGNvbnN0IGNoaWxkcmVuID0gY3JlYXRlT3JSZXVzZUNoaWxkcmVuKGN1cnIsIHByZXZTdGF0ZSk7XG4gICAgcmV0dXJuIG5ldyBUcmVlTm9kZTxBY3RpdmF0ZWRSb3V0ZT4odmFsdWUsIGNoaWxkcmVuKTtcblxuICB9IGVsc2Uge1xuICAgIGNvbnN0IHZhbHVlID0gY3JlYXRlQWN0aXZhdGVkUm91dGUoY3Vyci52YWx1ZSk7XG4gICAgY29uc3QgY2hpbGRyZW4gPSBjdXJyLmNoaWxkcmVuLm1hcChjID0+IGNyZWF0ZU5vZGUoYykpO1xuICAgIHJldHVybiBuZXcgVHJlZU5vZGU8QWN0aXZhdGVkUm91dGU+KHZhbHVlLCBjaGlsZHJlbik7XG4gIH1cbn1cblxuZnVuY3Rpb24gY3JlYXRlT3JSZXVzZUNoaWxkcmVuKGN1cnI6VHJlZU5vZGU8QWN0aXZhdGVkUm91dGVTbmFwc2hvdD4sIHByZXZTdGF0ZTpUcmVlTm9kZTxBY3RpdmF0ZWRSb3V0ZT4pIHtcbiAgcmV0dXJuIGN1cnIuY2hpbGRyZW4ubWFwKGNoaWxkID0+IHtcbiAgICBjb25zdCBpbmRleCA9IHByZXZTdGF0ZS5jaGlsZHJlbi5maW5kSW5kZXgocCA9PiBlcXVhbFJvdXRlU25hcHNob3RzKHAudmFsdWUuc25hcHNob3QsIGNoaWxkLnZhbHVlKSk7XG4gICAgaWYgKGluZGV4ID49IDApIHtcbiAgICAgIHJldHVybiBjcmVhdGVOb2RlKGNoaWxkLCBwcmV2U3RhdGUuY2hpbGRyZW5baW5kZXhdKTtcbiAgICB9IGVsc2Uge1xuICAgICAgcmV0dXJuIGNyZWF0ZU5vZGUoY2hpbGQpO1xuICAgIH1cbiAgfSk7XG59XG5cbmZ1bmN0aW9uIGNyZWF0ZUFjdGl2YXRlZFJvdXRlKGM6QWN0aXZhdGVkUm91dGVTbmFwc2hvdCkge1xuICByZXR1cm4gbmV3IEFjdGl2YXRlZFJvdXRlKG5ldyBCZWhhdmlvclN1YmplY3QoYy51cmxTZWdtZW50cyksIG5ldyBCZWhhdmlvclN1YmplY3QoYy5wYXJhbXMpLCBjLm91dGxldCwgYy5jb21wb25lbnQsIGMpO1xufVxuXG5mdW5jdGlvbiBlcXVhbFJvdXRlU25hcHNob3RzKGE6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIGI6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QpOiBib29sZWFuIHtcbiAgcmV0dXJuIGEuX3JvdXRlQ29uZmlnID09PSBiLl9yb3V0ZUNvbmZpZztcbn0iXX0=
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/create_url_tree.d.ts b/modules/@angular/router/build/src/create_url_tree.d.ts
deleted file mode 100644
index 999cea0d39..0000000000
--- a/modules/@angular/router/build/src/create_url_tree.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { UrlTree } from './url_tree';
-import { ActivatedRoute } from './router_state';
-import { Params } from './shared';
-export declare function createUrlTree(route: ActivatedRoute, urlTree: UrlTree, commands: any[], queryParameters: Params | undefined, fragment: string | undefined): UrlTree;
diff --git a/modules/@angular/router/build/src/create_url_tree.js b/modules/@angular/router/build/src/create_url_tree.js
deleted file mode 100644
index 018ee86192..0000000000
--- a/modules/@angular/router/build/src/create_url_tree.js
+++ /dev/null
@@ -1,188 +0,0 @@
-"use strict";
-var url_tree_1 = require('./url_tree');
-var tree_1 = require('./utils/tree');
-var collection_1 = require('./utils/collection');
-var shared_1 = require('./shared');
-function createUrlTree(route, urlTree, commands, queryParameters, fragment) {
-    if (commands.length === 0) {
-        return tree(urlTree._root, urlTree, queryParameters, fragment);
-    }
-    var normalizedCommands = normalizeCommands(commands);
-    if (navigateToRoot(normalizedCommands)) {
-        return tree(new tree_1.TreeNode(urlTree.root, []), urlTree, queryParameters, fragment);
-    }
-    var startingNode = findStartingNode(normalizedCommands, urlTree, route);
-    var updated = normalizedCommands.commands.length > 0 ?
-        updateMany(startingNode.children.slice(0), normalizedCommands.commands) :
-        [];
-    var newRoot = constructNewTree(urlTree._root, startingNode, updated);
-    return tree(newRoot, urlTree, queryParameters, fragment);
-}
-exports.createUrlTree = createUrlTree;
-function tree(root, urlTree, queryParameters, fragment) {
-    var q = queryParameters ? stringify(queryParameters) : urlTree.queryParameters;
-    var f = fragment ? fragment : urlTree.fragment;
-    return new url_tree_1.UrlTree(root, q, f);
-}
-function navigateToRoot(normalizedChange) {
-    return normalizedChange.isAbsolute && normalizedChange.commands.length === 1 &&
-        normalizedChange.commands[0] == "/";
-}
-var NormalizedNavigationCommands = (function () {
-    function NormalizedNavigationCommands(isAbsolute, numberOfDoubleDots, commands) {
-        this.isAbsolute = isAbsolute;
-        this.numberOfDoubleDots = numberOfDoubleDots;
-        this.commands = commands;
-    }
-    return NormalizedNavigationCommands;
-}());
-function normalizeCommands(commands) {
-    if ((typeof commands[0] === "string") && commands.length === 1 && commands[0] == "/") {
-        return new NormalizedNavigationCommands(true, 0, commands);
-    }
-    var numberOfDoubleDots = 0;
-    var isAbsolute = false;
-    var res = [];
-    for (var i = 0; i < commands.length; ++i) {
-        var c = commands[i];
-        if (!(typeof c === "string")) {
-            res.push(c);
-            continue;
-        }
-        var parts = c.split('/');
-        for (var j = 0; j < parts.length; ++j) {
-            var cc = parts[j];
-            if (i == 0) {
-                if (j == 0 && cc == ".") {
-                }
-                else if (j == 0 && cc == "") {
-                    isAbsolute = true;
-                }
-                else if (cc == "..") {
-                    numberOfDoubleDots++;
-                }
-                else if (cc != '') {
-                    res.push(cc);
-                }
-            }
-            else {
-                if (cc != '') {
-                    res.push(cc);
-                }
-            }
-        }
-    }
-    return new NormalizedNavigationCommands(isAbsolute, numberOfDoubleDots, res);
-}
-function findStartingNode(normalizedChange, urlTree, route) {
-    if (normalizedChange.isAbsolute) {
-        return urlTree._root;
-    }
-    else {
-        var urlSegment = findUrlSegment(route, urlTree, normalizedChange.numberOfDoubleDots);
-        return findMatchingNode(urlSegment, urlTree._root);
-    }
-}
-function findUrlSegment(route, urlTree, numberOfDoubleDots) {
-    var urlSegment = route.snapshot._lastUrlSegment;
-    var path = urlTree.pathFromRoot(urlSegment);
-    if (path.length <= numberOfDoubleDots) {
-        throw new Error("Invalid number of '../'");
-    }
-    return path[path.length - 1 - numberOfDoubleDots];
-}
-function findMatchingNode(segment, node) {
-    if (node.value === segment)
-        return node;
-    for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
-        var c = _a[_i];
-        var r = findMatchingNode(segment, c);
-        if (r)
-            return r;
-    }
-    throw new Error("Cannot find url segment '" + segment + "'");
-}
-function constructNewTree(node, original, updated) {
-    if (node === original) {
-        return new tree_1.TreeNode(node.value, updated);
-    }
-    else {
-        return new tree_1.TreeNode(node.value, node.children.map(function (c) { return constructNewTree(c, original, updated); }));
-    }
-}
-function updateMany(nodes, commands) {
-    var outlet = getOutlet(commands);
-    var nodesInRightOutlet = nodes.filter(function (c) { return c.value.outlet === outlet; });
-    if (nodesInRightOutlet.length > 0) {
-        var nodeRightOutlet = nodesInRightOutlet[0];
-        nodes[nodes.indexOf(nodeRightOutlet)] = update(nodeRightOutlet, commands);
-    }
-    else {
-        nodes.push(update(null, commands));
-    }
-    return nodes;
-}
-function getPath(commands) {
-    if (!(typeof commands[0] === "string"))
-        return commands[0];
-    var parts = commands[0].toString().split(":");
-    return parts.length > 1 ? parts[1] : commands[0];
-}
-function getOutlet(commands) {
-    if (!(typeof commands[0] === "string"))
-        return shared_1.PRIMARY_OUTLET;
-    var parts = commands[0].toString().split(":");
-    return parts.length > 1 ? parts[0] : shared_1.PRIMARY_OUTLET;
-}
-function update(node, commands) {
-    var rest = commands.slice(1);
-    var next = rest.length === 0 ? null : rest[0];
-    var outlet = getOutlet(commands);
-    var path = getPath(commands);
-    if (!node && !(typeof next === 'object')) {
-        var urlSegment = new url_tree_1.UrlSegment(path, {}, outlet);
-        var children = rest.length === 0 ? [] : [update(null, rest)];
-        return new tree_1.TreeNode(urlSegment, children);
-    }
-    else if (!node && typeof next === 'object') {
-        var urlSegment = new url_tree_1.UrlSegment(path, stringify(next), outlet);
-        return recurse(urlSegment, node, rest.slice(1));
-    }
-    else if (node && outlet !== node.value.outlet) {
-        return node;
-    }
-    else if (node && typeof path === 'object') {
-        var newSegment = new url_tree_1.UrlSegment(node.value.path, stringify(path), node.value.outlet);
-        return recurse(newSegment, node, rest);
-    }
-    else if (node && typeof next === 'object' && compare(path, stringify(next), node.value)) {
-        return recurse(node.value, node, rest.slice(1));
-    }
-    else if (node && typeof next === 'object') {
-        var urlSegment = new url_tree_1.UrlSegment(path, stringify(next), outlet);
-        return recurse(urlSegment, node, rest.slice(1));
-    }
-    else if (node && compare(path, {}, node.value)) {
-        return recurse(node.value, node, rest);
-    }
-    else {
-        var urlSegment = new url_tree_1.UrlSegment(path, {}, outlet);
-        return recurse(urlSegment, node, rest);
-    }
-}
-function stringify(params) {
-    var res = {};
-    collection_1.forEach(params, function (v, k) { return res[k] = v.toString(); });
-    return res;
-}
-function compare(path, params, segment) {
-    return path == segment.path && collection_1.shallowEqual(params, segment.parameters);
-}
-function recurse(urlSegment, node, rest) {
-    if (rest.length === 0) {
-        return new tree_1.TreeNode(urlSegment, []);
-    }
-    var children = node ? node.children.slice(0) : [];
-    return new tree_1.TreeNode(urlSegment, updateMany(children, rest));
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create_url_tree.js","sourceRoot":"","sources":["../../src/create_url_tree.ts"],"names":[],"mappings":"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","sourcesContent":["import { UrlTree, UrlSegment, equalUrlSegments } from './url_tree';\nimport { TreeNode } from './utils/tree';\nimport { forEach, shallowEqual } from './utils/collection';\nimport { RouterState, ActivatedRoute } from './router_state';\nimport { Params, PRIMARY_OUTLET } from './shared';\n\nexport function createUrlTree(route: ActivatedRoute, urlTree: UrlTree, commands: any[], \n                              queryParameters: Params | undefined, fragment: string | undefined): UrlTree {\n  if (commands.length === 0) {\n    return tree(urlTree._root, urlTree, queryParameters, fragment);\n  }\n\n  const normalizedCommands = normalizeCommands(commands);\n  if (navigateToRoot(normalizedCommands)) {\n    return tree(new TreeNode<UrlSegment>(urlTree.root, []), urlTree, queryParameters, fragment);\n  }\n\n  const startingNode = findStartingNode(normalizedCommands, urlTree, route);\n  const updated = normalizedCommands.commands.length > 0 ?\n      updateMany(startingNode.children.slice(0), normalizedCommands.commands) :\n      [];\n  const newRoot = constructNewTree(urlTree._root, startingNode, updated);\n\n  return tree(newRoot, urlTree, queryParameters, fragment);\n}\n\nfunction tree(root: TreeNode<UrlSegment>, urlTree: UrlTree, queryParameters: Params | undefined, fragment: string | undefined): UrlTree {\n  const q = queryParameters ? stringify(queryParameters) : urlTree.queryParameters;\n  const f = fragment ? fragment : urlTree.fragment;\n  return new UrlTree(root, q, f);\n}\n\nfunction navigateToRoot(normalizedChange: NormalizedNavigationCommands): boolean {\n  return normalizedChange.isAbsolute && normalizedChange.commands.length === 1 &&\n    normalizedChange.commands[0] == \"/\";\n}\n\nclass NormalizedNavigationCommands {\n  constructor(public isAbsolute: boolean, public numberOfDoubleDots: number,\n              public commands: any[]) {}\n}\n\nfunction normalizeCommands(commands: any[]): NormalizedNavigationCommands {\n  if ((typeof commands[0] === \"string\") && commands.length === 1 && commands[0] == \"/\") {\n    return new NormalizedNavigationCommands(true, 0, commands);\n  }\n\n  let numberOfDoubleDots = 0;\n  let isAbsolute = false;\n  const res = [];\n\n  for (let i = 0; i < commands.length; ++i) {\n    const c = commands[i];\n\n    if (!(typeof c === \"string\")) {\n      res.push(c);\n      continue;\n    }\n\n    const parts = c.split('/');\n    for (let j = 0; j < parts.length; ++j) {\n      let cc = parts[j];\n\n      // first exp is treated in a special way\n      if (i == 0) {\n        if (j == 0 && cc == \".\") {  //  './a'\n          // skip it\n        } else if (j == 0 && cc == \"\") {  //  '/a'\n          isAbsolute = true;\n        } else if (cc == \"..\") {  //  '../a'\n          numberOfDoubleDots++;\n        } else if (cc != '') {\n          res.push(cc);\n        }\n\n      } else {\n        if (cc != '') {\n          res.push(cc);\n        }\n      }\n    }\n  }\n\n  return new NormalizedNavigationCommands(isAbsolute, numberOfDoubleDots, res);\n}\n\nfunction findStartingNode(normalizedChange: NormalizedNavigationCommands, urlTree: UrlTree,\n                           route: ActivatedRoute): TreeNode<UrlSegment> {\n  if (normalizedChange.isAbsolute) {\n    return urlTree._root;\n  } else {\n    const urlSegment =\n      findUrlSegment(route, urlTree, normalizedChange.numberOfDoubleDots);\n    return findMatchingNode(urlSegment, urlTree._root);\n  }\n}\n\nfunction findUrlSegment(route: ActivatedRoute, urlTree: UrlTree, numberOfDoubleDots: number): UrlSegment {\n  const urlSegment = route.snapshot._lastUrlSegment;\n  const path = urlTree.pathFromRoot(urlSegment);\n  if (path.length <= numberOfDoubleDots) {\n    throw new Error(\"Invalid number of '../'\");\n  }\n  return path[path.length - 1 - numberOfDoubleDots];\n}\n\nfunction findMatchingNode(segment: UrlSegment, node: TreeNode<UrlSegment>): TreeNode<UrlSegment> {\n  if (node.value === segment) return node;\n  for (let c of node.children) {\n    const r = findMatchingNode(segment, c);\n    if (r) return r;\n  }\n  throw new Error(`Cannot find url segment '${segment}'`);\n}\n\nfunction constructNewTree(node: TreeNode<UrlSegment>, original: TreeNode<UrlSegment>,\n                          updated: TreeNode<UrlSegment>[]): TreeNode<UrlSegment> {\n  if (node === original) {\n    return new TreeNode<UrlSegment>(node.value, updated);\n  } else {\n    return new TreeNode<UrlSegment>(\n      node.value, node.children.map(c => constructNewTree(c, original, updated)));\n  }\n}\n\nfunction updateMany(nodes: TreeNode<UrlSegment>[], commands: any[]): TreeNode<UrlSegment>[] {\n  const outlet = getOutlet(commands);\n  const nodesInRightOutlet = nodes.filter(c => c.value.outlet === outlet);\n  if (nodesInRightOutlet.length > 0) {\n    const nodeRightOutlet = nodesInRightOutlet[0];  // there can be only one\n    nodes[nodes.indexOf(nodeRightOutlet)] = update(nodeRightOutlet, commands);\n  } else {\n    nodes.push(update(null, commands));\n  }\n  return nodes;\n}\n\nfunction getPath(commands: any[]): any {\n  if (!(typeof commands[0] === \"string\")) return commands[0];\n  const parts = commands[0].toString().split(\":\");\n  return parts.length > 1 ? parts[1] : commands[0];\n}\n\nfunction getOutlet(commands: any[]): string {\n  if (!(typeof commands[0] === \"string\")) return PRIMARY_OUTLET;\n  const parts = commands[0].toString().split(\":\");\n  return parts.length > 1 ? parts[0] : PRIMARY_OUTLET;\n}\n\nfunction update(node: TreeNode<UrlSegment>|null, commands: any[]): TreeNode<UrlSegment> {\n  const rest = commands.slice(1);\n  const next = rest.length === 0 ? null : rest[0];\n  const outlet = getOutlet(commands);\n  const path = getPath(commands);\n\n  // reach the end of the tree => create new tree nodes.\n  if (!node && !(typeof next === 'object')) {\n    const urlSegment = new UrlSegment(path, {}, outlet);\n    const children = rest.length === 0 ? [] : [update(null, rest)];\n    return new TreeNode<UrlSegment>(urlSegment, children);\n\n  } else if (!node && typeof next === 'object') {\n    const urlSegment = new UrlSegment(path, stringify(next), outlet);\n    return recurse(urlSegment, node, rest.slice(1));\n\n    // different outlet => preserve the subtree\n  } else if (node && outlet !== node.value.outlet) {\n    return node;\n\n    // params command\n  } else if (node && typeof path === 'object') {\n    const newSegment = new UrlSegment(node.value.path, stringify(path), node.value.outlet);\n    return recurse(newSegment, node, rest);\n\n    // next one is a params command && can reuse the node\n  } else if (node && typeof next === 'object' && compare(path, stringify(next), node.value)) {\n    return recurse(node.value, node, rest.slice(1));\n\n    // next one is a params command && cannot reuse the node\n  } else if (node && typeof next === 'object') {\n    const urlSegment = new UrlSegment(path, stringify(next), outlet);\n    return recurse(urlSegment, node, rest.slice(1));\n\n    // next one is not a params command && can reuse the node\n  } else if (node && compare(path, {}, node.value)) {\n    return recurse(node.value, node, rest);\n\n    // next one is not a params command && cannot reuse the node\n  } else {\n    const urlSegment = new UrlSegment(path, {}, outlet);\n    return recurse(urlSegment, node, rest);\n  }\n}\n\nfunction stringify(params: {[key: string]: any}): {[key: string]: string} {\n  const res = {};\n  forEach(params, (v, k) => res[k] = v.toString());\n  return res;\n}\n\nfunction compare(path: string, params: {[key: string]: any}, segment: UrlSegment): boolean {\n  return path == segment.path && shallowEqual(params, segment.parameters);\n}\n\nfunction recurse(urlSegment: UrlSegment, node: TreeNode<UrlSegment> | null,\n                  rest: any[]): TreeNode<UrlSegment> {\n  if (rest.length === 0) {\n    return new TreeNode<UrlSegment>(urlSegment, []);\n  }\n  const children = node ? node.children.slice(0) : [];\n  return new TreeNode<UrlSegment>(urlSegment, updateMany(children, rest));\n}"]}
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/directives/router_link.d.ts b/modules/@angular/router/build/src/directives/router_link.d.ts
deleted file mode 100644
index 5ce81cb7fc..0000000000
--- a/modules/@angular/router/build/src/directives/router_link.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Router } from '../router';
-import { ActivatedRoute } from '../router_state';
-export declare class RouterLink {
-    private router;
-    private route;
-    target: string;
-    private commands;
-    href: string;
-    constructor(router: Router, route: ActivatedRoute);
-    routerLink: any[] | string;
-    onClick(): boolean;
-    private updateTargetUrlAndHref();
-}
diff --git a/modules/@angular/router/build/src/directives/router_link.js b/modules/@angular/router/build/src/directives/router_link.js
deleted file mode 100644
index 663942d01f..0000000000
--- a/modules/@angular/router/build/src/directives/router_link.js
+++ /dev/null
@@ -1,72 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var core_1 = require('@angular/core');
-var router_1 = require('../router');
-var router_state_1 = require('../router_state');
-var RouterLink = (function () {
-    function RouterLink(router, route) {
-        this.router = router;
-        this.route = route;
-        this.commands = [];
-    }
-    Object.defineProperty(RouterLink.prototype, "routerLink", {
-        set: function (data) {
-            if (Array.isArray(data)) {
-                this.commands = data;
-            }
-            else {
-                this.commands = [data];
-            }
-            this.updateTargetUrlAndHref();
-        },
-        enumerable: true,
-        configurable: true
-    });
-    RouterLink.prototype.onClick = function () {
-        if (!(typeof this.target === "string") || this.target == '_self') {
-            this.router.navigate(this.commands, { relativeTo: this.route });
-            return false;
-        }
-        return true;
-    };
-    RouterLink.prototype.updateTargetUrlAndHref = function () {
-        var tree = this.router.createUrlTree(this.commands, { relativeTo: this.route });
-        if (tree) {
-            this.href = this.router.serializeUrl(tree);
-        }
-    };
-    __decorate([
-        core_1.Input(), 
-        __metadata('design:type', String)
-    ], RouterLink.prototype, "target", void 0);
-    __decorate([
-        core_1.HostBinding(), 
-        __metadata('design:type', String)
-    ], RouterLink.prototype, "href", void 0);
-    __decorate([
-        core_1.Input(), 
-        __metadata('design:type', Object), 
-        __metadata('design:paramtypes', [Object])
-    ], RouterLink.prototype, "routerLink", null);
-    __decorate([
-        core_1.HostListener("click"), 
-        __metadata('design:type', Function), 
-        __metadata('design:paramtypes', []), 
-        __metadata('design:returntype', Boolean)
-    ], RouterLink.prototype, "onClick", null);
-    RouterLink = __decorate([
-        core_1.Directive({ selector: '[routerLink]' }), 
-        __metadata('design:paramtypes', [router_1.Router, router_state_1.ActivatedRoute])
-    ], RouterLink);
-    return RouterLink;
-}());
-exports.RouterLink = RouterLink;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyX2xpbmsuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZGlyZWN0aXZlcy9yb3V0ZXJfbGluay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEscUJBS08sZUFBZSxDQUFDLENBQUE7QUFDdkIsdUJBQXFCLFdBQVcsQ0FBQyxDQUFBO0FBQ2pDLDZCQUE2QixpQkFBaUIsQ0FBQyxDQUFBO0FBNEIvQztJQVVFLG9CQUFvQixNQUFjLEVBQVUsS0FBcUI7UUFBN0MsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUFVLFVBQUssR0FBTCxLQUFLLENBQWdCO1FBUnpELGFBQVEsR0FBVSxFQUFFLENBQUM7SUFRdUMsQ0FBQztJQUdyRSxzQkFBSSxrQ0FBVTthQUFkLFVBQWUsSUFBb0I7WUFDakMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3hCLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDO1lBQ3ZCLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDTixJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDekIsQ0FBQztZQUNELElBQUksQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO1FBQ2hDLENBQUM7OztPQUFBO0lBR0QsNEJBQU8sR0FBUDtRQUVFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLElBQUksQ0FBQyxNQUFNLEtBQUssUUFBUSxDQUFDLElBQUksSUFBSSxDQUFDLE1BQU0sSUFBSSxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQ2pFLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLEtBQUssRUFBQyxDQUFDLENBQUM7WUFDOUQsTUFBTSxDQUFDLEtBQUssQ0FBQztRQUNmLENBQUM7UUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVPLDJDQUFzQixHQUE5QjtRQUNFLElBQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsRUFBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLEtBQUssRUFBQyxDQUFDLENBQUM7UUFDaEYsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztZQUNULElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDN0MsQ0FBQztJQUNILENBQUM7SUFwQ0Q7UUFBQyxZQUFLLEVBQUU7OzhDQUFBO0lBSVI7UUFBQyxrQkFBVyxFQUFFOzs0Q0FBQTtJQU9kO1FBQUMsWUFBSyxFQUFFOzs7Z0RBQUE7SUFVUjtRQUFDLG1CQUFZLENBQUMsT0FBTyxDQUFDOzs7OzZDQUFBO0lBdkJ4QjtRQUFDLGdCQUFTLENBQUMsRUFBQyxRQUFRLEVBQUUsY0FBYyxFQUFDLENBQUM7O2tCQUFBO0lBdUN0QyxpQkFBQztBQUFELENBQUMsQUF0Q0QsSUFzQ0M7QUF0Q1ksa0JBQVUsYUFzQ3RCLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge1xuICBEaXJlY3RpdmUsXG4gIEhvc3RMaXN0ZW5lcixcbiAgSG9zdEJpbmRpbmcsXG4gIElucHV0XG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtSb3V0ZXJ9IGZyb20gJy4uL3JvdXRlcic7XG5pbXBvcnQge0FjdGl2YXRlZFJvdXRlfSBmcm9tICcuLi9yb3V0ZXJfc3RhdGUnO1xuXG4vKipcbiAqIFRoZSBSb3V0ZXJMaW5rIGRpcmVjdGl2ZSBsZXRzIHlvdSBsaW5rIHRvIHNwZWNpZmljIHBhcnRzIG9mIHlvdXIgYXBwLlxuICpcbiAqIENvbnNpZGVyIHRoZSBmb2xsb3dpbmcgcm91dGUgY29uZmlndXJhdGlvbjpcblxuICogYGBgXG4gKiBbeyBwYXRoOiAnL3VzZXInLCBjb21wb25lbnQ6IFVzZXJDbXAgfV1cbiAqIGBgYFxuICpcbiAqIFdoZW4gbGlua2luZyB0byB0aGlzIGBVc2VyYCByb3V0ZSwgeW91IGNhbiB3cml0ZTpcbiAqXG4gKiBgYGBcbiAqIDxhIFtyb3V0ZXJMaW5rXT1cIlsnL3VzZXInXVwiPmxpbmsgdG8gdXNlciBjb21wb25lbnQ8L2E+XG4gKiBgYGBcbiAqXG4gKiBSb3V0ZXJMaW5rIGV4cGVjdHMgdGhlIHZhbHVlIHRvIGJlIGFuIGFycmF5IG9mIHBhdGggc2VnbWVudHMsIGZvbGxvd2VkIGJ5IHRoZSBwYXJhbXNcbiAqIGZvciB0aGF0IGxldmVsIG9mIHJvdXRpbmcuIEZvciBpbnN0YW5jZSBgWycvdGVhbScsIHt0ZWFtSWQ6IDF9LCAndXNlcicsIHt1c2VySWQ6IDJ9XWBcbiAqIG1lYW5zIHRoYXQgd2Ugd2FudCB0byBnZW5lcmF0ZSBhIGxpbmsgdG8gYC90ZWFtO3RlYW1JZD0xL3VzZXI7dXNlcklkPTJgLlxuICpcbiAqIFRoZSBmaXJzdCBzZWdtZW50IG5hbWUgY2FuIGJlIHByZXBlbmRlZCB3aXRoIGAvYCwgYC4vYCwgb3IgYC4uL2AuXG4gKiBJZiB0aGUgc2VnbWVudCBiZWdpbnMgd2l0aCBgL2AsIHRoZSByb3V0ZXIgd2lsbCBsb29rIHVwIHRoZSByb3V0ZSBmcm9tIHRoZSByb290IG9mIHRoZSBhcHAuXG4gKiBJZiB0aGUgc2VnbWVudCBiZWdpbnMgd2l0aCBgLi9gLCBvciBkb2Vzbid0IGJlZ2luIHdpdGggYSBzbGFzaCwgdGhlIHJvdXRlciB3aWxsXG4gKiBpbnN0ZWFkIGxvb2sgaW4gdGhlIGN1cnJlbnQgY29tcG9uZW50J3MgY2hpbGRyZW4gZm9yIHRoZSByb3V0ZS5cbiAqIEFuZCBpZiB0aGUgc2VnbWVudCBiZWdpbnMgd2l0aCBgLi4vYCwgdGhlIHJvdXRlciB3aWxsIGdvIHVwIG9uZSBsZXZlbC5cbiAqL1xuQERpcmVjdGl2ZSh7c2VsZWN0b3I6ICdbcm91dGVyTGlua10nfSlcbmV4cG9ydCBjbGFzcyBSb3V0ZXJMaW5rIHtcbiAgQElucHV0KCkgdGFyZ2V0OiBzdHJpbmc7XG4gIHByaXZhdGUgY29tbWFuZHM6IGFueVtdID0gW107XG5cbiAgLy8gdGhlIHVybCBkaXNwbGF5ZWQgb24gdGhlIGFuY2hvciBlbGVtZW50LlxuICBASG9zdEJpbmRpbmcoKSBocmVmOiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIEBpbnRlcm5hbFxuICAgKi9cbiAgY29uc3RydWN0b3IocHJpdmF0ZSByb3V0ZXI6IFJvdXRlciwgcHJpdmF0ZSByb3V0ZTogQWN0aXZhdGVkUm91dGUpIHt9XG5cbiAgQElucHV0KClcbiAgc2V0IHJvdXRlckxpbmsoZGF0YTogYW55W10gfCBzdHJpbmcpIHtcbiAgICBpZiAoQXJyYXkuaXNBcnJheShkYXRhKSkge1xuICAgICAgdGhpcy5jb21tYW5kcyA9IGRhdGE7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRoaXMuY29tbWFuZHMgPSBbZGF0YV07XG4gICAgfVxuICAgIHRoaXMudXBkYXRlVGFyZ2V0VXJsQW5kSHJlZigpO1xuICB9XG4gIFxuICBASG9zdExpc3RlbmVyKFwiY2xpY2tcIilcbiAgb25DbGljaygpOiBib29sZWFuIHtcbiAgICAvLyBJZiBubyB0YXJnZXQsIG9yIGlmIHRhcmdldCBpcyBfc2VsZiwgcHJldmVudCBkZWZhdWx0IGJyb3dzZXIgYmVoYXZpb3JcbiAgICBpZiAoISh0eXBlb2YgdGhpcy50YXJnZXQgPT09IFwic3RyaW5nXCIpIHx8IHRoaXMudGFyZ2V0ID09ICdfc2VsZicpIHtcbiAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKHRoaXMuY29tbWFuZHMsIHtyZWxhdGl2ZVRvOiB0aGlzLnJvdXRlfSk7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfVxuICAgIHJldHVybiB0cnVlO1xuICB9XG5cbiAgcHJpdmF0ZSB1cGRhdGVUYXJnZXRVcmxBbmRIcmVmKCk6IHZvaWQge1xuICAgIGNvbnN0IHRyZWUgPSB0aGlzLnJvdXRlci5jcmVhdGVVcmxUcmVlKHRoaXMuY29tbWFuZHMsIHtyZWxhdGl2ZVRvOiB0aGlzLnJvdXRlfSk7XG4gICAgaWYgKHRyZWUpIHtcbiAgICAgIHRoaXMuaHJlZiA9IHRoaXMucm91dGVyLnNlcmlhbGl6ZVVybCh0cmVlKTtcbiAgICB9XG4gIH1cbn1cbiJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/directives/router_outlet.d.ts b/modules/@angular/router/build/src/directives/router_outlet.d.ts
deleted file mode 100644
index d67ccb3f79..0000000000
--- a/modules/@angular/router/build/src/directives/router_outlet.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ViewContainerRef, ComponentFactory, ResolvedReflectiveProvider } from '@angular/core';
-import { RouterOutletMap } from '../router_outlet_map';
-export declare class RouterOutlet {
-    private location;
-    private activated;
-    outletMap: RouterOutletMap;
-    constructor(parentOutletMap: RouterOutletMap, location: ViewContainerRef, name: string);
-    readonly isActivated: boolean;
-    readonly component: Object;
-    deactivate(): void;
-    activate(factory: ComponentFactory<any>, providers: ResolvedReflectiveProvider[], outletMap: RouterOutletMap): void;
-}
diff --git a/modules/@angular/router/build/src/directives/router_outlet.js b/modules/@angular/router/build/src/directives/router_outlet.js
deleted file mode 100644
index be86483d03..0000000000
--- a/modules/@angular/router/build/src/directives/router_outlet.js
+++ /dev/null
@@ -1,55 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-var core_1 = require('@angular/core');
-var router_outlet_map_1 = require('../router_outlet_map');
-var shared_1 = require('../shared');
-var RouterOutlet = (function () {
-    function RouterOutlet(parentOutletMap, location, name) {
-        this.location = location;
-        parentOutletMap.registerOutlet(name ? name : shared_1.PRIMARY_OUTLET, this);
-    }
-    Object.defineProperty(RouterOutlet.prototype, "isActivated", {
-        get: function () { return !!this.activated; },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(RouterOutlet.prototype, "component", {
-        get: function () {
-            if (!this.activated)
-                throw new Error("Outlet is not activated");
-            return this.activated.instance;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    RouterOutlet.prototype.deactivate = function () {
-        if (this.activated) {
-            this.activated.destroy();
-            this.activated = null;
-        }
-    };
-    RouterOutlet.prototype.activate = function (factory, providers, outletMap) {
-        this.outletMap = outletMap;
-        var inj = core_1.ReflectiveInjector.fromResolvedProviders(providers, this.location.parentInjector);
-        this.activated = this.location.createComponent(factory, this.location.length, inj, []);
-    };
-    RouterOutlet = __decorate([
-        core_1.Directive({ selector: 'router-outlet' }),
-        __param(2, core_1.Attribute('name')), 
-        __metadata('design:paramtypes', [router_outlet_map_1.RouterOutletMap, core_1.ViewContainerRef, String])
-    ], RouterOutlet);
-    return RouterOutlet;
-}());
-exports.RouterOutlet = RouterOutlet;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyX291dGxldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9kaXJlY3RpdmVzL3JvdXRlcl9vdXRsZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7OztBQUFBLHFCQUErSSxlQUFlLENBQUMsQ0FBQTtBQUMvSixrQ0FBOEIsc0JBQXNCLENBQUMsQ0FBQTtBQUNyRCx1QkFBNkIsV0FBVyxDQUFDLENBQUE7QUFHekM7SUFPRSxzQkFBWSxlQUErQixFQUFVLFFBQXlCLEVBQy9DLElBQVc7UUFEVyxhQUFRLEdBQVIsUUFBUSxDQUFpQjtRQUU1RSxlQUFlLENBQUMsY0FBYyxDQUFDLElBQUksR0FBRyxJQUFJLEdBQUcsdUJBQWMsRUFBRSxJQUFJLENBQUMsQ0FBQztJQUNyRSxDQUFDO0lBRUQsc0JBQUkscUNBQVc7YUFBZixjQUE2QixNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDOzs7T0FBQTtJQUN2RCxzQkFBSSxtQ0FBUzthQUFiO1lBQ0UsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDO2dCQUFDLE1BQU0sSUFBSSxLQUFLLENBQUMseUJBQXlCLENBQUMsQ0FBQztZQUNoRSxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUM7UUFDakMsQ0FBQzs7O09BQUE7SUFFRCxpQ0FBVSxHQUFWO1FBQ0UsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7WUFDbkIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztZQUN6QixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQztRQUN4QixDQUFDO0lBQ0gsQ0FBQztJQUVELCtCQUFRLEdBQVIsVUFBUyxPQUE4QixFQUFFLFNBQXVDLEVBQ3ZFLFNBQTBCO1FBQ2pDLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDO1FBQzNCLElBQU0sR0FBRyxHQUFHLHlCQUFrQixDQUFDLHFCQUFxQixDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxDQUFDO1FBQzlGLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN6RixDQUFDO0lBL0JIO1FBQUMsZ0JBQVMsQ0FBQyxFQUFDLFFBQVEsRUFBRSxlQUFlLEVBQUMsQ0FBQzttQkFTeEIsZ0JBQVMsQ0FBQyxNQUFNLENBQUM7O29CQVRPO0lBZ0N2QyxtQkFBQztBQUFELENBQUMsQUEvQkQsSUErQkM7QUEvQlksb0JBQVksZUErQnhCLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge0luamVjdG9yLCBEaXJlY3RpdmUsIFZpZXdDb250YWluZXJSZWYsIEF0dHJpYnV0ZSwgQ29tcG9uZW50UmVmLCBDb21wb25lbnRGYWN0b3J5LCBSZXNvbHZlZFJlZmxlY3RpdmVQcm92aWRlciwgUmVmbGVjdGl2ZUluamVjdG9yfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7Um91dGVyT3V0bGV0TWFwfSBmcm9tICcuLi9yb3V0ZXJfb3V0bGV0X21hcCc7XG5pbXBvcnQge1BSSU1BUllfT1VUTEVUfSBmcm9tICcuLi9zaGFyZWQnO1xuXG5ARGlyZWN0aXZlKHtzZWxlY3RvcjogJ3JvdXRlci1vdXRsZXQnfSlcbmV4cG9ydCBjbGFzcyBSb3V0ZXJPdXRsZXQge1xuICBwcml2YXRlIGFjdGl2YXRlZDpDb21wb25lbnRSZWY8YW55PnxudWxsO1xuICBwdWJsaWMgb3V0bGV0TWFwOlJvdXRlck91dGxldE1hcDtcblxuICAvKipcbiAgICogQGludGVybmFsXG4gICAqL1xuICBjb25zdHJ1Y3RvcihwYXJlbnRPdXRsZXRNYXA6Um91dGVyT3V0bGV0TWFwLCBwcml2YXRlIGxvY2F0aW9uOlZpZXdDb250YWluZXJSZWYsXG4gICAgICAgICAgICAgIEBBdHRyaWJ1dGUoJ25hbWUnKSBuYW1lOnN0cmluZykge1xuICAgIHBhcmVudE91dGxldE1hcC5yZWdpc3Rlck91dGxldChuYW1lID8gbmFtZSA6IFBSSU1BUllfT1VUTEVULCB0aGlzKTtcbiAgfVxuXG4gIGdldCBpc0FjdGl2YXRlZCgpOiBib29sZWFuIHsgcmV0dXJuICEhdGhpcy5hY3RpdmF0ZWQ7IH1cbiAgZ2V0IGNvbXBvbmVudCgpOiBPYmplY3Qge1xuICAgIGlmICghdGhpcy5hY3RpdmF0ZWQpIHRocm93IG5ldyBFcnJvcihcIk91dGxldCBpcyBub3QgYWN0aXZhdGVkXCIpO1xuICAgIHJldHVybiB0aGlzLmFjdGl2YXRlZC5pbnN0YW5jZTtcbiAgfVxuXG4gIGRlYWN0aXZhdGUoKTogdm9pZCB7XG4gICAgaWYgKHRoaXMuYWN0aXZhdGVkKSB7XG4gICAgICB0aGlzLmFjdGl2YXRlZC5kZXN0cm95KCk7XG4gICAgICB0aGlzLmFjdGl2YXRlZCA9IG51bGw7XG4gICAgfVxuICB9XG5cbiAgYWN0aXZhdGUoZmFjdG9yeTogQ29tcG9uZW50RmFjdG9yeTxhbnk+LCBwcm92aWRlcnM6IFJlc29sdmVkUmVmbGVjdGl2ZVByb3ZpZGVyW10sXG4gICAgICAgICAgIG91dGxldE1hcDogUm91dGVyT3V0bGV0TWFwKTogdm9pZCB7XG4gICAgdGhpcy5vdXRsZXRNYXAgPSBvdXRsZXRNYXA7XG4gICAgY29uc3QgaW5qID0gUmVmbGVjdGl2ZUluamVjdG9yLmZyb21SZXNvbHZlZFByb3ZpZGVycyhwcm92aWRlcnMsIHRoaXMubG9jYXRpb24ucGFyZW50SW5qZWN0b3IpO1xuICAgIHRoaXMuYWN0aXZhdGVkID0gdGhpcy5sb2NhdGlvbi5jcmVhdGVDb21wb25lbnQoZmFjdG9yeSwgdGhpcy5sb2NhdGlvbi5sZW5ndGgsIGluaiwgW10pO1xuICB9XG59XG4iXX0=
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/index.d.ts b/modules/@angular/router/build/src/index.d.ts
deleted file mode 100644
index f0c682f846..0000000000
--- a/modules/@angular/router/build/src/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export { Router, Event, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from './router';
-export { UrlSerializer, DefaultUrlSerializer } from './url_serializer';
-export { RouterState, ActivatedRoute, RouterStateSnapshot, ActivatedRouteSnapshot } from './router_state';
-export { UrlTree, UrlSegment } from './url_tree';
-export { RouterOutletMap } from './router_outlet_map';
-export { RouterConfig, Route } from './config';
-export { Params, PRIMARY_OUTLET } from './shared';
-export { provideRouter } from './router_providers';
-export { CanActivate, CanDeactivate } from './interfaces';
-import { RouterOutlet } from './directives/router_outlet';
-import { RouterLink } from './directives/router_link';
-export declare const ROUTER_DIRECTIVES: (typeof RouterOutlet | typeof RouterLink)[];
diff --git a/modules/@angular/router/build/src/index.js b/modules/@angular/router/build/src/index.js
deleted file mode 100644
index 6e03a0c2c2..0000000000
--- a/modules/@angular/router/build/src/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-"use strict";
-var router_1 = require('./router');
-exports.Router = router_1.Router;
-exports.NavigationStart = router_1.NavigationStart;
-exports.NavigationEnd = router_1.NavigationEnd;
-exports.NavigationCancel = router_1.NavigationCancel;
-exports.NavigationError = router_1.NavigationError;
-var url_serializer_1 = require('./url_serializer');
-exports.UrlSerializer = url_serializer_1.UrlSerializer;
-exports.DefaultUrlSerializer = url_serializer_1.DefaultUrlSerializer;
-var router_state_1 = require('./router_state');
-exports.RouterState = router_state_1.RouterState;
-exports.ActivatedRoute = router_state_1.ActivatedRoute;
-exports.RouterStateSnapshot = router_state_1.RouterStateSnapshot;
-exports.ActivatedRouteSnapshot = router_state_1.ActivatedRouteSnapshot;
-var url_tree_1 = require('./url_tree');
-exports.UrlTree = url_tree_1.UrlTree;
-exports.UrlSegment = url_tree_1.UrlSegment;
-var router_outlet_map_1 = require('./router_outlet_map');
-exports.RouterOutletMap = router_outlet_map_1.RouterOutletMap;
-var shared_1 = require('./shared');
-exports.PRIMARY_OUTLET = shared_1.PRIMARY_OUTLET;
-var router_providers_1 = require('./router_providers');
-exports.provideRouter = router_providers_1.provideRouter;
-var router_outlet_1 = require('./directives/router_outlet');
-var router_link_1 = require('./directives/router_link');
-exports.ROUTER_DIRECTIVES = [router_outlet_1.RouterOutlet, router_link_1.RouterLink];
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUFpRyxVQUFVLENBQUM7QUFBbkcsaUNBQU07QUFBUyxtREFBZTtBQUFFLCtDQUFhO0FBQUUscURBQWdCO0FBQUUsbURBQWtDO0FBQzVHLCtCQUFvRCxrQkFBa0IsQ0FBQztBQUE5RCx1REFBYTtBQUFFLHFFQUErQztBQUN2RSw2QkFBeUYsZ0JBQWdCLENBQUM7QUFBakcsaURBQVc7QUFBRSx1REFBYztBQUFFLGlFQUFtQjtBQUFFLHVFQUErQztBQUMxRyx5QkFBbUMsWUFBWSxDQUFDO0FBQXZDLHFDQUFPO0FBQUUsMkNBQThCO0FBQ2hELGtDQUFnQyxxQkFBcUIsQ0FBQztBQUE3Qyw4REFBNkM7QUFFdEQsdUJBQXVDLFVBQVUsQ0FBQztBQUFqQyxpREFBaUM7QUFDbEQsaUNBQThCLG9CQUFvQixDQUFDO0FBQTFDLHlEQUEwQztBQUduRCw4QkFBNkIsNEJBQTRCLENBQUMsQ0FBQTtBQUMxRCw0QkFBMkIsMEJBQTBCLENBQUMsQ0FBQTtBQUV6Qyx5QkFBaUIsR0FBRyxDQUFDLDRCQUFZLEVBQUUsd0JBQVUsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IHsgUm91dGVyLCBFdmVudCwgTmF2aWdhdGlvblN0YXJ0LCBOYXZpZ2F0aW9uRW5kLCBOYXZpZ2F0aW9uQ2FuY2VsLCBOYXZpZ2F0aW9uRXJyb3IgfSBmcm9tICcuL3JvdXRlcic7XG5leHBvcnQgeyBVcmxTZXJpYWxpemVyLCBEZWZhdWx0VXJsU2VyaWFsaXplciB9IGZyb20gJy4vdXJsX3NlcmlhbGl6ZXInO1xuZXhwb3J0IHsgUm91dGVyU3RhdGUsIEFjdGl2YXRlZFJvdXRlLCBSb3V0ZXJTdGF0ZVNuYXBzaG90LCBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90IH0gZnJvbSAnLi9yb3V0ZXJfc3RhdGUnO1xuZXhwb3J0IHsgVXJsVHJlZSwgVXJsU2VnbWVudH0gZnJvbSAnLi91cmxfdHJlZSc7XG5leHBvcnQgeyBSb3V0ZXJPdXRsZXRNYXAgfSBmcm9tICcuL3JvdXRlcl9vdXRsZXRfbWFwJztcbmV4cG9ydCB7IFJvdXRlckNvbmZpZywgUm91dGUgfSBmcm9tICcuL2NvbmZpZyc7XG5leHBvcnQgeyBQYXJhbXMsIFBSSU1BUllfT1VUTEVUIH0gZnJvbSAnLi9zaGFyZWQnO1xuZXhwb3J0IHsgcHJvdmlkZVJvdXRlciB9IGZyb20gJy4vcm91dGVyX3Byb3ZpZGVycyc7XG5leHBvcnQgeyBDYW5BY3RpdmF0ZSwgQ2FuRGVhY3RpdmF0ZSB9IGZyb20gJy4vaW50ZXJmYWNlcyc7XG5cbmltcG9ydCB7IFJvdXRlck91dGxldCB9IGZyb20gJy4vZGlyZWN0aXZlcy9yb3V0ZXJfb3V0bGV0JztcbmltcG9ydCB7IFJvdXRlckxpbmsgfSBmcm9tICcuL2RpcmVjdGl2ZXMvcm91dGVyX2xpbmsnO1xuXG5leHBvcnQgY29uc3QgUk9VVEVSX0RJUkVDVElWRVMgPSBbUm91dGVyT3V0bGV0LCBSb3V0ZXJMaW5rXTsiXX0=
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/interfaces.d.ts b/modules/@angular/router/build/src/interfaces.d.ts
deleted file mode 100644
index ded9c1ede9..0000000000
--- a/modules/@angular/router/build/src/interfaces.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Observable } from 'rxjs/Observable';
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from './router_state';
-export interface CanActivate {
-    canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean;
-}
-export interface CanDeactivate<T> {
-    canDeactivate(component: T, route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean;
-}
diff --git a/modules/@angular/router/build/src/interfaces.js b/modules/@angular/router/build/src/interfaces.js
deleted file mode 100644
index 55b1366458..0000000000
--- a/modules/@angular/router/build/src/interfaces.js
+++ /dev/null
@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge09ic2VydmFibGV9IGZyb20gJ3J4anMvT2JzZXJ2YWJsZSc7XG5pbXBvcnQge0FjdGl2YXRlZFJvdXRlU25hcHNob3QsIFJvdXRlclN0YXRlU25hcHNob3R9IGZyb20gJy4vcm91dGVyX3N0YXRlJztcblxuLyoqXG4gKiBBbiBpbnRlcmZhY2UgYSBjbGFzcyBjYW4gaW1wbGVtZW50IHRvIGJlIGEgZ3VhcmQgZGVjaWRpbmcgaWYgYSByb3V0ZSBjYW4gYmUgYWN0aXZhdGVkLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIENhbkFjdGl2YXRlIHtcbiAgY2FuQWN0aXZhdGUocm91dGU6QWN0aXZhdGVkUm91dGVTbmFwc2hvdCwgc3RhdGU6Um91dGVyU3RhdGVTbmFwc2hvdCk6T2JzZXJ2YWJsZTxib29sZWFuPiB8IGJvb2xlYW47XG59XG5cbi8qKlxuICogQW4gaW50ZXJmYWNlIGEgY2xhc3MgY2FuIGltcGxlbWVudCB0byBiZSBhIGd1YXJkIGRlY2lkaW5nIGlmIGEgcm91dGUgY2FuIGJlIGRlYWN0aXZhdGVkLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIENhbkRlYWN0aXZhdGU8VD4ge1xuICBjYW5EZWFjdGl2YXRlKGNvbXBvbmVudDpULCByb3V0ZTpBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90LCBzdGF0ZTpSb3V0ZXJTdGF0ZVNuYXBzaG90KTpPYnNlcnZhYmxlPGJvb2xlYW4+IHwgYm9vbGVhbjtcbn0iXX0=
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/recognize.d.ts b/modules/@angular/router/build/src/recognize.d.ts
deleted file mode 100644
index fbfa415c1f..0000000000
--- a/modules/@angular/router/build/src/recognize.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { UrlTree } from './url_tree';
-import { RouterStateSnapshot } from './router_state';
-import { RouterConfig } from './config';
-import { Type } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-export declare function recognize(rootComponentType: Type, config: RouterConfig, url: UrlTree): Observable<RouterStateSnapshot>;
diff --git a/modules/@angular/router/build/src/recognize.js b/modules/@angular/router/build/src/recognize.js
deleted file mode 100644
index fc75901e7d..0000000000
--- a/modules/@angular/router/build/src/recognize.js
+++ /dev/null
@@ -1,168 +0,0 @@
-"use strict";
-var collection_1 = require('./utils/collection');
-var tree_1 = require('./utils/tree');
-var router_state_1 = require('./router_state');
-var shared_1 = require('./shared');
-var Observable_1 = require('rxjs/Observable');
-function recognize(rootComponentType, config, url) {
-    try {
-        var match_1 = new MatchResult(rootComponentType, config, [url.root], {}, url._root.children, [], shared_1.PRIMARY_OUTLET, null, url.root);
-        var roots = constructActivatedRoute(match_1);
-        var res_1 = new router_state_1.RouterStateSnapshot(roots[0], url.queryParameters, url.fragment);
-        return new Observable_1.Observable(function (obs) {
-            obs.next(res_1);
-            obs.complete();
-        });
-    }
-    catch (e) {
-        return new Observable_1.Observable(function (obs) { return obs.error(e); });
-    }
-}
-exports.recognize = recognize;
-function constructActivatedRoute(match) {
-    var activatedRoute = createActivatedRouteSnapshot(match);
-    var children = match.leftOverUrl.length > 0 ?
-        recognizeMany(match.children, match.leftOverUrl) : recognizeLeftOvers(match.children, match.lastUrlSegment);
-    checkOutletNameUniqueness(children);
-    children.sort(function (a, b) {
-        if (a.value.outlet === shared_1.PRIMARY_OUTLET)
-            return -1;
-        if (b.value.outlet === shared_1.PRIMARY_OUTLET)
-            return 1;
-        return a.value.outlet.localeCompare(b.value.outlet);
-    });
-    return [new tree_1.TreeNode(activatedRoute, children)];
-}
-function recognizeLeftOvers(config, lastUrlSegment) {
-    if (!config)
-        return [];
-    var mIndex = matchIndex(config, [], lastUrlSegment);
-    return mIndex ? constructActivatedRoute(mIndex) : [];
-}
-function recognizeMany(config, urls) {
-    return collection_1.flatten(urls.map(function (url) { return recognizeOne(config, url); }));
-}
-function createActivatedRouteSnapshot(match) {
-    return new router_state_1.ActivatedRouteSnapshot(match.consumedUrlSegments, match.parameters, match.outlet, match.component, match.route, match.lastUrlSegment);
-}
-function recognizeOne(config, url) {
-    var m = match(config, url);
-    var primary = constructActivatedRoute(m);
-    var secondary = recognizeMany(config, m.secondary);
-    var res = primary.concat(secondary);
-    checkOutletNameUniqueness(res);
-    return res;
-}
-function checkOutletNameUniqueness(nodes) {
-    var names = {};
-    nodes.forEach(function (n) {
-        var routeWithSameOutletName = names[n.value.outlet];
-        if (routeWithSameOutletName) {
-            var p = routeWithSameOutletName.urlSegments.map(function (s) { return s.toString(); }).join("/");
-            var c = n.value.urlSegments.map(function (s) { return s.toString(); }).join("/");
-            throw new Error("Two segments cannot have the same outlet name: '" + p + "' and '" + c + "'.");
-        }
-        names[n.value.outlet] = n.value;
-    });
-    return nodes;
-}
-function match(config, url) {
-    var m = matchNonIndex(config, url);
-    if (m)
-        return m;
-    var mIndex = matchIndex(config, [url], url.value);
-    if (mIndex)
-        return mIndex;
-    var availableRoutes = config.map(function (r) {
-        var outlet = !r.outlet ? '' : r.outlet + ":";
-        return "'" + outlet + r.path + "'";
-    }).join(", ");
-    throw new Error("Cannot match any routes. Current segment: '" + url.value + "'. Available routes: [" + availableRoutes + "].");
-}
-function matchNonIndex(config, url) {
-    for (var _i = 0, config_1 = config; _i < config_1.length; _i++) {
-        var r = config_1[_i];
-        var m = matchWithParts(r, url);
-        if (m)
-            return m;
-    }
-    return null;
-}
-function matchIndex(config, leftOverUrls, lastUrlSegment) {
-    for (var _i = 0, config_2 = config; _i < config_2.length; _i++) {
-        var r = config_2[_i];
-        if (r.index) {
-            var outlet = r.outlet ? r.outlet : shared_1.PRIMARY_OUTLET;
-            var children = r.children ? r.children : [];
-            return new MatchResult(r.component, children, [], lastUrlSegment.parameters, leftOverUrls, [], outlet, r, lastUrlSegment);
-        }
-    }
-    return null;
-}
-function matchWithParts(route, url) {
-    if (!route.path)
-        return null;
-    if ((route.outlet ? route.outlet : shared_1.PRIMARY_OUTLET) !== url.value.outlet)
-        return null;
-    var path = route.path.startsWith("/") ? route.path.substring(1) : route.path;
-    if (path === "**") {
-        var consumedUrl = [];
-        var u = url;
-        while (u) {
-            consumedUrl.push(u.value);
-            u = collection_1.first(u.children);
-        }
-        var last = consumedUrl[consumedUrl.length - 1];
-        return new MatchResult(route.component, [], consumedUrl, last.parameters, [], [], shared_1.PRIMARY_OUTLET, route, last);
-    }
-    var parts = path.split("/");
-    var positionalParams = {};
-    var consumedUrlSegments = [];
-    var lastParent = null;
-    var lastSegment = null;
-    var current = url;
-    for (var i = 0; i < parts.length; ++i) {
-        if (!current)
-            return null;
-        var p_1 = parts[i];
-        var isLastSegment = i === parts.length - 1;
-        var isLastParent = i === parts.length - 2;
-        var isPosParam = p_1.startsWith(":");
-        if (!isPosParam && p_1 != current.value.path)
-            return null;
-        if (isLastSegment) {
-            lastSegment = current;
-        }
-        if (isLastParent) {
-            lastParent = current;
-        }
-        if (isPosParam) {
-            positionalParams[p_1.substring(1)] = current.value.path;
-        }
-        consumedUrlSegments.push(current.value);
-        current = collection_1.first(current.children);
-    }
-    if (!lastSegment)
-        throw "Cannot be reached";
-    var p = lastSegment.value.parameters;
-    var parameters = collection_1.merge(p, positionalParams);
-    var secondarySubtrees = lastParent ? lastParent.children.slice(1) : [];
-    var children = route.children ? route.children : [];
-    var outlet = route.outlet ? route.outlet : shared_1.PRIMARY_OUTLET;
-    return new MatchResult(route.component, children, consumedUrlSegments, parameters, lastSegment.children, secondarySubtrees, outlet, route, lastSegment.value);
-}
-var MatchResult = (function () {
-    function MatchResult(component, children, consumedUrlSegments, parameters, leftOverUrl, secondary, outlet, route, lastUrlSegment) {
-        this.component = component;
-        this.children = children;
-        this.consumedUrlSegments = consumedUrlSegments;
-        this.parameters = parameters;
-        this.leftOverUrl = leftOverUrl;
-        this.secondary = secondary;
-        this.outlet = outlet;
-        this.route = route;
-        this.lastUrlSegment = lastUrlSegment;
-    }
-    return MatchResult;
-}());
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"recognize.js","sourceRoot":"","sources":["../../src/recognize.ts"],"names":[],"mappings":"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","sourcesContent":["import { UrlTree, UrlSegment } from './url_tree';\nimport { flatten, first, merge } from './utils/collection';\nimport { TreeNode } from './utils/tree';\nimport { RouterStateSnapshot, ActivatedRouteSnapshot } from './router_state';\nimport { Params, PRIMARY_OUTLET } from './shared';\nimport { RouterConfig, Route } from './config';\nimport { Type } from '@angular/core';\nimport { Observable } from 'rxjs/Observable';\n\nexport function recognize(rootComponentType: Type, config: RouterConfig, url: UrlTree): Observable<RouterStateSnapshot> {\n  try {\n    const match = new MatchResult(rootComponentType, config, [url.root], {}, url._root.children, [], PRIMARY_OUTLET, null, url.root);\n    const roots = constructActivatedRoute(match);\n    const res = new RouterStateSnapshot(roots[0], url.queryParameters, url.fragment);\n    return new Observable<RouterStateSnapshot>(obs => {\n      obs.next(res);\n      obs.complete();\n    });\n  } catch(e) {\n    return new Observable<RouterStateSnapshot>(obs => obs.error(e));\n  }\n}\n\nfunction constructActivatedRoute(match: MatchResult): TreeNode<ActivatedRouteSnapshot>[] {\n  const activatedRoute = createActivatedRouteSnapshot(match);\n  const children = match.leftOverUrl.length > 0 ?\n    recognizeMany(match.children, match.leftOverUrl) : recognizeLeftOvers(match.children, match.lastUrlSegment);\n  checkOutletNameUniqueness(children);\n  children.sort((a, b) => {\n    if (a.value.outlet === PRIMARY_OUTLET) return -1;\n    if (b.value.outlet === PRIMARY_OUTLET) return 1;\n    return a.value.outlet.localeCompare(b.value.outlet)\n  });\n  return [new TreeNode<ActivatedRouteSnapshot>(activatedRoute, children)];\n}\n\nfunction recognizeLeftOvers(config: Route[], lastUrlSegment: UrlSegment): TreeNode<ActivatedRouteSnapshot>[] {\n  if (!config) return [];\n  const mIndex = matchIndex(config, [], lastUrlSegment);\n  return mIndex ? constructActivatedRoute(mIndex) : [];\n}\n\nfunction recognizeMany(config: Route[], urls: TreeNode<UrlSegment>[]): TreeNode<ActivatedRouteSnapshot>[] {\n  return flatten(urls.map(url => recognizeOne(config, url)));\n}\n\nfunction createActivatedRouteSnapshot(match: MatchResult): ActivatedRouteSnapshot {\n  return new ActivatedRouteSnapshot(match.consumedUrlSegments, match.parameters, match.outlet, match.component, match.route, match.lastUrlSegment);\n}\n\nfunction recognizeOne(config: Route[], url: TreeNode<UrlSegment>): TreeNode<ActivatedRouteSnapshot>[] {\n  const m = match(config, url);\n  const primary = constructActivatedRoute(m);\n  const secondary = recognizeMany(config, m.secondary);\n  const res = primary.concat(secondary);\n  checkOutletNameUniqueness(res);\n  return res;\n}\n\nfunction checkOutletNameUniqueness(nodes: TreeNode<ActivatedRouteSnapshot>[]): TreeNode<ActivatedRouteSnapshot>[] {\n  let names = {};\n  nodes.forEach(n => {\n    let routeWithSameOutletName = names[n.value.outlet];\n    if (routeWithSameOutletName) {\n      const p = routeWithSameOutletName.urlSegments.map(s => s.toString()).join(\"/\");\n      const c = n.value.urlSegments.map(s => s.toString()).join(\"/\");\n      throw new Error(`Two segments cannot have the same outlet name: '${p}' and '${c}'.`);\n    }\n    names[n.value.outlet] = n.value;\n  });\n  return nodes;\n}\n\nfunction match(config: Route[], url: TreeNode<UrlSegment>): MatchResult {\n  const m = matchNonIndex(config, url);\n  if (m) return m;\n\n  const mIndex = matchIndex(config, [url], url.value);\n  if (mIndex) return mIndex;\n\n  const availableRoutes = config.map(r => {\n    const outlet = !r.outlet ? '' : `${r.outlet}:`;\n    return `'${outlet}${r.path}'`;\n  }).join(\", \");\n  throw new Error(\n    `Cannot match any routes. Current segment: '${url.value}'. Available routes: [${availableRoutes}].`);\n}\n\nfunction matchNonIndex(config: Route[], url: TreeNode<UrlSegment>): MatchResult | null {\n  for (let r of config) {\n    let m = matchWithParts(r, url);\n    if (m) return m;\n  }\n  return null;\n}\n\nfunction matchIndex(config: Route[], leftOverUrls: TreeNode<UrlSegment>[], lastUrlSegment: UrlSegment): MatchResult | null {\n  for (let r of config) {\n    if (r.index) {\n      const outlet = r.outlet ? r.outlet : PRIMARY_OUTLET;\n      const children = r.children ? r.children : [];\n      return new MatchResult(r.component, children, [], lastUrlSegment.parameters, leftOverUrls, [], outlet, r, lastUrlSegment);\n    }\n  }\n  return null;\n}\n\nfunction matchWithParts(route: Route, url: TreeNode<UrlSegment>): MatchResult | null {\n  if (!route.path) return null;\n  if ((route.outlet ? route.outlet : PRIMARY_OUTLET) !== url.value.outlet) return null;\n\n  const path = route.path.startsWith(\"/\") ? route.path.substring(1) : route.path;\n  if (path === \"**\") {\n    const consumedUrl = [];\n    let u:TreeNode<UrlSegment>|null = url;\n    while (u) {\n      consumedUrl.push(u.value);\n      u = first(u.children);\n    }\n    const last = consumedUrl[consumedUrl.length - 1];\n    return new MatchResult(route.component, [], consumedUrl, last.parameters, [], [], PRIMARY_OUTLET, route, last);\n  }\n\n  const parts = path.split(\"/\");\n  const positionalParams = {};\n  const consumedUrlSegments = [];\n\n  let lastParent: TreeNode<UrlSegment>|null = null;\n  let lastSegment: TreeNode<UrlSegment>|null = null;\n\n  let current: TreeNode<UrlSegment>|null = url;\n  for (let i = 0; i < parts.length; ++i) {\n    if (!current) return null;\n\n    const p = parts[i];\n    const isLastSegment = i === parts.length - 1;\n    const isLastParent = i === parts.length - 2;\n    const isPosParam = p.startsWith(\":\");\n\n    if (!isPosParam && p != current.value.path) return null;\n    if (isLastSegment) {\n      lastSegment = current;\n    }\n    if (isLastParent) {\n      lastParent = current;\n    }\n\n    if (isPosParam) {\n      positionalParams[p.substring(1)] = current.value.path;\n    }\n\n    consumedUrlSegments.push(current.value);\n\n    current = first(current.children);\n  }\n\n  if (!lastSegment) throw \"Cannot be reached\";\n\n  const p = lastSegment.value.parameters;\n  const parameters = <{[key: string]: string}>merge(p, positionalParams);\n  const secondarySubtrees = lastParent ? lastParent.children.slice(1) : [];\n  const children = route.children ? route.children : [];\n  const outlet = route.outlet ? route.outlet : PRIMARY_OUTLET;\n\n  return new MatchResult(route.component, children, consumedUrlSegments, parameters, lastSegment.children,\n    secondarySubtrees, outlet, route, lastSegment.value);\n}\n\nclass MatchResult {\n  constructor(public component: Type | string,\n              public children: Route[],\n              public consumedUrlSegments: UrlSegment[],\n              public parameters: {[key: string]: string},\n              public leftOverUrl: TreeNode<UrlSegment>[],\n              public secondary: TreeNode<UrlSegment>[],\n              public outlet: string,\n              public route: Route | null,\n              public lastUrlSegment: UrlSegment\n  ) {}\n}"]}
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/resolve.d.ts b/modules/@angular/router/build/src/resolve.d.ts
deleted file mode 100644
index edd764fbc7..0000000000
--- a/modules/@angular/router/build/src/resolve.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { RouterStateSnapshot } from './router_state';
-import { ComponentResolver } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/toPromise';
-export declare function resolve(resolver: ComponentResolver, state: RouterStateSnapshot): Observable<RouterStateSnapshot>;
diff --git a/modules/@angular/router/build/src/resolve.js b/modules/@angular/router/build/src/resolve.js
deleted file mode 100644
index 1cbe87af3d..0000000000
--- a/modules/@angular/router/build/src/resolve.js
+++ /dev/null
@@ -1,25 +0,0 @@
-"use strict";
-require('rxjs/add/operator/map');
-var forkJoin_1 = require('rxjs/observable/forkJoin');
-var fromPromise_1 = require('rxjs/observable/fromPromise');
-require('rxjs/add/operator/toPromise');
-function resolve(resolver, state) {
-    return resolveNode(resolver, state._root).map(function (_) { return state; });
-}
-exports.resolve = resolve;
-function resolveNode(resolver, node) {
-    if (node.children.length === 0) {
-        return fromPromise_1.fromPromise(resolver.resolveComponent(node.value.component).then(function (factory) {
-            node.value._resolvedComponentFactory = factory;
-            return node.value;
-        }));
-    }
-    else {
-        var c = node.children.map(function (c) { return resolveNode(resolver, c).toPromise(); });
-        return forkJoin_1.forkJoin(c).map(function (_) { return resolver.resolveComponent(node.value.component).then(function (factory) {
-            node.value._resolvedComponentFactory = factory;
-            return node.value;
-        }); });
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9yZXNvbHZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFJQSxRQUFPLHVCQUF1QixDQUFDLENBQUE7QUFDL0IseUJBQXVCLDBCQUEwQixDQUFDLENBQUE7QUFDbEQsNEJBQTBCLDZCQUE2QixDQUFDLENBQUE7QUFDeEQsUUFBTyw2QkFBNkIsQ0FBQyxDQUFBO0FBRXJDLGlCQUF3QixRQUEyQixFQUFFLEtBQTBCO0lBQzdFLE1BQU0sQ0FBQyxXQUFXLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsVUFBQSxDQUFDLElBQUksT0FBQSxLQUFLLEVBQUwsQ0FBSyxDQUFDLENBQUM7QUFDNUQsQ0FBQztBQUZlLGVBQU8sVUFFdEIsQ0FBQTtBQUVELHFCQUFxQixRQUEyQixFQUFFLElBQXNDO0lBQ3RGLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDL0IsTUFBTSxDQUFDLHlCQUFXLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxDQUFDLFVBQUEsT0FBTztZQUNsRixJQUFJLENBQUMsS0FBSyxDQUFDLHlCQUF5QixHQUFHLE9BQU8sQ0FBQztZQUMvQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztRQUNwQixDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRU4sQ0FBQztJQUFDLElBQUksQ0FBQyxDQUFDO1FBQ04sSUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsVUFBQSxDQUFDLElBQUksT0FBQSxXQUFXLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBRSxFQUFwQyxDQUFvQyxDQUFDLENBQUM7UUFDdkUsTUFBTSxDQUFDLG1CQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLFVBQUEsQ0FBQyxJQUFJLE9BQUEsUUFBUSxDQUFDLGdCQUFnQixDQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxDQUFDLFVBQUEsT0FBTztZQUMzRixJQUFJLENBQUMsS0FBSyxDQUFDLHlCQUF5QixHQUFHLE9BQU8sQ0FBQztZQUMvQyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztRQUNwQixDQUFDLENBQUMsRUFIMEIsQ0FHMUIsQ0FBQyxDQUFDO0lBQ04sQ0FBQztBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSb3V0ZXJTdGF0ZVNuYXBzaG90LCBBY3RpdmF0ZWRSb3V0ZVNuYXBzaG90IH0gZnJvbSAnLi9yb3V0ZXJfc3RhdGUnO1xuaW1wb3J0IHsgVHJlZU5vZGUgfSBmcm9tICcuL3V0aWxzL3RyZWUnO1xuaW1wb3J0IHsgQ29tcG9uZW50UmVzb2x2ZXIgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzL09ic2VydmFibGUnO1xuaW1wb3J0ICdyeGpzL2FkZC9vcGVyYXRvci9tYXAnO1xuaW1wb3J0IHtmb3JrSm9pbn0gZnJvbSAncnhqcy9vYnNlcnZhYmxlL2ZvcmtKb2luJztcbmltcG9ydCB7ZnJvbVByb21pc2V9IGZyb20gJ3J4anMvb2JzZXJ2YWJsZS9mcm9tUHJvbWlzZSc7XG5pbXBvcnQgJ3J4anMvYWRkL29wZXJhdG9yL3RvUHJvbWlzZSc7XG5cbmV4cG9ydCBmdW5jdGlvbiByZXNvbHZlKHJlc29sdmVyOiBDb21wb25lbnRSZXNvbHZlciwgc3RhdGU6IFJvdXRlclN0YXRlU25hcHNob3QpOiBPYnNlcnZhYmxlPFJvdXRlclN0YXRlU25hcHNob3Q+IHtcbiAgcmV0dXJuIHJlc29sdmVOb2RlKHJlc29sdmVyLCBzdGF0ZS5fcm9vdCkubWFwKF8gPT4gc3RhdGUpO1xufVxuXG5mdW5jdGlvbiByZXNvbHZlTm9kZShyZXNvbHZlcjogQ29tcG9uZW50UmVzb2x2ZXIsIG5vZGU6IFRyZWVOb2RlPEFjdGl2YXRlZFJvdXRlU25hcHNob3Q+KTogT2JzZXJ2YWJsZTxhbnk+IHtcbiAgaWYgKG5vZGUuY2hpbGRyZW4ubGVuZ3RoID09PSAwKSB7XG4gICAgcmV0dXJuIGZyb21Qcm9taXNlKHJlc29sdmVyLnJlc29sdmVDb21wb25lbnQoPGFueT5ub2RlLnZhbHVlLmNvbXBvbmVudCkudGhlbihmYWN0b3J5ID0+IHtcbiAgICAgIG5vZGUudmFsdWUuX3Jlc29sdmVkQ29tcG9uZW50RmFjdG9yeSA9IGZhY3Rvcnk7XG4gICAgICByZXR1cm4gbm9kZS52YWx1ZTtcbiAgICB9KSk7XG4gICAgXG4gIH0gZWxzZSB7XG4gICAgY29uc3QgYyA9IG5vZGUuY2hpbGRyZW4ubWFwKGMgPT4gcmVzb2x2ZU5vZGUocmVzb2x2ZXIsIGMpLnRvUHJvbWlzZSgpKTtcbiAgICByZXR1cm4gZm9ya0pvaW4oYykubWFwKF8gPT4gcmVzb2x2ZXIucmVzb2x2ZUNvbXBvbmVudCg8YW55Pm5vZGUudmFsdWUuY29tcG9uZW50KS50aGVuKGZhY3RvcnkgPT4ge1xuICAgICAgbm9kZS52YWx1ZS5fcmVzb2x2ZWRDb21wb25lbnRGYWN0b3J5ID0gZmFjdG9yeTtcbiAgICAgIHJldHVybiBub2RlLnZhbHVlO1xuICAgIH0pKTtcbiAgfVxufSJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/router.d.ts b/modules/@angular/router/build/src/router.d.ts
deleted file mode 100644
index 79f6a5a224..0000000000
--- a/modules/@angular/router/build/src/router.d.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { ComponentResolver, Type, Injector } from '@angular/core';
-import { Location } from '@angular/common';
-import { UrlSerializer } from './url_serializer';
-import { RouterOutletMap } from './router_outlet_map';
-import { UrlTree } from './url_tree';
-import { Params } from './shared';
-import { RouterState, ActivatedRoute } from './router_state';
-import { RouterConfig } from './config';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/operator/map';
-import 'rxjs/add/operator/scan';
-import 'rxjs/add/operator/mergeMap';
-import 'rxjs/add/operator/concat';
-import 'rxjs/add/operator/concatMap';
-export interface NavigationExtras {
-    relativeTo?: ActivatedRoute;
-    queryParameters?: Params;
-    fragment?: string;
-}
-export declare class NavigationStart {
-    id: number;
-    url: UrlTree;
-    constructor(id: number, url: UrlTree);
-}
-export declare class NavigationEnd {
-    id: number;
-    url: UrlTree;
-    constructor(id: number, url: UrlTree);
-}
-export declare class NavigationCancel {
-    id: number;
-    url: UrlTree;
-    constructor(id: number, url: UrlTree);
-}
-export declare class NavigationError {
-    id: number;
-    url: UrlTree;
-    error: any;
-    constructor(id: number, url: UrlTree, error: any);
-}
-export declare type Event = NavigationStart | NavigationEnd | NavigationCancel | NavigationError;
-export declare class Router {
-    private rootComponentType;
-    private resolver;
-    private urlSerializer;
-    private outletMap;
-    private location;
-    private injector;
-    private currentUrlTree;
-    private currentRouterState;
-    private config;
-    private locationSubscription;
-    private routerEvents;
-    private navigationId;
-    constructor(rootComponentType: Type, resolver: ComponentResolver, urlSerializer: UrlSerializer, outletMap: RouterOutletMap, location: Location, injector: Injector);
-    readonly routerState: RouterState;
-    readonly urlTree: UrlTree;
-    readonly events: Observable<Event>;
-    navigateByUrl(url: string): Promise<boolean>;
-    resetConfig(config: RouterConfig): void;
-    dispose(): void;
-    createUrlTree(commands: any[], {relativeTo, queryParameters, fragment}?: NavigationExtras): UrlTree;
-    navigate(commands: any[], extras?: NavigationExtras): Promise<boolean>;
-    serializeUrl(url: UrlTree): string;
-    parseUrl(url: string): UrlTree;
-    private scheduleNavigation(url, pop);
-    private setUpLocationChangeListener();
-    private runNavigate(url, pop, id);
-}
diff --git a/modules/@angular/router/build/src/router.js b/modules/@angular/router/build/src/router.js
deleted file mode 100644
index e8d716b32a..0000000000
--- a/modules/@angular/router/build/src/router.js
+++ /dev/null
@@ -1,342 +0,0 @@
-"use strict";
-var core_1 = require('@angular/core');
-var router_outlet_map_1 = require('./router_outlet_map');
-var recognize_1 = require('./recognize');
-var resolve_1 = require('./resolve');
-var create_router_state_1 = require('./create_router_state');
-var url_tree_1 = require('./url_tree');
-var shared_1 = require('./shared');
-var router_state_1 = require('./router_state');
-var create_url_tree_1 = require('./create_url_tree');
-var collection_1 = require('./utils/collection');
-var Subject_1 = require('rxjs/Subject');
-require('rxjs/add/operator/map');
-require('rxjs/add/operator/scan');
-require('rxjs/add/operator/mergeMap');
-require('rxjs/add/operator/concat');
-require('rxjs/add/operator/concatMap');
-var of_1 = require('rxjs/observable/of');
-var forkJoin_1 = require('rxjs/observable/forkJoin');
-var NavigationStart = (function () {
-    function NavigationStart(id, url) {
-        this.id = id;
-        this.url = url;
-    }
-    return NavigationStart;
-}());
-exports.NavigationStart = NavigationStart;
-var NavigationEnd = (function () {
-    function NavigationEnd(id, url) {
-        this.id = id;
-        this.url = url;
-    }
-    return NavigationEnd;
-}());
-exports.NavigationEnd = NavigationEnd;
-var NavigationCancel = (function () {
-    function NavigationCancel(id, url) {
-        this.id = id;
-        this.url = url;
-    }
-    return NavigationCancel;
-}());
-exports.NavigationCancel = NavigationCancel;
-var NavigationError = (function () {
-    function NavigationError(id, url, error) {
-        this.id = id;
-        this.url = url;
-        this.error = error;
-    }
-    return NavigationError;
-}());
-exports.NavigationError = NavigationError;
-var Router = (function () {
-    function Router(rootComponentType, resolver, urlSerializer, outletMap, location, injector) {
-        this.rootComponentType = rootComponentType;
-        this.resolver = resolver;
-        this.urlSerializer = urlSerializer;
-        this.outletMap = outletMap;
-        this.location = location;
-        this.injector = injector;
-        this.navigationId = 0;
-        this.routerEvents = new Subject_1.Subject();
-        this.currentUrlTree = url_tree_1.createEmptyUrlTree();
-        this.currentRouterState = router_state_1.createEmptyState(rootComponentType);
-        this.setUpLocationChangeListener();
-        this.navigateByUrl(this.location.path());
-    }
-    Object.defineProperty(Router.prototype, "routerState", {
-        get: function () {
-            return this.currentRouterState;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(Router.prototype, "urlTree", {
-        get: function () {
-            return this.currentUrlTree;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Object.defineProperty(Router.prototype, "events", {
-        get: function () {
-            return this.routerEvents;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    Router.prototype.navigateByUrl = function (url) {
-        var urlTree = this.urlSerializer.parse(url);
-        return this.scheduleNavigation(urlTree, false);
-    };
-    Router.prototype.resetConfig = function (config) {
-        this.config = config;
-    };
-    Router.prototype.dispose = function () { this.locationSubscription.unsubscribe(); };
-    Router.prototype.createUrlTree = function (commands, _a) {
-        var _b = _a === void 0 ? {} : _a, relativeTo = _b.relativeTo, queryParameters = _b.queryParameters, fragment = _b.fragment;
-        var a = relativeTo ? relativeTo : this.routerState.root;
-        return create_url_tree_1.createUrlTree(a, this.currentUrlTree, commands, queryParameters, fragment);
-    };
-    Router.prototype.navigate = function (commands, extras) {
-        if (extras === void 0) { extras = {}; }
-        return this.scheduleNavigation(this.createUrlTree(commands, extras), false);
-    };
-    Router.prototype.serializeUrl = function (url) { return this.urlSerializer.serialize(url); };
-    Router.prototype.parseUrl = function (url) { return this.urlSerializer.parse(url); };
-    Router.prototype.scheduleNavigation = function (url, pop) {
-        var _this = this;
-        var id = ++this.navigationId;
-        this.routerEvents.next(new NavigationStart(id, url));
-        return Promise.resolve().then(function (_) { return _this.runNavigate(url, false, id); });
-    };
-    Router.prototype.setUpLocationChangeListener = function () {
-        var _this = this;
-        this.locationSubscription = this.location.subscribe(function (change) {
-            return _this.scheduleNavigation(_this.urlSerializer.parse(change['url']), change['pop']);
-        });
-    };
-    Router.prototype.runNavigate = function (url, pop, id) {
-        var _this = this;
-        if (id !== this.navigationId) {
-            this.routerEvents.next(new NavigationCancel(id, url));
-            return Promise.resolve(false);
-        }
-        return new Promise(function (resolvePromise, rejectPromise) {
-            var state;
-            recognize_1.recognize(_this.rootComponentType, _this.config, url).mergeMap(function (newRouterStateSnapshot) {
-                return resolve_1.resolve(_this.resolver, newRouterStateSnapshot);
-            }).map(function (routerStateSnapshot) {
-                return create_router_state_1.createRouterState(routerStateSnapshot, _this.currentRouterState);
-            }).map(function (newState) {
-                state = newState;
-            }).mergeMap(function (_) {
-                return new GuardChecks(state.snapshot, _this.currentRouterState.snapshot, _this.injector).check(_this.outletMap);
-            }).forEach(function (shouldActivate) {
-                if (!shouldActivate || id !== _this.navigationId) {
-                    _this.routerEvents.next(new NavigationCancel(id, url));
-                    return Promise.resolve(false);
-                }
-                new ActivateRoutes(state, _this.currentRouterState).activate(_this.outletMap);
-                _this.currentUrlTree = url;
-                _this.currentRouterState = state;
-                if (!pop) {
-                    _this.location.go(_this.urlSerializer.serialize(url));
-                }
-            }).then(function () {
-                _this.routerEvents.next(new NavigationEnd(id, url));
-                resolvePromise(true);
-            }, function (e) {
-                _this.routerEvents.next(new NavigationError(id, url, e));
-                rejectPromise(e);
-            });
-        });
-    };
-    return Router;
-}());
-exports.Router = Router;
-var CanActivate = (function () {
-    function CanActivate(route) {
-        this.route = route;
-    }
-    return CanActivate;
-}());
-var CanDeactivate = (function () {
-    function CanDeactivate(component, route) {
-        this.component = component;
-        this.route = route;
-    }
-    return CanDeactivate;
-}());
-var GuardChecks = (function () {
-    function GuardChecks(future, curr, injector) {
-        this.future = future;
-        this.curr = curr;
-        this.injector = injector;
-        this.checks = [];
-    }
-    GuardChecks.prototype.check = function (parentOutletMap) {
-        var _this = this;
-        var futureRoot = this.future._root;
-        var currRoot = this.curr ? this.curr._root : null;
-        this.traverseChildRoutes(futureRoot, currRoot, parentOutletMap);
-        if (this.checks.length === 0)
-            return of_1.of(true);
-        return forkJoin_1.forkJoin(this.checks.map(function (s) {
-            if (s instanceof CanActivate) {
-                return _this.runCanActivate(s.route);
-            }
-            else if (s instanceof CanDeactivate) {
-                return _this.runCanDeactivate(s.component, s.route);
-            }
-            else {
-                throw new Error("Cannot be reached");
-            }
-        })).map(collection_1.and);
-    };
-    GuardChecks.prototype.traverseChildRoutes = function (futureNode, currNode, outletMap) {
-        var _this = this;
-        var prevChildren = nodeChildrenAsMap(currNode);
-        futureNode.children.forEach(function (c) {
-            _this.traverseRoutes(c, prevChildren[c.value.outlet], outletMap);
-            delete prevChildren[c.value.outlet];
-        });
-        collection_1.forEach(prevChildren, function (v, k) { return _this.deactivateOutletAndItChildren(v, outletMap._outlets[k]); });
-    };
-    GuardChecks.prototype.traverseRoutes = function (futureNode, currNode, parentOutletMap) {
-        var future = futureNode.value;
-        var curr = currNode ? currNode.value : null;
-        var outlet = parentOutletMap ? parentOutletMap._outlets[futureNode.value.outlet] : null;
-        if (curr && future._routeConfig === curr._routeConfig) {
-            if (!collection_1.shallowEqual(future.params, curr.params)) {
-                this.checks.push(new CanDeactivate(outlet.component, curr), new CanActivate(future));
-            }
-            this.traverseChildRoutes(futureNode, currNode, outlet ? outlet.outletMap : null);
-        }
-        else {
-            this.deactivateOutletAndItChildren(curr, outlet);
-            this.checks.push(new CanActivate(future));
-            this.traverseChildRoutes(futureNode, null, outlet ? outlet.outletMap : null);
-        }
-    };
-    GuardChecks.prototype.deactivateOutletAndItChildren = function (route, outlet) {
-        var _this = this;
-        if (outlet && outlet.isActivated) {
-            collection_1.forEach(outlet.outletMap._outlets, function (v, k) { return _this.deactivateOutletAndItChildren(v, outlet.outletMap._outlets[k]); });
-            this.checks.push(new CanDeactivate(outlet.component, route));
-        }
-    };
-    GuardChecks.prototype.runCanActivate = function (future) {
-        var _this = this;
-        var canActivate = future._routeConfig ? future._routeConfig.canActivate : null;
-        if (!canActivate || canActivate.length === 0)
-            return of_1.of(true);
-        return forkJoin_1.forkJoin(canActivate.map(function (c) {
-            var guard = _this.injector.get(c);
-            if (guard.canActivate) {
-                return of_1.of(guard.canActivate(future, _this.future));
-            }
-            else {
-                return of_1.of(guard(future, _this.future));
-            }
-        })).map(collection_1.and);
-    };
-    GuardChecks.prototype.runCanDeactivate = function (component, curr) {
-        var _this = this;
-        var canDeactivate = curr._routeConfig ? curr._routeConfig.canDeactivate : null;
-        if (!canDeactivate || canDeactivate.length === 0)
-            return of_1.of(true);
-        return forkJoin_1.forkJoin(canDeactivate.map(function (c) {
-            var guard = _this.injector.get(c);
-            if (guard.canDeactivate) {
-                return of_1.of(guard.canDeactivate(component, curr, _this.curr));
-            }
-            else {
-                return of_1.of(guard(component, curr, _this.curr));
-            }
-        })).map(collection_1.and);
-    };
-    return GuardChecks;
-}());
-var ActivateRoutes = (function () {
-    function ActivateRoutes(futureState, currState) {
-        this.futureState = futureState;
-        this.currState = currState;
-    }
-    ActivateRoutes.prototype.activate = function (parentOutletMap) {
-        var futureRoot = this.futureState._root;
-        var currRoot = this.currState ? this.currState._root : null;
-        pushQueryParamsAndFragment(this.futureState);
-        this.activateChildRoutes(futureRoot, currRoot, parentOutletMap);
-    };
-    ActivateRoutes.prototype.activateChildRoutes = function (futureNode, currNode, outletMap) {
-        var _this = this;
-        var prevChildren = nodeChildrenAsMap(currNode);
-        futureNode.children.forEach(function (c) {
-            _this.activateRoutes(c, prevChildren[c.value.outlet], outletMap);
-            delete prevChildren[c.value.outlet];
-        });
-        collection_1.forEach(prevChildren, function (v, k) { return _this.deactivateOutletAndItChildren(outletMap._outlets[k]); });
-    };
-    ActivateRoutes.prototype.activateRoutes = function (futureNode, currNode, parentOutletMap) {
-        var future = futureNode.value;
-        var curr = currNode ? currNode.value : null;
-        var outlet = getOutlet(parentOutletMap, futureNode.value);
-        if (future === curr) {
-            router_state_1.advanceActivatedRoute(future);
-            this.activateChildRoutes(futureNode, currNode, outlet.outletMap);
-        }
-        else {
-            this.deactivateOutletAndItChildren(outlet);
-            var outletMap = new router_outlet_map_1.RouterOutletMap();
-            this.activateNewRoutes(outletMap, future, outlet);
-            this.activateChildRoutes(futureNode, null, outletMap);
-        }
-    };
-    ActivateRoutes.prototype.activateNewRoutes = function (outletMap, future, outlet) {
-        var resolved = core_1.ReflectiveInjector.resolve([
-            { provide: router_state_1.ActivatedRoute, useValue: future },
-            { provide: router_outlet_map_1.RouterOutletMap, useValue: outletMap }
-        ]);
-        outlet.activate(future._futureSnapshot._resolvedComponentFactory, resolved, outletMap);
-        router_state_1.advanceActivatedRoute(future);
-    };
-    ActivateRoutes.prototype.deactivateOutletAndItChildren = function (outlet) {
-        var _this = this;
-        if (outlet && outlet.isActivated) {
-            collection_1.forEach(outlet.outletMap._outlets, function (v, k) { return _this.deactivateOutletAndItChildren(v); });
-            outlet.deactivate();
-        }
-    };
-    return ActivateRoutes;
-}());
-function pushQueryParamsAndFragment(state) {
-    if (!collection_1.shallowEqual(state.snapshot.queryParams, state.queryParams.value)) {
-        state.queryParams.next(state.snapshot.queryParams);
-    }
-    if (state.snapshot.fragment !== state.fragment.value) {
-        state.fragment.next(state.snapshot.fragment);
-    }
-}
-function nodeChildrenAsMap(node) {
-    return node ?
-        node.children.reduce(function (m, c) {
-            m[c.value.outlet] = c;
-            return m;
-        }, {}) :
-        {};
-}
-function getOutlet(outletMap, route) {
-    var outlet = outletMap._outlets[route.outlet];
-    if (!outlet) {
-        if (route.outlet === shared_1.PRIMARY_OUTLET) {
-            throw new Error("Cannot find primary outlet");
-        }
-        else {
-            throw new Error("Cannot find the outlet " + route.outlet);
-        }
-    }
-    return outlet;
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router.ts"],"names":[],"mappings":"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","sourcesContent":["import { ComponentResolver, ReflectiveInjector, Type, Injector } from '@angular/core';\nimport { Location } from '@angular/common';\nimport { UrlSerializer } from './url_serializer';\nimport { RouterOutletMap } from './router_outlet_map';\nimport { recognize } from './recognize';\nimport { resolve } from './resolve';\nimport { createRouterState } from './create_router_state';\nimport { TreeNode } from './utils/tree';\nimport { UrlTree, createEmptyUrlTree } from './url_tree';\nimport { PRIMARY_OUTLET, Params } from './shared';\nimport { createEmptyState, RouterState, RouterStateSnapshot, ActivatedRoute, ActivatedRouteSnapshot, advanceActivatedRoute} from './router_state';\nimport { RouterConfig } from './config';\nimport { RouterOutlet } from './directives/router_outlet';\nimport { createUrlTree } from './create_url_tree';\nimport { forEach, and, shallowEqual } from './utils/collection';\nimport { Observable } from 'rxjs/Observable';\nimport { Subscription } from 'rxjs/Subscription';\nimport { Subject } from 'rxjs/Subject';\nimport 'rxjs/add/operator/map';\nimport 'rxjs/add/operator/scan';\nimport 'rxjs/add/operator/mergeMap';\nimport 'rxjs/add/operator/concat';\nimport 'rxjs/add/operator/concatMap';\nimport {of} from 'rxjs/observable/of';\nimport {forkJoin} from 'rxjs/observable/forkJoin';\n\nexport interface NavigationExtras { relativeTo?: ActivatedRoute; queryParameters?: Params; fragment?: string; }\n\n/**\n * An event triggered when a navigation starts\n */\nexport class NavigationStart { constructor(public id:number, public url:UrlTree) {} }\n\n/**\n * An event triggered when a navigation ends successfully\n */\nexport class NavigationEnd { constructor(public id:number, public url:UrlTree) {} }\n\n/**\n * An event triggered when a navigation is canceled\n */\nexport class NavigationCancel { constructor(public id:number, public url:UrlTree) {} }\n\n/**\n * An event triggered when a navigation fails due to unexpected error\n */\nexport class NavigationError { constructor(public id:number, public url:UrlTree, public error:any) {} }\n\nexport type Event = NavigationStart | NavigationEnd | NavigationCancel | NavigationError;\n\n/**\n * The `Router` is responsible for mapping URLs to components.\n */\nexport class Router {\n  private currentUrlTree: UrlTree;\n  private currentRouterState: RouterState;\n  private config: RouterConfig;\n  private locationSubscription: Subscription;\n  private routerEvents: Subject<Event>;\n  private navigationId: number = 0;\n\n  /**\n   * @internal\n   */\n  constructor(private rootComponentType:Type, private resolver: ComponentResolver, private urlSerializer: UrlSerializer, private outletMap: RouterOutletMap, private location: Location, private injector: Injector) {\n    this.routerEvents = new Subject<Event>();\n    this.currentUrlTree = createEmptyUrlTree();\n    this.currentRouterState = createEmptyState(rootComponentType);\n    this.setUpLocationChangeListener();\n    this.navigateByUrl(this.location.path());\n  }\n\n  /**\n   * Returns the current route state.\n   */\n  get routerState(): RouterState {\n    return this.currentRouterState;\n  }\n\n  /**\n   * Returns the current url tree.\n   */\n  get urlTree(): UrlTree {\n    return this.currentUrlTree;\n  }\n\n  /**\n   * Returns an observable of route events\n   */\n  get events(): Observable<Event> {\n    return this.routerEvents;\n  }\n\n  /**\n   * Navigate based on the provided url. This navigation is always absolute.\n   *\n   * Returns a promise that:\n   * - is resolved with 'true' when navigation succeeds\n   * - is resolved with 'false' when navigation fails\n   * - is rejected when an error happens\n   *\n   * ### Usage\n   *\n   * ```\n   * router.navigateByUrl(\"/team/33/user/11\");\n   * ```\n   */\n  navigateByUrl(url: string): Promise<boolean> {\n    const urlTree = this.urlSerializer.parse(url);\n    return this.scheduleNavigation(urlTree, false);\n  }\n\n  /**\n   * Resets the configuration used for navigation and generating links.\n   *\n   * ### Usage\n   *\n   * ```\n   * router.resetConfig([\n   *  { path: 'team/:id', component: TeamCmp, children: [\n   *    { path: 'simple', component: SimpleCmp },\n   *    { path: 'user/:name', component: UserCmp }\n   *  ] }\n   * ]);\n   * ```\n   */\n  resetConfig(config: RouterConfig): void {\n    this.config = config;\n  }\n\n  /**\n   * @internal\n   */\n  dispose(): void { this.locationSubscription.unsubscribe(); }\n\n  /**\n   * Applies an array of commands to the current url tree and creates\n   * a new url tree.\n   *\n   * When given an activate route, applies the given commands starting from the route.\n   * When not given a route, applies the given command starting from the root.\n   *\n   * ### Usage\n   *\n   * ```\n   * // create /team/33/user/11\n   * router.createUrlTree(['/team', 33, 'user', 11]);\n   *\n   * // create /team/33;expand=true/user/11\n   * router.createUrlTree(['/team', 33, {expand: true}, 'user', 11]);\n   *\n   * // you can collapse static fragments like this\n   * router.createUrlTree(['/team/33/user', userId]);\n   *\n   * // assuming the current url is `/team/33/user/11` and the route points to `user/11`\n   *\n   * // navigate to /team/33/user/11/details\n   * router.createUrlTree(['details'], {relativeTo: route});\n   *\n   * // navigate to /team/33/user/22\n   * router.createUrlTree(['../22'], {relativeTo: route});\n   *\n   * // navigate to /team/44/user/22\n   * router.createUrlTree(['../../team/44/user/22'], {relativeTo: route});\n   * ```\n   */\n  createUrlTree(commands: any[], {relativeTo, queryParameters, fragment}: NavigationExtras = {}): UrlTree {\n    const a = relativeTo ? relativeTo : this.routerState.root;\n    return createUrlTree(a, this.currentUrlTree, commands, queryParameters, fragment);\n  }\n\n\n  /**\n   * Navigate based on the provided array of commands and a starting point.\n   * If no starting route is provided, the navigation is absolute.\n   *\n   * Returns a promise that:\n   * - is resolved with 'true' when navigation succeeds\n   * - is resolved with 'false' when navigation fails\n   * - is rejected when an error happens\n   *\n   * ### Usage\n   *\n   * ```\n   * router.navigate(['team', 33, 'team', '11], {relativeTo: route});\n   * ```\n   */\n  navigate(commands: any[], extras: NavigationExtras = {}): Promise<boolean> {\n    return this.scheduleNavigation(this.createUrlTree(commands, extras), false);\n  }\n\n  /**\n   * Serializes a {@link UrlTree} into a string.\n   */\n  serializeUrl(url: UrlTree): string { return this.urlSerializer.serialize(url); }\n\n  /**\n   * Parse a string into a {@link UrlTree}.\n   */\n  parseUrl(url: string): UrlTree { return this.urlSerializer.parse(url); }\n\n  private scheduleNavigation(url: UrlTree, pop: boolean):Promise<boolean> {\n    const id = ++ this.navigationId;\n    this.routerEvents.next(new NavigationStart(id, url));\n    return Promise.resolve().then((_) => this.runNavigate(url, false, id));\n  }\n\n  private setUpLocationChangeListener(): void {\n    this.locationSubscription = <any>this.location.subscribe((change) => {\n      return this.scheduleNavigation(this.urlSerializer.parse(change['url']), change['pop']);\n    });\n  }\n\n  private runNavigate(url: UrlTree, pop: boolean, id: number):Promise<boolean> {\n    if (id !== this.navigationId) {\n      this.routerEvents.next(new NavigationCancel(id, url));\n      return Promise.resolve(false);\n    }\n\n    return new Promise((resolvePromise, rejectPromise) => {\n      let state;\n      recognize(this.rootComponentType, this.config, url).mergeMap((newRouterStateSnapshot) => {\n        return resolve(this.resolver, newRouterStateSnapshot);\n\n      }).map((routerStateSnapshot) => {\n        return createRouterState(routerStateSnapshot, this.currentRouterState);\n\n      }).map((newState:RouterState) => {\n        state = newState;\n\n      }).mergeMap(_ => {\n        return new GuardChecks(state.snapshot, this.currentRouterState.snapshot, this.injector).check(this.outletMap);\n\n      }).forEach((shouldActivate) => {\n        if (!shouldActivate || id !== this.navigationId) {\n          this.routerEvents.next(new NavigationCancel(id, url));\n          return Promise.resolve(false);\n        }\n\n        new ActivateRoutes(state, this.currentRouterState).activate(this.outletMap);\n\n        this.currentUrlTree = url;\n        this.currentRouterState = state;\n        if (!pop) {\n          this.location.go(this.urlSerializer.serialize(url));\n        }\n      }).then(() => {\n        this.routerEvents.next(new NavigationEnd(id, url));\n        resolvePromise(true);\n\n      }, e => {\n        this.routerEvents.next(new NavigationError(id, url, e));\n        rejectPromise(e);\n      });\n    });\n  }\n}\n\nclass CanActivate { constructor(public route: ActivatedRouteSnapshot) {}}\nclass CanDeactivate { constructor(public component: Object, public route: ActivatedRouteSnapshot) {}}\n\nclass GuardChecks {\n  private checks = [];\n  constructor(private future: RouterStateSnapshot, private curr: RouterStateSnapshot, private injector: Injector) {}\n\n  check(parentOutletMap: RouterOutletMap): Observable<boolean> {\n    const futureRoot = this.future._root;\n    const currRoot = this.curr ? this.curr._root : null;\n    this.traverseChildRoutes(futureRoot, currRoot, parentOutletMap);\n    if (this.checks.length === 0) return of(true);\n    return forkJoin(this.checks.map(s => {\n      if (s instanceof CanActivate) {\n        return this.runCanActivate(s.route)\n      } else if (s instanceof CanDeactivate) {\n        return this.runCanDeactivate(s.component, s.route);\n      } else {\n        throw new Error(\"Cannot be reached\");\n      }\n    })).map(and);\n  }\n\n  private traverseChildRoutes(futureNode: TreeNode<ActivatedRouteSnapshot>,\n                              currNode: TreeNode<ActivatedRouteSnapshot> | null,\n                              outletMap: RouterOutletMap | null): void {\n    const prevChildren = nodeChildrenAsMap(currNode);\n    futureNode.children.forEach(c => {\n      this.traverseRoutes(c, prevChildren[c.value.outlet], outletMap);\n      delete prevChildren[c.value.outlet];\n    });\n    forEach(prevChildren, (v, k) => this.deactivateOutletAndItChildren(v, outletMap._outlets[k]));\n  }\n\n  traverseRoutes(futureNode: TreeNode<ActivatedRouteSnapshot>, currNode: TreeNode<ActivatedRouteSnapshot> | null,\n                 parentOutletMap: RouterOutletMap | null): void {\n    const future = futureNode.value;\n    const curr = currNode ? currNode.value : null;\n    const outlet = parentOutletMap ? parentOutletMap._outlets[futureNode.value.outlet] : null;\n\n    if (curr && future._routeConfig === curr._routeConfig) {\n      if (!shallowEqual(future.params, curr.params)) {\n        this.checks.push(new CanDeactivate(outlet.component, curr), new CanActivate(future));\n      }\n      this.traverseChildRoutes(futureNode, currNode, outlet ? outlet.outletMap : null);\n    } else {\n      this.deactivateOutletAndItChildren(curr, outlet);\n      this.checks.push(new CanActivate(future));\n      this.traverseChildRoutes(futureNode, null, outlet ? outlet.outletMap : null);\n    }\n  }\n\n  private deactivateOutletAndItChildren(route: ActivatedRouteSnapshot, outlet: RouterOutlet): void {\n    if (outlet && outlet.isActivated) {\n      forEach(outlet.outletMap._outlets, (v, k) => this.deactivateOutletAndItChildren(v, outlet.outletMap._outlets[k]));\n      this.checks.push(new CanDeactivate(outlet.component, route))\n    }\n  }\n\n  private runCanActivate(future: ActivatedRouteSnapshot): Observable<boolean> {\n    const canActivate = future._routeConfig ? future._routeConfig.canActivate : null;\n    if (!canActivate || canActivate.length === 0) return of(true);\n    return forkJoin(canActivate.map(c => {\n      const guard = this.injector.get(c);\n      if (guard.canActivate) {\n        return of(guard.canActivate(future, this.future));\n      } else {\n        return of(guard(future, this.future));\n      }\n    })).map(and);\n  }\n\n  private runCanDeactivate(component: Object, curr: ActivatedRouteSnapshot): Observable<boolean> {\n    const canDeactivate = curr._routeConfig ? curr._routeConfig.canDeactivate : null;\n    if (!canDeactivate || canDeactivate.length === 0) return of(true);\n    return forkJoin(canDeactivate.map(c => {\n      const guard = this.injector.get(c);\n      if (guard.canDeactivate) {\n        return of(guard.canDeactivate(component, curr, this.curr));\n      } else {\n        return of(guard(component, curr, this.curr));\n      }\n    })).map(and);\n  }\n}\n\nclass ActivateRoutes {\n  constructor(private futureState: RouterState, private currState: RouterState) {}\n\n  activate(parentOutletMap: RouterOutletMap):void {\n    const futureRoot = this.futureState._root;\n    const currRoot = this.currState ? this.currState._root : null;\n\n    pushQueryParamsAndFragment(this.futureState);\n    this.activateChildRoutes(futureRoot, currRoot, parentOutletMap);\n  }\n\n  private activateChildRoutes(futureNode: TreeNode<ActivatedRoute>,\n                              currNode: TreeNode<ActivatedRoute> | null,\n                              outletMap: RouterOutletMap): void {\n    const prevChildren = nodeChildrenAsMap(currNode);\n    futureNode.children.forEach(c => {\n      this.activateRoutes(c, prevChildren[c.value.outlet], outletMap);\n      delete prevChildren[c.value.outlet];\n    });\n    forEach(prevChildren, (v, k) => this.deactivateOutletAndItChildren(outletMap._outlets[k]));\n  }\n\n  activateRoutes(futureNode: TreeNode<ActivatedRoute>, currNode: TreeNode<ActivatedRoute> | null,\n                 parentOutletMap: RouterOutletMap): void {\n    const future = futureNode.value;\n    const curr = currNode ? currNode.value : null;\n    const outlet = getOutlet(parentOutletMap, futureNode.value);\n\n    if (future === curr) {\n      advanceActivatedRoute(future);\n      this.activateChildRoutes(futureNode, currNode, outlet.outletMap);\n    } else {\n      this.deactivateOutletAndItChildren(outlet);\n      const outletMap = new RouterOutletMap();\n      this.activateNewRoutes(outletMap, future, outlet);\n      this.activateChildRoutes(futureNode, null, outletMap);\n    }\n  }\n\n  private activateNewRoutes(outletMap: RouterOutletMap, future: ActivatedRoute, outlet: RouterOutlet): void {\n    const resolved = ReflectiveInjector.resolve([\n      {provide: ActivatedRoute, useValue: future},\n      {provide: RouterOutletMap, useValue: outletMap}\n    ]);\n    outlet.activate(future._futureSnapshot._resolvedComponentFactory, resolved, outletMap);\n    advanceActivatedRoute(future);\n  }\n\n  private deactivateOutletAndItChildren(outlet: RouterOutlet): void {\n    if (outlet && outlet.isActivated) {\n      forEach(outlet.outletMap._outlets, (v, k) => this.deactivateOutletAndItChildren(v));\n      outlet.deactivate();\n    }\n  }\n}\n\nfunction pushQueryParamsAndFragment(state: RouterState): void {\n  if (!shallowEqual(state.snapshot.queryParams, (<any>state.queryParams).value)) {\n    (<any>state.queryParams).next(state.snapshot.queryParams);\n  }\n\n  if (state.snapshot.fragment !== (<any>state.fragment).value) {\n    (<any>state.fragment).next(state.snapshot.fragment);\n  }\n}\n\nfunction nodeChildrenAsMap(node: TreeNode<any>|null) {\n  return node ?\n    node.children.reduce(\n      (m, c) => {\n        m[c.value.outlet] = c;\n        return m;\n      },\n      {}) :\n  {};\n}\n\nfunction getOutlet(outletMap: RouterOutletMap, route: ActivatedRoute): RouterOutlet {\n  let outlet = outletMap._outlets[route.outlet];\n  if (!outlet) {\n    if (route.outlet === PRIMARY_OUTLET) {\n      throw new Error(`Cannot find primary outlet`);\n    } else {\n      throw new Error(`Cannot find the outlet ${route.outlet}`);\n    }\n  }\n  return outlet;\n}\n"]}
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/router_outlet_map.d.ts b/modules/@angular/router/build/src/router_outlet_map.d.ts
deleted file mode 100644
index df50474269..0000000000
--- a/modules/@angular/router/build/src/router_outlet_map.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { RouterOutlet } from './directives/router_outlet';
-export declare class RouterOutletMap {
-    _outlets: {
-        [name: string]: RouterOutlet;
-    };
-    registerOutlet(name: string, outlet: RouterOutlet): void;
-}
diff --git a/modules/@angular/router/build/src/router_outlet_map.js b/modules/@angular/router/build/src/router_outlet_map.js
deleted file mode 100644
index 1895fca1f3..0000000000
--- a/modules/@angular/router/build/src/router_outlet_map.js
+++ /dev/null
@@ -1,10 +0,0 @@
-"use strict";
-var RouterOutletMap = (function () {
-    function RouterOutletMap() {
-        this._outlets = {};
-    }
-    RouterOutletMap.prototype.registerOutlet = function (name, outlet) { this._outlets[name] = outlet; };
-    return RouterOutletMap;
-}());
-exports.RouterOutletMap = RouterOutletMap;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyX291dGxldF9tYXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcm91dGVyX291dGxldF9tYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUtBO0lBQUE7UUFFRSxhQUFRLEdBQW1DLEVBQUUsQ0FBQztJQUVoRCxDQUFDO0lBREMsd0NBQWMsR0FBZCxVQUFlLElBQVksRUFBRSxNQUFvQixJQUFVLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQztJQUM1RixzQkFBQztBQUFELENBQUMsQUFKRCxJQUlDO0FBSlksdUJBQWUsa0JBSTNCLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSb3V0ZXJPdXRsZXQgfSBmcm9tICcuL2RpcmVjdGl2ZXMvcm91dGVyX291dGxldCc7XG5cbi8qKlxuICogQGludGVybmFsXG4gKi9cbmV4cG9ydCBjbGFzcyBSb3V0ZXJPdXRsZXRNYXAge1xuICAvKiogQGludGVybmFsICovXG4gIF9vdXRsZXRzOiB7W25hbWU6IHN0cmluZ106IFJvdXRlck91dGxldH0gPSB7fTtcbiAgcmVnaXN0ZXJPdXRsZXQobmFtZTogc3RyaW5nLCBvdXRsZXQ6IFJvdXRlck91dGxldCk6IHZvaWQgeyB0aGlzLl9vdXRsZXRzW25hbWVdID0gb3V0bGV0OyB9XG59XG4iXX0=
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/router_providers.d.ts b/modules/@angular/router/build/src/router_providers.d.ts
deleted file mode 100644
index dea74761c8..0000000000
--- a/modules/@angular/router/build/src/router_providers.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { RouterConfig } from './config';
-export declare function provideRouter(config: RouterConfig): any[];
diff --git a/modules/@angular/router/build/src/router_providers.js b/modules/@angular/router/build/src/router_providers.js
deleted file mode 100644
index 3317aaea89..0000000000
--- a/modules/@angular/router/build/src/router_providers.js
+++ /dev/null
@@ -1,11 +0,0 @@
-"use strict";
-var common = require('./common_router_providers');
-var platform_browser_1 = require('@angular/platform-browser');
-var common_1 = require('@angular/common');
-function provideRouter(config) {
-    return [
-        { provide: common_1.PlatformLocation, useClass: platform_browser_1.BrowserPlatformLocation }
-    ].concat(common.provideRouter(config));
-}
-exports.provideRouter = provideRouter;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVyX3Byb3ZpZGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9yb3V0ZXJfcHJvdmlkZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxJQUFZLE1BQU0sV0FBTSwyQkFBMkIsQ0FBQyxDQUFBO0FBQ3BELGlDQUFzQywyQkFBMkIsQ0FBQyxDQUFBO0FBQ2xFLHVCQUErQixpQkFBaUIsQ0FBQyxDQUFBO0FBb0JqRCx1QkFBOEIsTUFBb0I7SUFDaEQsTUFBTSxDQUFDO1FBQ0wsRUFBQyxPQUFPLEVBQUUseUJBQWdCLEVBQUUsUUFBUSxFQUFFLDBDQUF1QixFQUFDO2FBQzNELE1BQU0sQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLENBQ2hDLENBQUM7QUFDSixDQUFDO0FBTGUscUJBQWEsZ0JBSzVCLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSb3V0ZXJDb25maWcgfSBmcm9tICcuL2NvbmZpZyc7XG5pbXBvcnQgKiBhcyBjb21tb24gZnJvbSAnLi9jb21tb25fcm91dGVyX3Byb3ZpZGVycyc7XG5pbXBvcnQge0Jyb3dzZXJQbGF0Zm9ybUxvY2F0aW9ufSBmcm9tICdAYW5ndWxhci9wbGF0Zm9ybS1icm93c2VyJztcbmltcG9ydCB7UGxhdGZvcm1Mb2NhdGlvbn0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcblxuLyoqXG4gKiBBIGxpc3Qgb2Yge0BsaW5rIFByb3ZpZGVyfXMuIFRvIHVzZSB0aGUgcm91dGVyLCB5b3UgbXVzdCBhZGQgdGhpcyB0byB5b3VyIGFwcGxpY2F0aW9uLlxuICpcbiAqICMjIyBFeGFtcGxlXG4gKlxuICogYGBgXG4gKiBAQ29tcG9uZW50KHtkaXJlY3RpdmVzOiBbUk9VVEVSX0RJUkVDVElWRVNdfSlcbiAqIGNsYXNzIEFwcENtcCB7XG4gKiAgIC8vIC4uLlxuICogfVxuICogXG4gKiBjb25zdCByb3V0ZXIgPSBbXG4gKiAgIHtwYXRoOiAnL2hvbWUnLCBjb21wb25lbnQ6IEhvbWV9XG4gKiBdO1xuICpcbiAqIGJvb3RzdHJhcChBcHBDbXAsIFtwcm92aWRlUm91dGVyKHJvdXRlcildKTtcbiAqIGBgYFxuICovXG5leHBvcnQgZnVuY3Rpb24gcHJvdmlkZVJvdXRlcihjb25maWc6IFJvdXRlckNvbmZpZyk6YW55W10ge1xuICByZXR1cm4gW1xuICAgIHtwcm92aWRlOiBQbGF0Zm9ybUxvY2F0aW9uLCB1c2VDbGFzczogQnJvd3NlclBsYXRmb3JtTG9jYXRpb259LFxuICAgIC4uLmNvbW1vbi5wcm92aWRlUm91dGVyKGNvbmZpZylcbiAgXTtcbn1cbiJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/router_state.d.ts b/modules/@angular/router/build/src/router_state.d.ts
deleted file mode 100644
index 0a2493803c..0000000000
--- a/modules/@angular/router/build/src/router_state.d.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Tree, TreeNode } from './utils/tree';
-import { UrlSegment } from './url_tree';
-import { Route } from './config';
-import { Params } from './shared';
-import { Observable } from 'rxjs/Observable';
-import { Type, ComponentFactory } from '@angular/core';
-export declare class RouterState extends Tree<ActivatedRoute> {
-    queryParams: Observable<Params>;
-    fragment: Observable<string>;
-    snapshot: RouterStateSnapshot;
-    constructor(root: TreeNode<ActivatedRoute>, queryParams: Observable<Params>, fragment: Observable<string>, snapshot: RouterStateSnapshot);
-}
-export declare function createEmptyState(rootComponent: Type): RouterState;
-export declare class ActivatedRoute {
-    urlSegments: Observable<UrlSegment[]>;
-    params: Observable<Params>;
-    outlet: string;
-    component: Type | string;
-    _futureSnapshot: ActivatedRouteSnapshot;
-    snapshot: ActivatedRouteSnapshot;
-    constructor(urlSegments: Observable<UrlSegment[]>, params: Observable<Params>, outlet: string, component: Type | string, futureSnapshot: ActivatedRouteSnapshot);
-}
-export declare class ActivatedRouteSnapshot {
-    urlSegments: UrlSegment[];
-    params: Params;
-    outlet: string;
-    component: Type | string;
-    _resolvedComponentFactory: ComponentFactory<any>;
-    _routeConfig: Route | null;
-    _lastUrlSegment: UrlSegment;
-    constructor(urlSegments: UrlSegment[], params: Params, outlet: string, component: Type | string, routeConfig: Route | null, lastUrlSegment: UrlSegment);
-}
-export declare class RouterStateSnapshot extends Tree<ActivatedRouteSnapshot> {
-    queryParams: Params;
-    fragment: string | null;
-    constructor(root: TreeNode<ActivatedRouteSnapshot>, queryParams: Params, fragment: string | null);
-}
-export declare function advanceActivatedRoute(route: ActivatedRoute): void;
diff --git a/modules/@angular/router/build/src/router_state.js b/modules/@angular/router/build/src/router_state.js
deleted file mode 100644
index 97bbcab604..0000000000
--- a/modules/@angular/router/build/src/router_state.js
+++ /dev/null
@@ -1,87 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-var tree_1 = require('./utils/tree');
-var collection_1 = require('./utils/collection');
-var url_tree_1 = require('./url_tree');
-var shared_1 = require('./shared');
-var BehaviorSubject_1 = require('rxjs/BehaviorSubject');
-var RouterState = (function (_super) {
-    __extends(RouterState, _super);
-    function RouterState(root, queryParams, fragment, snapshot) {
-        _super.call(this, root);
-        this.queryParams = queryParams;
-        this.fragment = fragment;
-        this.snapshot = snapshot;
-    }
-    return RouterState;
-}(tree_1.Tree));
-exports.RouterState = RouterState;
-function createEmptyState(rootComponent) {
-    var snapshot = createEmptyStateSnapshot(rootComponent);
-    var emptyUrl = new BehaviorSubject_1.BehaviorSubject([new url_tree_1.UrlSegment("", {}, shared_1.PRIMARY_OUTLET)]);
-    var emptyParams = new BehaviorSubject_1.BehaviorSubject({});
-    var emptyQueryParams = new BehaviorSubject_1.BehaviorSubject({});
-    var fragment = new BehaviorSubject_1.BehaviorSubject("");
-    var activated = new ActivatedRoute(emptyUrl, emptyParams, shared_1.PRIMARY_OUTLET, rootComponent, snapshot.root);
-    activated.snapshot = snapshot.root;
-    return new RouterState(new tree_1.TreeNode(activated, []), emptyQueryParams, fragment, snapshot);
-}
-exports.createEmptyState = createEmptyState;
-function createEmptyStateSnapshot(rootComponent) {
-    var rootUrlSegment = new url_tree_1.UrlSegment("", {}, shared_1.PRIMARY_OUTLET);
-    var emptyUrl = [rootUrlSegment];
-    var emptyParams = {};
-    var emptyQueryParams = {};
-    var fragment = "";
-    var activated = new ActivatedRouteSnapshot(emptyUrl, emptyParams, shared_1.PRIMARY_OUTLET, rootComponent, null, rootUrlSegment);
-    return new RouterStateSnapshot(new tree_1.TreeNode(activated, []), emptyQueryParams, fragment);
-}
-var ActivatedRoute = (function () {
-    function ActivatedRoute(urlSegments, params, outlet, component, futureSnapshot) {
-        this.urlSegments = urlSegments;
-        this.params = params;
-        this.outlet = outlet;
-        this.component = component;
-        this._futureSnapshot = futureSnapshot;
-    }
-    return ActivatedRoute;
-}());
-exports.ActivatedRoute = ActivatedRoute;
-var ActivatedRouteSnapshot = (function () {
-    function ActivatedRouteSnapshot(urlSegments, params, outlet, component, routeConfig, lastUrlSegment) {
-        this.urlSegments = urlSegments;
-        this.params = params;
-        this.outlet = outlet;
-        this.component = component;
-        this._routeConfig = routeConfig;
-        this._lastUrlSegment = lastUrlSegment;
-    }
-    return ActivatedRouteSnapshot;
-}());
-exports.ActivatedRouteSnapshot = ActivatedRouteSnapshot;
-var RouterStateSnapshot = (function (_super) {
-    __extends(RouterStateSnapshot, _super);
-    function RouterStateSnapshot(root, queryParams, fragment) {
-        _super.call(this, root);
-        this.queryParams = queryParams;
-        this.fragment = fragment;
-    }
-    return RouterStateSnapshot;
-}(tree_1.Tree));
-exports.RouterStateSnapshot = RouterStateSnapshot;
-function advanceActivatedRoute(route) {
-    if (route.snapshot && !collection_1.shallowEqual(route.snapshot.params, route._futureSnapshot.params)) {
-        route.snapshot = route._futureSnapshot;
-        route.urlSegments.next(route.snapshot.urlSegments);
-        route.params.next(route.snapshot.params);
-    }
-    else {
-        route.snapshot = route._futureSnapshot;
-    }
-}
-exports.advanceActivatedRoute = advanceActivatedRoute;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"router_state.js","sourceRoot":"","sources":["../../src/router_state.ts"],"names":[],"mappings":";;;;;;AAAA,qBAA+B,cAAc,CAAC,CAAA;AAC9C,2BAA6B,oBAAoB,CAAC,CAAA;AAClD,yBAA2B,YAAY,CAAC,CAAA;AAExC,uBAAuC,UAAU,CAAC,CAAA;AAElD,gCAAgC,sBAAsB,CAAC,CAAA;AAkBvD;IAAiC,+BAAoB;IAInD,qBAAY,IAA8B,EAAS,WAA+B,EAAS,QAA4B,EAAS,QAA6B;QAC3J,kBAAM,IAAI,CAAC,CAAC;QADqC,gBAAW,GAAX,WAAW,CAAoB;QAAS,aAAQ,GAAR,QAAQ,CAAoB;QAAS,aAAQ,GAAR,QAAQ,CAAqB;IAE7J,CAAC;IACH,kBAAC;AAAD,CAAC,AAPD,CAAiC,WAAI,GAOpC;AAPY,mBAAW,cAOvB,CAAA;AAED,0BAAiC,aAAmB;IAClD,IAAM,QAAQ,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAC;IACzD,IAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,CAAC,IAAI,qBAAU,CAAC,EAAE,EAAE,EAAE,EAAE,uBAAc,CAAC,CAAC,CAAC,CAAC;IAC/E,IAAM,WAAW,GAAG,IAAI,iCAAe,CAAC,EAAE,CAAC,CAAC;IAC5C,IAAM,gBAAgB,GAAG,IAAI,iCAAe,CAAC,EAAE,CAAC,CAAC;IACjD,IAAM,QAAQ,GAAG,IAAI,iCAAe,CAAC,EAAE,CAAC,CAAC;IACzC,IAAM,SAAS,GAAG,IAAI,cAAc,CAAC,QAAQ,EAAE,WAAW,EAAE,uBAAc,EAAE,aAAa,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC1G,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;IACnC,MAAM,CAAC,IAAI,WAAW,CAAC,IAAI,eAAQ,CAAiB,SAAS,EAAE,EAAE,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAC5G,CAAC;AATe,wBAAgB,mBAS/B,CAAA;AAED,kCAAkC,aAAmB;IACnD,IAAM,cAAc,GAAG,IAAI,qBAAU,CAAC,EAAE,EAAE,EAAE,EAAE,uBAAc,CAAC,CAAC;IAC9D,IAAM,QAAQ,GAAG,CAAC,cAAc,CAAC,CAAC;IAClC,IAAM,WAAW,GAAG,EAAE,CAAC;IACvB,IAAM,gBAAgB,GAAG,EAAE,CAAC;IAC5B,IAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,IAAM,SAAS,GAAG,IAAI,sBAAsB,CAAC,QAAQ,EAAE,WAAW,EAAE,uBAAc,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IACzH,MAAM,CAAC,IAAI,mBAAmB,CAAC,IAAI,eAAQ,CAAyB,SAAS,EAAE,EAAE,CAAC,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;AAClH,CAAC;AAgBD;IAQE,wBAAmB,WAAqC,EACrC,MAA0B,EAC1B,MAAc,EACd,SAAwB,EAC/B,cAAsC;QAJ/B,gBAAW,GAAX,WAAW,CAA0B;QACrC,WAAM,GAAN,MAAM,CAAoB;QAC1B,WAAM,GAAN,MAAM,CAAQ;QACd,cAAS,GAAT,SAAS,CAAe;QAGzC,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;IACxC,CAAC;IACH,qBAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,sBAAc,iBAgB1B,CAAA;AAeD;IAeE,gCAAmB,WAAyB,EACzB,MAAc,EACd,MAAc,EACd,SAAwB,EAC/B,WAAyB,EACzB,cAA0B;QALnB,gBAAW,GAAX,WAAW,CAAc;QACzB,WAAM,GAAN,MAAM,CAAQ;QACd,WAAM,GAAN,MAAM,CAAQ;QACd,cAAS,GAAT,SAAS,CAAe;QAGzC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;IACxC,CAAC;IACH,6BAAC;AAAD,CAAC,AAxBD,IAwBC;AAxBY,8BAAsB,yBAwBlC,CAAA;AAeD;IAAyC,uCAA4B;IAInE,6BAAY,IAAsC,EAAS,WAAmB,EAAS,QAAuB;QAC5G,kBAAM,IAAI,CAAC,CAAC;QAD6C,gBAAW,GAAX,WAAW,CAAQ;QAAS,aAAQ,GAAR,QAAQ,CAAe;IAE9G,CAAC;IACH,0BAAC;AAAD,CAAC,AAPD,CAAyC,WAAI,GAO5C;AAPY,2BAAmB,sBAO/B,CAAA;AAOD,+BAAsC,KAAqB;IACzD,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,yBAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACzF,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,eAAe,CAAC;QACjC,KAAK,CAAC,WAAY,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACpD,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAAC,IAAI,CAAC,CAAC;QACN,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,eAAe,CAAC;IACzC,CAAC;AACH,CAAC;AARe,6BAAqB,wBAQpC,CAAA","sourcesContent":["import { Tree, TreeNode } from './utils/tree';\nimport { shallowEqual } from './utils/collection';\nimport { UrlSegment } from './url_tree';\nimport { Route } from './config';\nimport { Params, PRIMARY_OUTLET } from './shared';\nimport { Observable } from 'rxjs/Observable';\nimport { BehaviorSubject } from 'rxjs/BehaviorSubject';\nimport { Type, ComponentFactory } from '@angular/core';\n\n/**\n * The state of the router.\n *\n * ### Usage\n *\n * ```\n * class MyComponent {\n *   constructor(router: Router) {\n *     const state = router.routerState;\n *     const id: Observable<string> = state.firstChild(state.root).params.map(p => p.id);\n *     const isDebug: Observable<string> = state.queryParams.map(q => q.debug);\n *   }\n * }\n * ```\n */\nexport class RouterState extends Tree<ActivatedRoute> {\n  /**\n   * @internal\n   */\n  constructor(root: TreeNode<ActivatedRoute>, public queryParams: Observable<Params>, public fragment: Observable<string>, public snapshot: RouterStateSnapshot) {\n    super(root);\n  }\n}\n\nexport function createEmptyState(rootComponent: Type): RouterState {\n  const snapshot = createEmptyStateSnapshot(rootComponent);\n  const emptyUrl = new BehaviorSubject([new UrlSegment(\"\", {}, PRIMARY_OUTLET)]);\n  const emptyParams = new BehaviorSubject({});\n  const emptyQueryParams = new BehaviorSubject({});\n  const fragment = new BehaviorSubject(\"\");\n  const activated = new ActivatedRoute(emptyUrl, emptyParams, PRIMARY_OUTLET, rootComponent, snapshot.root);\n  activated.snapshot = snapshot.root;\n  return new RouterState(new TreeNode<ActivatedRoute>(activated, []), emptyQueryParams, fragment, snapshot);\n}\n\nfunction createEmptyStateSnapshot(rootComponent: Type): RouterStateSnapshot {\n  const rootUrlSegment = new UrlSegment(\"\", {}, PRIMARY_OUTLET);\n  const emptyUrl = [rootUrlSegment];\n  const emptyParams = {};\n  const emptyQueryParams = {};\n  const fragment = \"\";\n  const activated = new ActivatedRouteSnapshot(emptyUrl, emptyParams, PRIMARY_OUTLET, rootComponent, null, rootUrlSegment);\n  return new RouterStateSnapshot(new TreeNode<ActivatedRouteSnapshot>(activated, []), emptyQueryParams, fragment);\n}\n\n/**\n * Contains the information about a component loaded in an outlet. The information is provided through\n * the params and urlSegments observables.\n *\n * ### Usage\n *\n * ```\n * class MyComponent {\n *   constructor(route: ActivatedRoute) {\n *     const id: Observable<string> = route.params.map(p => p.id);\n *   }\n * }\n * ```\n */\nexport class ActivatedRoute {\n  /** @internal */\n  _futureSnapshot: ActivatedRouteSnapshot;\n  snapshot: ActivatedRouteSnapshot;\n\n  /**\n   * @internal\n   */\n  constructor(public urlSegments: Observable<UrlSegment[]>,\n              public params: Observable<Params>,\n              public outlet: string,\n              public component: Type | string,\n              futureSnapshot: ActivatedRouteSnapshot\n  ) {\n    this._futureSnapshot = futureSnapshot;\n  }\n}\n\n/**\n * Contains the information about a component loaded in an outlet at a particular moment in time.\n *\n * ### Usage\n *\n * ```\n * class MyComponent {\n *   constructor(route: ActivatedRoute) {\n *     const id: string = route.snapshot.params.id;\n *   }\n * }\n * ```\n */\nexport class ActivatedRouteSnapshot {\n  /**\n   * @internal\n   */\n  _resolvedComponentFactory: ComponentFactory<any>;\n  \n  /** @internal **/\n  _routeConfig: Route | null;\n\n  /** @internal **/\n  _lastUrlSegment: UrlSegment;\n\n  /**\n   * @internal\n   */\n  constructor(public urlSegments: UrlSegment[],\n              public params: Params,\n              public outlet: string,\n              public component: Type | string, \n              routeConfig: Route | null,\n              lastUrlSegment: UrlSegment) {\n    this._routeConfig = routeConfig;\n    this._lastUrlSegment = lastUrlSegment;\n  }\n}\n\n/**\n * The state of the router at a particular moment in time.\n *\n * ### Usage\n *\n * ```\n * class MyComponent {\n *   constructor(router: Router) {\n *     const snapshot = router.routerState.snapshot;\n *   }\n * }\n * ```\n */\nexport class RouterStateSnapshot extends Tree<ActivatedRouteSnapshot> {\n  /**\n   * @internal\n   */\n  constructor(root: TreeNode<ActivatedRouteSnapshot>, public queryParams: Params, public fragment: string | null) {\n    super(root);\n  }\n}\n\n/**\n * The expectation is that the activate route is created with the right set of parameters.\n * So we push new values into the observables only when they are not the initial values.\n * And we detect that by checking if the snapshot field is set.\n */\nexport function advanceActivatedRoute(route: ActivatedRoute): void {\n  if (route.snapshot && !shallowEqual(route.snapshot.params, route._futureSnapshot.params)) {\n    route.snapshot = route._futureSnapshot;\n    (<any>route.urlSegments).next(route.snapshot.urlSegments);\n    (<any>route.params).next(route.snapshot.params);\n  } else {\n    route.snapshot = route._futureSnapshot;\n  }\n}"]}
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/shared.d.ts b/modules/@angular/router/build/src/shared.d.ts
deleted file mode 100644
index 2aacfdf7a6..0000000000
--- a/modules/@angular/router/build/src/shared.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export declare const PRIMARY_OUTLET: string;
-export declare type Params = {
-    [key: string]: string;
-};
diff --git a/modules/@angular/router/build/src/shared.js b/modules/@angular/router/build/src/shared.js
deleted file mode 100644
index 9bb5b9dd40..0000000000
--- a/modules/@angular/router/build/src/shared.js
+++ /dev/null
@@ -1,3 +0,0 @@
-"use strict";
-exports.PRIMARY_OUTLET = "PRIMARY_OUTLET";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NoYXJlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBSWEsc0JBQWMsR0FBVyxnQkFBZ0IsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogTmFtZSBvZiB0aGUgcHJpbWFyeSBvdXRsZXQuXG4gKiBAdHlwZSB7c3RyaW5nfVxuICovXG5leHBvcnQgY29uc3QgUFJJTUFSWV9PVVRMRVQ6IHN0cmluZyA9IFwiUFJJTUFSWV9PVVRMRVRcIjtcblxuLyoqXG4gKiBBIGNvbGxlY3Rpb24gb2YgcGFyYW1ldGVycy5cbiAqL1xuZXhwb3J0IHR5cGUgUGFyYW1zID0geyBba2V5OiBzdHJpbmddOiBzdHJpbmcgfTtcbiJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/url_serializer.d.ts b/modules/@angular/router/build/src/url_serializer.d.ts
deleted file mode 100644
index 509f6b4ea0..0000000000
--- a/modules/@angular/router/build/src/url_serializer.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { UrlTree, UrlSegment } from './url_tree';
-export declare abstract class UrlSerializer {
-    abstract parse(url: string): UrlTree;
-    abstract serialize(tree: UrlTree): string;
-}
-export declare class DefaultUrlSerializer implements UrlSerializer {
-    parse(url: string): UrlTree;
-    serialize(tree: UrlTree): string;
-}
-export declare function serializeSegment(segment: UrlSegment): string;
diff --git a/modules/@angular/router/build/src/url_serializer.js b/modules/@angular/router/build/src/url_serializer.js
deleted file mode 100644
index 28352ff41d..0000000000
--- a/modules/@angular/router/build/src/url_serializer.js
+++ /dev/null
@@ -1,224 +0,0 @@
-"use strict";
-var url_tree_1 = require('./url_tree');
-var shared_1 = require('./shared');
-var tree_1 = require('./utils/tree');
-var UrlSerializer = (function () {
-    function UrlSerializer() {
-    }
-    return UrlSerializer;
-}());
-exports.UrlSerializer = UrlSerializer;
-var DefaultUrlSerializer = (function () {
-    function DefaultUrlSerializer() {
-    }
-    DefaultUrlSerializer.prototype.parse = function (url) {
-        var p = new UrlParser(url);
-        return new url_tree_1.UrlTree(p.parseRootSegment(), p.parseQueryParams(), p.parseFragment());
-    };
-    DefaultUrlSerializer.prototype.serialize = function (tree) {
-        var node = serializeUrlTreeNode(tree._root);
-        var query = serializeQueryParams(tree.queryParameters);
-        var fragment = tree.fragment !== null ? "#" + tree.fragment : '';
-        return "" + node + query + fragment;
-    };
-    return DefaultUrlSerializer;
-}());
-exports.DefaultUrlSerializer = DefaultUrlSerializer;
-function serializeUrlTreeNode(node) {
-    return "" + serializeSegment(node.value) + serializeChildren(node);
-}
-function serializeUrlTreeNodes(nodes) {
-    var primary = serializeSegment(nodes[0].value);
-    var secondaryNodes = nodes.slice(1);
-    var secondary = secondaryNodes.length > 0 ? "(" + secondaryNodes.map(serializeUrlTreeNode).join("//") + ")" : "";
-    var children = serializeChildren(nodes[0]);
-    return "" + primary + secondary + children;
-}
-function serializeChildren(node) {
-    if (node.children.length > 0) {
-        return "/" + serializeUrlTreeNodes(node.children);
-    }
-    else {
-        return "";
-    }
-}
-function serializeSegment(segment) {
-    var outlet = segment.outlet === shared_1.PRIMARY_OUTLET ? '' : segment.outlet + ":";
-    return "" + outlet + segment.path + serializeParams(segment.parameters);
-}
-exports.serializeSegment = serializeSegment;
-function serializeParams(params) {
-    return pairs(params).map(function (p) { return (";" + p.first + "=" + p.second); }).join("");
-}
-function serializeQueryParams(params) {
-    var strs = pairs(params).map(function (p) { return (p.first + "=" + p.second); });
-    return strs.length > 0 ? "?" + strs.join("&") : "";
-}
-var Pair = (function () {
-    function Pair(first, second) {
-        this.first = first;
-        this.second = second;
-    }
-    return Pair;
-}());
-function pairs(obj) {
-    var res = [];
-    for (var prop in obj) {
-        if (obj.hasOwnProperty(prop)) {
-            res.push(new Pair(prop, obj[prop]));
-        }
-    }
-    return res;
-}
-var SEGMENT_RE = /^[^\/\(\)\?;=&#]+/;
-function matchUrlSegment(str) {
-    SEGMENT_RE.lastIndex = 0;
-    var match = SEGMENT_RE.exec(str);
-    return match ? match[0] : '';
-}
-var QUERY_PARAM_VALUE_RE = /^[^\(\)\?;&#]+/;
-function matchUrlQueryParamValue(str) {
-    QUERY_PARAM_VALUE_RE.lastIndex = 0;
-    var match = QUERY_PARAM_VALUE_RE.exec(str);
-    return match ? match[0] : '';
-}
-var UrlParser = (function () {
-    function UrlParser(remaining) {
-        this.remaining = remaining;
-    }
-    UrlParser.prototype.peekStartsWith = function (str) { return this.remaining.startsWith(str); };
-    UrlParser.prototype.capture = function (str) {
-        if (!this.remaining.startsWith(str)) {
-            throw new Error("Expected \"" + str + "\".");
-        }
-        this.remaining = this.remaining.substring(str.length);
-    };
-    UrlParser.prototype.parseRootSegment = function () {
-        if (this.remaining == '' || this.remaining == '/') {
-            return new tree_1.TreeNode(new url_tree_1.UrlSegment('', {}, shared_1.PRIMARY_OUTLET), []);
-        }
-        else {
-            var segments = this.parseSegments(false);
-            return new tree_1.TreeNode(new url_tree_1.UrlSegment('', {}, shared_1.PRIMARY_OUTLET), segments);
-        }
-    };
-    UrlParser.prototype.parseSegments = function (hasOutletName) {
-        if (this.remaining.length == 0) {
-            return [];
-        }
-        if (this.peekStartsWith('/')) {
-            this.capture('/');
-        }
-        var path = matchUrlSegment(this.remaining);
-        this.capture(path);
-        var outletName;
-        if (hasOutletName) {
-            if (path.indexOf(":") === -1) {
-                throw new Error("Not outlet name is provided");
-            }
-            if (path.indexOf(":") > -1 && hasOutletName) {
-                var parts = path.split(":");
-                outletName = parts[0];
-                path = parts[1];
-            }
-        }
-        else {
-            if (path.indexOf(":") > -1) {
-                throw new Error("Not outlet name is allowed");
-            }
-            outletName = shared_1.PRIMARY_OUTLET;
-        }
-        var matrixParams = {};
-        if (this.peekStartsWith(';')) {
-            matrixParams = this.parseMatrixParams();
-        }
-        var secondary = [];
-        if (this.peekStartsWith('(')) {
-            secondary = this.parseSecondarySegments();
-        }
-        var children = [];
-        if (this.peekStartsWith('/') && !this.peekStartsWith('//')) {
-            this.capture('/');
-            children = this.parseSegments(false);
-        }
-        var segment = new url_tree_1.UrlSegment(path, matrixParams, outletName);
-        var node = new tree_1.TreeNode(segment, children);
-        return [node].concat(secondary);
-    };
-    UrlParser.prototype.parseQueryParams = function () {
-        var params = {};
-        if (this.peekStartsWith('?')) {
-            this.capture('?');
-            this.parseQueryParam(params);
-            while (this.remaining.length > 0 && this.peekStartsWith('&')) {
-                this.capture('&');
-                this.parseQueryParam(params);
-            }
-        }
-        return params;
-    };
-    UrlParser.prototype.parseFragment = function () {
-        if (this.peekStartsWith('#')) {
-            return this.remaining.substring(1);
-        }
-        else {
-            return null;
-        }
-    };
-    UrlParser.prototype.parseMatrixParams = function () {
-        var params = {};
-        while (this.remaining.length > 0 && this.peekStartsWith(';')) {
-            this.capture(';');
-            this.parseParam(params);
-        }
-        return params;
-    };
-    UrlParser.prototype.parseParam = function (params) {
-        var key = matchUrlSegment(this.remaining);
-        if (!key) {
-            return;
-        }
-        this.capture(key);
-        var value = "true";
-        if (this.peekStartsWith('=')) {
-            this.capture('=');
-            var valueMatch = matchUrlSegment(this.remaining);
-            if (valueMatch) {
-                value = valueMatch;
-                this.capture(value);
-            }
-        }
-        params[key] = value;
-    };
-    UrlParser.prototype.parseQueryParam = function (params) {
-        var key = matchUrlSegment(this.remaining);
-        if (!key) {
-            return;
-        }
-        this.capture(key);
-        var value = "true";
-        if (this.peekStartsWith('=')) {
-            this.capture('=');
-            var valueMatch = matchUrlQueryParamValue(this.remaining);
-            if (valueMatch) {
-                value = valueMatch;
-                this.capture(value);
-            }
-        }
-        params[key] = value;
-    };
-    UrlParser.prototype.parseSecondarySegments = function () {
-        var segments = [];
-        this.capture('(');
-        while (!this.peekStartsWith(')') && this.remaining.length > 0) {
-            segments = segments.concat(this.parseSegments(true));
-            if (this.peekStartsWith('//')) {
-                this.capture('//');
-            }
-        }
-        this.capture(')');
-        return segments;
-    };
-    return UrlParser;
-}());
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"url_serializer.js","sourceRoot":"","sources":["../../src/url_serializer.ts"],"names":[],"mappings":"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","sourcesContent":["import { UrlTree, UrlSegment } from './url_tree';\nimport { PRIMARY_OUTLET } from './shared';\nimport { TreeNode } from './utils/tree';\n\n/**\n * Defines a way to serialize/deserialize a url tree.\n */\nexport abstract class UrlSerializer {\n  /**\n   * Parse a url into a {@Link UrlTree}\n   */\n  abstract parse(url: string): UrlTree;\n\n  /**\n   * Converts a {@Link UrlTree} into a url\n   */\n  abstract serialize(tree: UrlTree): string;\n}\n\n/**\n * A default implementation of the serialization.\n */\nexport class DefaultUrlSerializer implements UrlSerializer {\n  parse(url: string): UrlTree {\n    const p = new UrlParser(url);\n    return new UrlTree(p.parseRootSegment(), p.parseQueryParams(), p.parseFragment());\n  }\n\n  serialize(tree: UrlTree): string { \n    const node = serializeUrlTreeNode(tree._root);\n    const query = serializeQueryParams(tree.queryParameters);\n    const fragment = tree.fragment !== null ? `#${tree.fragment}` : '';\n    return `${node}${query}${fragment}`;\n  }\n}\n\nfunction serializeUrlTreeNode(node: TreeNode<UrlSegment>): string {\n  return `${serializeSegment(node.value)}${serializeChildren(node)}`;\n}\n\nfunction serializeUrlTreeNodes(nodes: TreeNode<UrlSegment>[]): string {\n  const primary = serializeSegment(nodes[0].value);\n  const secondaryNodes = nodes.slice(1);\n  const secondary = secondaryNodes.length > 0 ? `(${secondaryNodes.map(serializeUrlTreeNode).join(\"//\")})` : \"\";\n  const children = serializeChildren(nodes[0]);\n  return `${primary}${secondary}${children}`;\n}\n\nfunction serializeChildren(node: TreeNode<UrlSegment>): string {\n  if (node.children.length > 0) {\n    return `/${serializeUrlTreeNodes(node.children)}`;\n  } else {\n    return \"\";\n  }\n}\n\nexport function serializeSegment(segment: UrlSegment): string {\n  const outlet = segment.outlet === PRIMARY_OUTLET ? '' : `${segment.outlet}:`;\n  return `${outlet}${segment.path}${serializeParams(segment.parameters)}`;\n}\n\nfunction serializeParams(params: {[key: string]: string}): string {\n  return pairs(params).map(p => `;${p.first}=${p.second}`).join(\"\");\n}\n\nfunction serializeQueryParams(params: {[key: string]: string}): string {\n  const strs = pairs(params).map(p => `${p.first}=${p.second}`);\n  return strs.length > 0 ? `?${strs.join(\"&\")}` : \"\";\n}\n\nclass Pair<A,B> { constructor(public first:A, public second:B) {} }\nfunction pairs<T>(obj: {[key: string]: T}):Pair<string,T>[] {\n  const res = [];\n  for (let prop in obj) {\n    if (obj.hasOwnProperty(prop)) {\n      res.push(new Pair<string, T>(prop, obj[prop]));\n    }\n  }\n  return res;\n}\n\nconst SEGMENT_RE = /^[^\\/\\(\\)\\?;=&#]+/;\nfunction matchUrlSegment(str: string): string {\n  SEGMENT_RE.lastIndex = 0;\n  var match = SEGMENT_RE.exec(str);\n  return match ? match[0] : '';\n}\n\nconst QUERY_PARAM_VALUE_RE = /^[^\\(\\)\\?;&#]+/;\nfunction matchUrlQueryParamValue(str: string): string {\n  QUERY_PARAM_VALUE_RE.lastIndex = 0;\n  const match = QUERY_PARAM_VALUE_RE.exec(str);\n  return match ? match[0] : '';\n}\n\nclass UrlParser {\n  constructor(private remaining: string) {}\n\n  peekStartsWith(str: string): boolean { return this.remaining.startsWith(str); }\n\n  capture(str: string): void {\n    if (!this.remaining.startsWith(str)) {\n      throw new Error(`Expected \"${str}\".`);\n    }\n    this.remaining = this.remaining.substring(str.length);\n  }\n\n  parseRootSegment(): TreeNode<UrlSegment> {\n    if (this.remaining  == '' || this.remaining == '/') {\n      return new TreeNode<UrlSegment>(new UrlSegment('', {}, PRIMARY_OUTLET), []);\n    } else {\n      const segments = this.parseSegments(false);\n      return new TreeNode<UrlSegment>(new UrlSegment('', {}, PRIMARY_OUTLET), segments);\n    }\n  }\n\n  parseSegments(hasOutletName: boolean): TreeNode<UrlSegment>[] {\n    if (this.remaining.length == 0) {\n      return [];\n    }\n    if (this.peekStartsWith('/')) {\n      this.capture('/');\n    }\n    let path = matchUrlSegment(this.remaining);\n    this.capture(path);\n\n    let outletName;\n    if (hasOutletName) {\n      if (path.indexOf(\":\") === -1) {\n        throw new Error(\"Not outlet name is provided\");\n      }\n      if (path.indexOf(\":\") > -1 && hasOutletName) {\n        let parts = path.split(\":\");\n        outletName = parts[0];\n        path = parts[1];\n      }\n    } else {\n      if (path.indexOf(\":\") > -1) {\n        throw new Error(\"Not outlet name is allowed\");\n      }\n      outletName = PRIMARY_OUTLET;\n    }\n\n    let matrixParams: {[key: string]: any} = {};\n    if (this.peekStartsWith(';')) {\n      matrixParams = this.parseMatrixParams();\n    }\n\n    let secondary = [];\n    if (this.peekStartsWith('(')) {\n      secondary = this.parseSecondarySegments();\n    }\n\n    let children: TreeNode<UrlSegment>[] = [];\n    if (this.peekStartsWith('/') && !this.peekStartsWith('//')) {\n      this.capture('/');\n      children = this.parseSegments(false);\n    }\n\n    const segment = new UrlSegment(path, matrixParams, outletName);\n    const node = new TreeNode<UrlSegment>(segment, children);\n    return [node].concat(secondary);\n  }\n\n  parseQueryParams(): {[key: string]: any} {\n    var params: {[key: string]: any} = {};\n    if (this.peekStartsWith('?')) {\n      this.capture('?');\n      this.parseQueryParam(params);\n      while (this.remaining.length > 0 && this.peekStartsWith('&')) {\n        this.capture('&');\n        this.parseQueryParam(params);\n      }\n    }\n    return params;\n  }\n\n  parseFragment(): string | null {\n    if (this.peekStartsWith('#')) {\n      return this.remaining.substring(1);\n    } else {\n      return null;\n    }\n  }\n\n  parseMatrixParams(): {[key: string]: any} {\n    var params: {[key: string]: any} = {};\n    while (this.remaining.length > 0 && this.peekStartsWith(';')) {\n      this.capture(';');\n      this.parseParam(params);\n    }\n    return params;\n  }\n\n  parseParam(params: {[key: string]: any}): void {\n    var key = matchUrlSegment(this.remaining);\n    if (!key) {\n      return;\n    }\n    this.capture(key);\n    var value: any = \"true\";\n    if (this.peekStartsWith('=')) {\n      this.capture('=');\n      var valueMatch = matchUrlSegment(this.remaining);\n      if (valueMatch) {\n        value = valueMatch;\n        this.capture(value);\n      }\n    }\n\n    params[key] = value;\n  }\n\n  parseQueryParam(params: {[key: string]: any}): void {\n    var key = matchUrlSegment(this.remaining);\n    if (!key) {\n      return;\n    }\n    this.capture(key);\n    var value: any = \"true\";\n    if (this.peekStartsWith('=')) {\n      this.capture('=');\n      var valueMatch = matchUrlQueryParamValue(this.remaining);\n      if (valueMatch) {\n        value = valueMatch;\n        this.capture(value);\n      }\n    }\n    params[key] = value;\n  }\n\n  parseSecondarySegments(): TreeNode<UrlSegment>[] {\n    var segments = [];\n    this.capture('(');\n\n    while (!this.peekStartsWith(')') && this.remaining.length > 0) {\n      segments = segments.concat(this.parseSegments(true));\n      if (this.peekStartsWith('//')) {\n        this.capture('//');\n      }\n    }\n    this.capture(')');\n\n    return segments;\n  }\n}\n"]}
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/url_tree.d.ts b/modules/@angular/router/build/src/url_tree.d.ts
deleted file mode 100644
index f9ea224dae..0000000000
--- a/modules/@angular/router/build/src/url_tree.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Tree, TreeNode } from './utils/tree';
-export declare function createEmptyUrlTree(): UrlTree;
-export declare class UrlTree extends Tree<UrlSegment> {
-    queryParameters: {
-        [key: string]: string;
-    };
-    fragment: string | null;
-    constructor(root: TreeNode<UrlSegment>, queryParameters: {
-        [key: string]: string;
-    }, fragment: string | null);
-}
-export declare class UrlSegment {
-    path: string;
-    parameters: {
-        [key: string]: string;
-    };
-    outlet: string;
-    constructor(path: string, parameters: {
-        [key: string]: string;
-    }, outlet: string);
-    toString(): string;
-}
-export declare function equalUrlSegments(a: UrlSegment[], b: UrlSegment[]): boolean;
diff --git a/modules/@angular/router/build/src/url_tree.js b/modules/@angular/router/build/src/url_tree.js
deleted file mode 100644
index c653436874..0000000000
--- a/modules/@angular/router/build/src/url_tree.js
+++ /dev/null
@@ -1,56 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-var tree_1 = require('./utils/tree');
-var collection_1 = require('./utils/collection');
-var shared_1 = require('./shared');
-function createEmptyUrlTree() {
-    return new UrlTree(new tree_1.TreeNode(new UrlSegment("", {}, shared_1.PRIMARY_OUTLET), []), {}, null);
-}
-exports.createEmptyUrlTree = createEmptyUrlTree;
-var UrlTree = (function (_super) {
-    __extends(UrlTree, _super);
-    function UrlTree(root, queryParameters, fragment) {
-        _super.call(this, root);
-        this.queryParameters = queryParameters;
-        this.fragment = fragment;
-    }
-    return UrlTree;
-}(tree_1.Tree));
-exports.UrlTree = UrlTree;
-var UrlSegment = (function () {
-    function UrlSegment(path, parameters, outlet) {
-        this.path = path;
-        this.parameters = parameters;
-        this.outlet = outlet;
-    }
-    UrlSegment.prototype.toString = function () {
-        var params = [];
-        for (var prop in this.parameters) {
-            if (this.parameters.hasOwnProperty(prop)) {
-                params.push(prop + "=" + this.parameters[prop]);
-            }
-        }
-        var paramsString = params.length > 0 ? "(" + params.join(',') + ")" : '';
-        var outlet = this.outlet === shared_1.PRIMARY_OUTLET ? '' : this.outlet + ":";
-        return "" + outlet + this.path + paramsString;
-    };
-    return UrlSegment;
-}());
-exports.UrlSegment = UrlSegment;
-function equalUrlSegments(a, b) {
-    if (a.length !== b.length)
-        return false;
-    for (var i = 0; i < a.length; ++i) {
-        if (a[i].path !== b[i].path)
-            return false;
-        if (!collection_1.shallowEqual(a[i].parameters, b[i].parameters))
-            return false;
-    }
-    return true;
-}
-exports.equalUrlSegments = equalUrlSegments;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXJsX3RyZWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXJsX3RyZWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEscUJBQStCLGNBQWMsQ0FBQyxDQUFBO0FBQzlDLDJCQUE2QixvQkFBb0IsQ0FBQyxDQUFBO0FBQ2xELHVCQUErQixVQUFVLENBQUMsQ0FBQTtBQUUxQztJQUNFLE1BQU0sQ0FBQyxJQUFJLE9BQU8sQ0FBQyxJQUFJLGVBQVEsQ0FBYSxJQUFJLFVBQVUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLHVCQUFjLENBQUMsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFDckcsQ0FBQztBQUZlLDBCQUFrQixxQkFFakMsQ0FBQTtBQUtEO0lBQTZCLDJCQUFnQjtJQUkzQyxpQkFBWSxJQUEwQixFQUFTLGVBQXdDLEVBQVMsUUFBdUI7UUFDckgsa0JBQU0sSUFBSSxDQUFDLENBQUM7UUFEaUMsb0JBQWUsR0FBZixlQUFlLENBQXlCO1FBQVMsYUFBUSxHQUFSLFFBQVEsQ0FBZTtJQUV2SCxDQUFDO0lBQ0gsY0FBQztBQUFELENBQUMsQUFQRCxDQUE2QixXQUFJLEdBT2hDO0FBUFksZUFBTyxVQU9uQixDQUFBO0FBRUQ7SUFJRSxvQkFBbUIsSUFBWSxFQUFTLFVBQW1DLEVBQVMsTUFBYztRQUEvRSxTQUFJLEdBQUosSUFBSSxDQUFRO1FBQVMsZUFBVSxHQUFWLFVBQVUsQ0FBeUI7UUFBUyxXQUFNLEdBQU4sTUFBTSxDQUFRO0lBQUcsQ0FBQztJQUV0Ryw2QkFBUSxHQUFSO1FBQ0UsSUFBTSxNQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ2xCLEdBQUcsQ0FBQyxDQUFDLElBQUksSUFBSSxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1lBQ2pDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDekMsTUFBTSxDQUFDLElBQUksQ0FBSSxJQUFJLFNBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUcsQ0FBQyxDQUFDO1lBQ2xELENBQUM7UUFDSCxDQUFDO1FBQ0QsSUFBTSxZQUFZLEdBQUcsTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEdBQUcsTUFBSSxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFHLEdBQUcsRUFBRSxDQUFDO1FBQ3RFLElBQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLEtBQUssdUJBQWMsR0FBRyxFQUFFLEdBQU0sSUFBSSxDQUFDLE1BQU0sTUFBRyxDQUFDO1FBQ3ZFLE1BQU0sQ0FBQyxLQUFHLE1BQU0sR0FBRyxJQUFJLENBQUMsSUFBSSxHQUFHLFlBQWMsQ0FBQztJQUNoRCxDQUFDO0lBQ0gsaUJBQUM7QUFBRCxDQUFDLEFBakJELElBaUJDO0FBakJZLGtCQUFVLGFBaUJ0QixDQUFBO0FBRUQsMEJBQWlDLENBQWUsRUFBRSxDQUFlO0lBQy9ELEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQztRQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUM7SUFDeEMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUM7UUFDbEMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO1lBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQztRQUMxQyxFQUFFLENBQUMsQ0FBQyxDQUFDLHlCQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUM7WUFBQyxNQUFNLENBQUMsS0FBSyxDQUFDO0lBQ3BFLENBQUM7SUFDRCxNQUFNLENBQUMsSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQVBlLHdCQUFnQixtQkFPL0IsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRyZWUsIFRyZWVOb2RlIH0gZnJvbSAnLi91dGlscy90cmVlJztcbmltcG9ydCB7IHNoYWxsb3dFcXVhbCB9IGZyb20gJy4vdXRpbHMvY29sbGVjdGlvbic7XG5pbXBvcnQgeyBQUklNQVJZX09VVExFVCB9IGZyb20gJy4vc2hhcmVkJztcblxuZXhwb3J0IGZ1bmN0aW9uIGNyZWF0ZUVtcHR5VXJsVHJlZSgpIHtcbiAgcmV0dXJuIG5ldyBVcmxUcmVlKG5ldyBUcmVlTm9kZTxVcmxTZWdtZW50PihuZXcgVXJsU2VnbWVudChcIlwiLCB7fSwgUFJJTUFSWV9PVVRMRVQpLCBbXSksIHt9LCBudWxsKTtcbn1cblxuLyoqXG4gKiBBIFVSTCBpbiB0aGUgdHJlZSBmb3JtLlxuICovXG5leHBvcnQgY2xhc3MgVXJsVHJlZSBleHRlbmRzIFRyZWU8VXJsU2VnbWVudD4ge1xuICAvKipcbiAgICogQGludGVybmFsXG4gICAqL1xuICBjb25zdHJ1Y3Rvcihyb290OiBUcmVlTm9kZTxVcmxTZWdtZW50PiwgcHVibGljIHF1ZXJ5UGFyYW1ldGVyczoge1trZXk6IHN0cmluZ106IHN0cmluZ30sIHB1YmxpYyBmcmFnbWVudDogc3RyaW5nIHwgbnVsbCkge1xuICAgIHN1cGVyKHJvb3QpO1xuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBVcmxTZWdtZW50IHtcbiAgLyoqXG4gICAqIEBpbnRlcm5hbFxuICAgKi9cbiAgY29uc3RydWN0b3IocHVibGljIHBhdGg6IHN0cmluZywgcHVibGljIHBhcmFtZXRlcnM6IHtba2V5OiBzdHJpbmddOiBzdHJpbmd9LCBwdWJsaWMgb3V0bGV0OiBzdHJpbmcpIHt9XG5cbiAgdG9TdHJpbmcoKSB7XG4gICAgY29uc3QgcGFyYW1zID0gW107XG4gICAgZm9yIChsZXQgcHJvcCBpbiB0aGlzLnBhcmFtZXRlcnMpIHtcbiAgICAgIGlmICh0aGlzLnBhcmFtZXRlcnMuaGFzT3duUHJvcGVydHkocHJvcCkpIHtcbiAgICAgICAgcGFyYW1zLnB1c2goYCR7cHJvcH09JHt0aGlzLnBhcmFtZXRlcnNbcHJvcF19YCk7XG4gICAgICB9XG4gICAgfVxuICAgIGNvbnN0IHBhcmFtc1N0cmluZyA9IHBhcmFtcy5sZW5ndGggPiAwID8gYCgke3BhcmFtcy5qb2luKCcsJyl9KWAgOiAnJztcbiAgICBjb25zdCBvdXRsZXQgPSB0aGlzLm91dGxldCA9PT0gUFJJTUFSWV9PVVRMRVQgPyAnJyA6IGAke3RoaXMub3V0bGV0fTpgO1xuICAgIHJldHVybiBgJHtvdXRsZXR9JHt0aGlzLnBhdGh9JHtwYXJhbXNTdHJpbmd9YDtcbiAgfVxufVxuXG5leHBvcnQgZnVuY3Rpb24gZXF1YWxVcmxTZWdtZW50cyhhOiBVcmxTZWdtZW50W10sIGI6IFVybFNlZ21lbnRbXSk6IGJvb2xlYW4ge1xuICBpZiAoYS5sZW5ndGggIT09IGIubGVuZ3RoKSByZXR1cm4gZmFsc2U7XG4gIGZvciAobGV0IGkgPSAwOyBpIDwgYS5sZW5ndGg7ICsraSkge1xuICAgIGlmIChhW2ldLnBhdGggIT09IGJbaV0ucGF0aCkgcmV0dXJuIGZhbHNlO1xuICAgIGlmICghc2hhbGxvd0VxdWFsKGFbaV0ucGFyYW1ldGVycywgYltpXS5wYXJhbWV0ZXJzKSkgcmV0dXJuIGZhbHNlO1xuICB9XG4gIHJldHVybiB0cnVlO1xufVxuIl19
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/utils/collection.d.ts b/modules/@angular/router/build/src/utils/collection.d.ts
deleted file mode 100644
index 8b0d7d8a67..0000000000
--- a/modules/@angular/router/build/src/utils/collection.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export declare function shallowEqual(a: {
-    [x: string]: any;
-}, b: {
-    [x: string]: any;
-}): boolean;
-export declare function flatten<T>(a: T[][]): T[];
-export declare function first<T>(a: T[]): T | null;
-export declare function and(bools: boolean[]): boolean;
-export declare function merge<V>(m1: {
-    [key: string]: V;
-}, m2: {
-    [key: string]: V;
-}): {
-    [key: string]: V;
-};
-export declare function forEach<K, V>(map: {
-    [key: string]: V;
-}, callback: Function): void;
diff --git a/modules/@angular/router/build/src/utils/collection.js b/modules/@angular/router/build/src/utils/collection.js
deleted file mode 100644
index 970da0c82d..0000000000
--- a/modules/@angular/router/build/src/utils/collection.js
+++ /dev/null
@@ -1,59 +0,0 @@
-"use strict";
-function shallowEqual(a, b) {
-    var k1 = Object.keys(a);
-    var k2 = Object.keys(b);
-    if (k1.length != k2.length) {
-        return false;
-    }
-    var key;
-    for (var i = 0; i < k1.length; i++) {
-        key = k1[i];
-        if (a[key] !== b[key]) {
-            return false;
-        }
-    }
-    return true;
-}
-exports.shallowEqual = shallowEqual;
-function flatten(a) {
-    var target = [];
-    for (var i = 0; i < a.length; ++i) {
-        for (var j = 0; j < a[i].length; ++j) {
-            target.push(a[i][j]);
-        }
-    }
-    return target;
-}
-exports.flatten = flatten;
-function first(a) {
-    return a.length > 0 ? a[0] : null;
-}
-exports.first = first;
-function and(bools) {
-    return bools.reduce(function (a, b) { return a && b; }, true);
-}
-exports.and = and;
-function merge(m1, m2) {
-    var m = {};
-    for (var attr in m1) {
-        if (m1.hasOwnProperty(attr)) {
-            m[attr] = m1[attr];
-        }
-    }
-    for (var attr in m2) {
-        if (m2.hasOwnProperty(attr)) {
-            m[attr] = m2[attr];
-        }
-    }
-    return m;
-}
-exports.merge = merge;
-function forEach(map, callback) {
-    for (var prop in map) {
-        if (map.hasOwnProperty(prop)) {
-            callback(map[prop], prop);
-        }
-    }
-}
-exports.forEach = forEach;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sbGVjdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy91dGlscy9jb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxzQkFBNkIsQ0FBbUIsRUFBRSxDQUFtQjtJQUNuRSxJQUFJLEVBQUUsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3hCLElBQUksRUFBRSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDeEIsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztRQUMzQixNQUFNLENBQUMsS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUNELElBQUksR0FBRyxDQUFDO0lBQ1IsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7UUFDbkMsR0FBRyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNaLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3RCLE1BQU0sQ0FBQyxLQUFLLENBQUM7UUFDZixDQUFDO0lBQ0gsQ0FBQztJQUNELE1BQU0sQ0FBQyxJQUFJLENBQUM7QUFDZCxDQUFDO0FBZGUsb0JBQVksZUFjM0IsQ0FBQTtBQUVELGlCQUEyQixDQUFRO0lBQ2pDLElBQU0sTUFBTSxHQUFHLEVBQUUsQ0FBQztJQUNsQixHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQztRQUNsQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQztZQUNyQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ3ZCLENBQUM7SUFDSCxDQUFDO0lBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBUmUsZUFBTyxVQVF0QixDQUFBO0FBRUQsZUFBeUIsQ0FBTTtJQUM3QixNQUFNLENBQUMsQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQztBQUNwQyxDQUFDO0FBRmUsYUFBSyxRQUVwQixDQUFBO0FBRUQsYUFBb0IsS0FBZ0I7SUFDbEMsTUFBTSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsVUFBQyxDQUFDLEVBQUMsQ0FBQyxJQUFLLE9BQUEsQ0FBQyxJQUFJLENBQUMsRUFBTixDQUFNLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFDN0MsQ0FBQztBQUZlLFdBQUcsTUFFbEIsQ0FBQTtBQUVELGVBQXlCLEVBQXNCLEVBQUUsRUFBc0I7SUFDckUsSUFBSSxDQUFDLEdBQXVCLEVBQUUsQ0FBQztJQUUvQixHQUFHLENBQUMsQ0FBQyxJQUFJLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3BCLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzVCLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckIsQ0FBQztJQUNILENBQUM7SUFFRCxHQUFHLENBQUMsQ0FBQyxJQUFJLElBQUksSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3BCLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQzVCLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckIsQ0FBQztJQUNILENBQUM7SUFFRCxNQUFNLENBQUMsQ0FBQyxDQUFDO0FBQ1gsQ0FBQztBQWhCZSxhQUFLLFFBZ0JwQixDQUFBO0FBRUQsaUJBQThCLEdBQXVCLEVBQUUsUUFBcUM7SUFDMUYsR0FBRyxDQUFDLENBQUMsSUFBSSxJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNyQixFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM3QixRQUFRLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzVCLENBQUM7SUFDSCxDQUFDO0FBQ0gsQ0FBQztBQU5lLGVBQU8sVUFNdEIsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBmdW5jdGlvbiBzaGFsbG93RXF1YWwoYToge1t4OnN0cmluZ106YW55fSwgYjoge1t4OnN0cmluZ106YW55fSk6IGJvb2xlYW4ge1xuICB2YXIgazEgPSBPYmplY3Qua2V5cyhhKTtcbiAgdmFyIGsyID0gT2JqZWN0LmtleXMoYik7XG4gIGlmIChrMS5sZW5ndGggIT0gazIubGVuZ3RoKSB7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9XG4gIHZhciBrZXk7XG4gIGZvciAodmFyIGkgPSAwOyBpIDwgazEubGVuZ3RoOyBpKyspIHtcbiAgICBrZXkgPSBrMVtpXTtcbiAgICBpZiAoYVtrZXldICE9PSBiW2tleV0pIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG4gIH1cbiAgcmV0dXJuIHRydWU7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBmbGF0dGVuPFQ+KGE6IFRbXVtdKTogVFtdIHtcbiAgY29uc3QgdGFyZ2V0ID0gW107XG4gIGZvciAobGV0IGkgPSAwOyBpIDwgYS5sZW5ndGg7ICsraSkge1xuICAgIGZvciAobGV0IGogPSAwOyBqIDwgYVtpXS5sZW5ndGg7ICsraikge1xuICAgICAgdGFyZ2V0LnB1c2goYVtpXVtqXSk7XG4gICAgfVxuICB9XG4gIHJldHVybiB0YXJnZXQ7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBmaXJzdDxUPihhOiBUW10pOiBUIHwgbnVsbCB7XG4gIHJldHVybiBhLmxlbmd0aCA+IDAgPyBhWzBdIDogbnVsbDtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGFuZChib29sczogYm9vbGVhbltdKTogYm9vbGVhbiB7XG4gIHJldHVybiBib29scy5yZWR1Y2UoKGEsYikgPT4gYSAmJiBiLCB0cnVlKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIG1lcmdlPFY+KG0xOiB7W2tleTogc3RyaW5nXTogVn0sIG0yOiB7W2tleTogc3RyaW5nXTogVn0pOiB7W2tleTogc3RyaW5nXTogVn0ge1xuICB2YXIgbToge1trZXk6IHN0cmluZ106IFZ9ID0ge307XG5cbiAgZm9yICh2YXIgYXR0ciBpbiBtMSkge1xuICAgIGlmIChtMS5oYXNPd25Qcm9wZXJ0eShhdHRyKSkge1xuICAgICAgbVthdHRyXSA9IG0xW2F0dHJdO1xuICAgIH1cbiAgfVxuXG4gIGZvciAodmFyIGF0dHIgaW4gbTIpIHtcbiAgICBpZiAobTIuaGFzT3duUHJvcGVydHkoYXR0cikpIHtcbiAgICAgIG1bYXR0cl0gPSBtMlthdHRyXTtcbiAgICB9XG4gIH1cblxuICByZXR1cm4gbTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGZvckVhY2g8SywgVj4obWFwOiB7W2tleTogc3RyaW5nXTogVn0sIGNhbGxiYWNrOiAvKihWLCBLKSA9PiB2b2lkKi8gRnVuY3Rpb24pOiB2b2lkIHtcbiAgZm9yICh2YXIgcHJvcCBpbiBtYXApIHtcbiAgICBpZiAobWFwLmhhc093blByb3BlcnR5KHByb3ApKSB7XG4gICAgICBjYWxsYmFjayhtYXBbcHJvcF0sIHByb3ApO1xuICAgIH1cbiAgfVxufSJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/build/src/utils/tree.d.ts b/modules/@angular/router/build/src/utils/tree.d.ts
deleted file mode 100644
index 1b28a53874..0000000000
--- a/modules/@angular/router/build/src/utils/tree.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export declare class Tree<T> {
-    _root: TreeNode<T>;
-    constructor(root: TreeNode<T>);
-    readonly root: T;
-    parent(t: T): T | null;
-    children(t: T): T[];
-    firstChild(t: T): T | null;
-    siblings(t: T): T[];
-    pathFromRoot(t: T): T[];
-    contains(tree: Tree<T>): boolean;
-}
-export declare class TreeNode<T> {
-    value: T;
-    children: TreeNode<T>[];
-    constructor(value: T, children: TreeNode<T>[]);
-}
diff --git a/modules/@angular/router/build/src/utils/tree.js b/modules/@angular/router/build/src/utils/tree.js
deleted file mode 100644
index 3da645f27b..0000000000
--- a/modules/@angular/router/build/src/utils/tree.js
+++ /dev/null
@@ -1,84 +0,0 @@
-"use strict";
-var Tree = (function () {
-    function Tree(root) {
-        this._root = root;
-    }
-    Object.defineProperty(Tree.prototype, "root", {
-        get: function () { return this._root.value; },
-        enumerable: true,
-        configurable: true
-    });
-    Tree.prototype.parent = function (t) {
-        var p = this.pathFromRoot(t);
-        return p.length > 1 ? p[p.length - 2] : null;
-    };
-    Tree.prototype.children = function (t) {
-        var n = findNode(t, this._root);
-        return n ? n.children.map(function (t) { return t.value; }) : [];
-    };
-    Tree.prototype.firstChild = function (t) {
-        var n = findNode(t, this._root);
-        return n && n.children.length > 0 ? n.children[0].value : null;
-    };
-    Tree.prototype.siblings = function (t) {
-        var p = findPath(t, this._root, []);
-        if (p.length < 2)
-            return [];
-        var c = p[p.length - 2].children.map(function (c) { return c.value; });
-        return c.filter(function (cc) { return cc !== t; });
-    };
-    Tree.prototype.pathFromRoot = function (t) { return findPath(t, this._root, []).map(function (s) { return s.value; }); };
-    Tree.prototype.contains = function (tree) { return contains(this._root, tree._root); };
-    return Tree;
-}());
-exports.Tree = Tree;
-function findNode(expected, c) {
-    if (expected === c.value)
-        return c;
-    for (var _i = 0, _a = c.children; _i < _a.length; _i++) {
-        var cc = _a[_i];
-        var r = findNode(expected, cc);
-        if (r)
-            return r;
-    }
-    return null;
-}
-function findPath(expected, c, collected) {
-    collected.push(c);
-    if (expected === c.value)
-        return collected;
-    for (var _i = 0, _a = c.children; _i < _a.length; _i++) {
-        var cc = _a[_i];
-        var cloned = collected.slice(0);
-        var r = findPath(expected, cc, cloned);
-        if (r)
-            return r;
-    }
-    return [];
-}
-function contains(tree, subtree) {
-    if (tree.value !== subtree.value)
-        return false;
-    var _loop_1 = function(subtreeNode) {
-        var s = tree.children.filter(function (child) { return child.value === subtreeNode.value; });
-        if (s.length === 0)
-            return { value: false };
-        if (!contains(s[0], subtreeNode))
-            return { value: false };
-    };
-    for (var _i = 0, _a = subtree.children; _i < _a.length; _i++) {
-        var subtreeNode = _a[_i];
-        var state_1 = _loop_1(subtreeNode);
-        if (typeof state_1 === "object") return state_1.value;
-    }
-    return true;
-}
-var TreeNode = (function () {
-    function TreeNode(value, children) {
-        this.value = value;
-        this.children = children;
-    }
-    return TreeNode;
-}());
-exports.TreeNode = TreeNode;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy91dGlscy90cmVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTtJQUlFLGNBQVksSUFBaUI7UUFBSSxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQztJQUFDLENBQUM7SUFFckQsc0JBQUksc0JBQUk7YUFBUixjQUFnQixNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDOzs7T0FBQTtJQUUxQyxxQkFBTSxHQUFOLFVBQU8sQ0FBSTtRQUNULElBQU0sQ0FBQyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDL0IsTUFBTSxDQUFDLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQztJQUMvQyxDQUFDO0lBRUQsdUJBQVEsR0FBUixVQUFTLENBQUk7UUFDWCxJQUFNLENBQUMsR0FBRyxRQUFRLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNsQyxNQUFNLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFVBQUEsQ0FBQyxJQUFJLE9BQUEsQ0FBQyxDQUFDLEtBQUssRUFBUCxDQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7SUFDL0MsQ0FBQztJQUVELHlCQUFVLEdBQVYsVUFBVyxDQUFJO1FBQ2IsSUFBTSxDQUFDLEdBQUcsUUFBUSxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDbEMsTUFBTSxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDO0lBQ2pFLENB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S0FBSyxFQUFqQyxDQUFpQyxDQUFDLENBQUM7UUFDM0UsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLENBQUM7WUFBQyxnQkFBTyxLQUFLLEdBQUM7UUFDakMsRUFBRSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLFdBQVcsQ0FBQyxDQUFDO1lBQUMsZ0JBQU8sS0FBSyxHQUFDOztJQUhqRCxHQUFHLENBQUMsQ0FBb0IsVUFBZ0IsRUFBaEIsS0FBQSxPQUFPLENBQUMsUUFBUSxFQUFoQixjQUFnQixFQUFoQixJQUFnQixDQUFDO1FBQXBDLElBQUksV0FBVyxTQUFBOzs7S0FJbkI7SUFFRCxNQUFNLENBQUMsSUFBSSxDQUFDO0FBQ2QsQ0FBQztBQUVEO0lBQ0Usa0JBQW1CLEtBQVEsRUFBUyxRQUF1QjtRQUF4QyxVQUFLLEdBQUwsS0FBSyxDQUFHO1FBQVMsYUFBUSxHQUFSLFFBQVEsQ0FBZTtJQUFHLENBQUM7SUFDakUsZUFBQztBQUFELENBQUMsQUFGRCxJQUVDO0FBRlksZ0JBQVEsV0FFcEIsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBjbGFzcyBUcmVlPFQ+IHtcbiAgLyoqIEBpbnRlcm5hbCAqL1xuICBfcm9vdDogVHJlZU5vZGU8VD47XG5cbiAgY29uc3RydWN0b3Iocm9vdDogVHJlZU5vZGU8VD4pIHsgdGhpcy5fcm9vdCA9IHJvb3Q7IH1cblxuICBnZXQgcm9vdCgpOiBUIHsgcmV0dXJuIHRoaXMuX3Jvb3QudmFsdWU7IH1cblxuICBwYXJlbnQodDogVCk6IFQgfCBudWxsIHtcbiAgICBjb25zdCBwID0gdGhpcy5wYXRoRnJvbVJvb3QodCk7XG4gICAgcmV0dXJuIHAubGVuZ3RoID4gMSA/IHBbcC5sZW5ndGggLSAyXSA6IG51bGw7XG4gIH1cblxuICBjaGlsZHJlbih0OiBUKTogVFtdIHtcbiAgICBjb25zdCBuID0gZmluZE5vZGUodCwgdGhpcy5fcm9vdCk7XG4gICAgcmV0dXJuIG4gPyBuLmNoaWxkcmVuLm1hcCh0ID0+IHQudmFsdWUpIDogW107XG4gIH1cblxuICBmaXJzdENoaWxkKHQ6IFQpOiBUIHwgbnVsbCB7XG4gICAgY29uc3QgbiA9IGZpbmROb2RlKHQsIHRoaXMuX3Jvb3QpO1xuICAgIHJldHVybiBuICYmIG4uY2hpbGRyZW4ubGVuZ3RoID4gMCA/IG4uY2hpbGRyZW5bMF0udmFsdWUgOiBudWxsO1xuICB9XG5cbiAgc2libGluZ3ModDogVCk6IFRbXSB7XG4gICAgY29uc3QgcCA9IGZpbmRQYXRoKHQsIHRoaXMuX3Jvb3QsIFtdKTtcbiAgICBpZiAocC5sZW5ndGggPCAyKSByZXR1cm4gW107XG5cbiAgICBjb25zdCBjID0gcFtwLmxlbmd0aCAtIDJdLmNoaWxkcmVuLm1hcChjID0+IGMudmFsdWUpO1xuICAgIHJldHVybiBjLmZpbHRlcihjYyA9PiBjYyAhPT0gdCk7XG4gIH1cblxuICBwYXRoRnJvbVJvb3QodDogVCk6IFRbXSB7IHJldHVybiBmaW5kUGF0aCh0LCB0aGlzLl9yb290LCBbXSkubWFwKHMgPT4gcy52YWx1ZSk7IH1cblxuICBjb250YWlucyh0cmVlOiBUcmVlPFQ+KTogYm9vbGVhbiB7IHJldHVybiBjb250YWlucyh0aGlzLl9yb290LCB0cmVlLl9yb290KTsgfVxufVxuXG5mdW5jdGlvbiBmaW5kTm9kZTxUPihleHBlY3RlZDogVCwgYzogVHJlZU5vZGU8VD4pOiBUcmVlTm9kZTxUPiB8IG51bGwge1xuICBpZiAoZXhwZWN0ZWQgPT09IGMudmFsdWUpIHJldHVybiBjO1xuICBmb3IgKGxldCBjYyBvZiBjLmNoaWxkcmVuKSB7XG4gICAgY29uc3QgciA9IGZpbmROb2RlKGV4cGVjdGVkLCBjYyk7XG4gICAgaWYgKHIpIHJldHVybiByO1xuICB9XG4gIHJldHVybiBudWxsO1xufVxuXG5mdW5jdGlvbiBmaW5kUGF0aDxUPihleHBlY3RlZDogVCwgYzogVHJlZU5vZGU8VD4sIGNvbGxlY3RlZDogVHJlZU5vZGU8VD5bXSk6IFRyZWVOb2RlPFQ+W10ge1xuICBjb2xsZWN0ZWQucHVzaChjKTtcbiAgaWYgKGV4cGVjdGVkID09PSBjLnZhbHVlKSByZXR1cm4gY29sbGVjdGVkO1xuXG4gIGZvciAobGV0IGNjIG9mIGMuY2hpbGRyZW4pIHtcbiAgICBjb25zdCBjbG9uZWQgPSBjb2xsZWN0ZWQuc2xpY2UoMCk7XG4gICAgY29uc3QgciA9IGZpbmRQYXRoKGV4cGVjdGVkLCBjYywgY2xvbmVkKTtcbiAgICBpZiAocikgcmV0dXJuIHI7XG4gIH1cblxuICByZXR1cm4gW107XG59XG5cbmZ1bmN0aW9uIGNvbnRhaW5zPFQ+KHRyZWU6IFRyZWVOb2RlPFQ+LCBzdWJ0cmVlOiBUcmVlTm9kZTxUPik6IGJvb2xlYW4ge1xuICBpZiAodHJlZS52YWx1ZSAhPT0gc3VidHJlZS52YWx1ZSkgcmV0dXJuIGZhbHNlO1xuXG4gIGZvciAobGV0IHN1YnRyZWVOb2RlIG9mIHN1YnRyZWUuY2hpbGRyZW4pIHtcbiAgICBjb25zdCBzID0gdHJlZS5jaGlsZHJlbi5maWx0ZXIoY2hpbGQgPT4gY2hpbGQudmFsdWUgPT09IHN1YnRyZWVOb2RlLnZhbHVlKTtcbiAgICBpZiAocy5sZW5ndGggPT09IDApIHJldHVybiBmYWxzZTtcbiAgICBpZiAoIWNvbnRhaW5zKHNbMF0sIHN1YnRyZWVOb2RlKSkgcmV0dXJuIGZhbHNlO1xuICB9XG5cbiAgcmV0dXJuIHRydWU7XG59XG5cbmV4cG9ydCBjbGFzcyBUcmVlTm9kZTxUPiB7XG4gIGNvbnN0cnVjdG9yKHB1YmxpYyB2YWx1ZTogVCwgcHVibGljIGNoaWxkcmVuOiBUcmVlTm9kZTxUPltdKSB7fVxufSJdfQ==
\ No newline at end of file
diff --git a/modules/@angular/router/index.js b/modules/@angular/router/index.js
new file mode 100644
index 0000000000..9e37e57b5b
--- /dev/null
+++ b/modules/@angular/router/index.js
@@ -0,0 +1 @@
+module.exports = require('src/index');
\ No newline at end of file
diff --git a/modules/@angular/router/package.json b/modules/@angular/router/package.json
index 11a1dc3fe7..31de6067f9 100644
--- a/modules/@angular/router/package.json
+++ b/modules/@angular/router/package.json
@@ -1,15 +1,15 @@
 {
-  "name": "vladivostok",
-  "version": "0.9.1",
+  "name": "@angular/router",
+  "version": "3.0.0-alpha.0",
   "description": "",
-  "main": "./build/src/index.js",
-  "jsnext:main": "./build/es6/index.js",
+  "main": "./dist/index.js",
+  "jsnext:main": "./dist/esm/index.js",
   "scripts": {
     "karma": "karma start",
     "test": "npm run build; karma start",
     "build_watch": "rm -rf dist; tsc -w",
     "build": "rm -rf dist; tsc",
-    "build_npm": "rm -rf dist && tsc -p tsconfig.publish.es5.json && tsc -p tsconfig.publish.es6.json",
+    "build_npm": "rm -rf dist && tsc -p tsconfig.publish.es5.json && tsc -p tsconfig.publish.esm.json",
     "postbuild_npm": "cp package.json README.md dist/ && npm run rewrite_npm_package",
     "postinstall": "typings install",
     "rewrite_npm_package": "node --harmony_destructuring tools/rewrite-published-package.js",
@@ -70,5 +70,5 @@
     "tslint": "^3.6.0",
     "codelyzer": "0.0.14"
   },
-  "typings": "build/src/index.d.ts"
+  "typings": "dist/index.d.ts"
 }
diff --git a/modules/@angular/router/tools/rewrite-published-package.js b/modules/@angular/router/tools/rewrite-published-package.js
index 924ecd5ca6..b5d8850d56 100644
--- a/modules/@angular/router/tools/rewrite-published-package.js
+++ b/modules/@angular/router/tools/rewrite-published-package.js
@@ -9,7 +9,7 @@ var [MAIN, JSNEXT_MAIN] = ['main', 'jsnext:main'].map(k => srcPackage[k].replace
 var outPackage = Object.assign({}, srcPackage, {
   peerDependencies: srcPackage.dependencies,
   main: MAIN,
-  typings: "router.d.ts",
+  typings: "index.d.ts",
   "jsnext:main": JSNEXT_MAIN,
   dependencies: undefined
 });
diff --git a/modules/@angular/router/tsconfig.publish.es5.json b/modules/@angular/router/tsconfig.publish.es5.json
index 7aabbb14fa..8b2dcaa486 100644
--- a/modules/@angular/router/tsconfig.publish.es5.json
+++ b/modules/@angular/router/tsconfig.publish.es5.json
@@ -6,7 +6,7 @@
     "target": "es5",
     "noImplicitAny": false,
     "outDir": "dist",
-    "rootDir": ".",
+    "rootDir": "src",
     "inlineSourceMap": true,
     "inlineSources": true,
     "declaration": true,
diff --git a/modules/@angular/router/tsconfig.publish.es6.json b/modules/@angular/router/tsconfig.publish.esm.json
similarity index 87%
rename from modules/@angular/router/tsconfig.publish.es6.json
rename to modules/@angular/router/tsconfig.publish.esm.json
index cf8d30bacf..d957ce0b95 100644
--- a/modules/@angular/router/tsconfig.publish.es6.json
+++ b/modules/@angular/router/tsconfig.publish.esm.json
@@ -4,8 +4,8 @@
     "emitDecoratorMetadata": true,
     "target": "es6",
     "noImplicitAny": false,
-    "outDir": "dist/es6",
-    "rootDir": ".",
+    "outDir": "dist/esm",
+    "rootDir": "src",
     "inlineSourceMap": true,
     "inlineSources": true,
     "declaration": true,
diff --git a/modules/@angular/router/typings.json b/modules/@angular/router/typings.json
index 49b6826691..7d6ad5bbcc 100644
--- a/modules/@angular/router/typings.json
+++ b/modules/@angular/router/typings.json
@@ -1,5 +1,5 @@
 {
-  "name": "vladivostok",
+  "name": "@angular/router",
   "version": false,
   "globalDependencies": {
     "jasmine": "registry:dt/jasmine#2.2.0+20160505161446",