diff --git a/modules/@angular/router/package.json b/modules/@angular/router/package.json
index 99d8b5e13b..95ab8dc0ed 100644
--- a/modules/@angular/router/package.json
+++ b/modules/@angular/router/package.json
@@ -2,8 +2,8 @@
   "name": "vladivostok",
   "version": "0.9.1",
   "description": "",
-  "main": "./dist/router.js",
-  "jsnext:main": "./dist/es6/router.js",
+  "main": "./dist/src/index.js",
+  "jsnext:main": "./dist/es6/index.js",
   "scripts": {
     "karma": "karma start",
     "test": "npm run build; karma start",
diff --git a/modules/@angular/router/src/recognize.ts b/modules/@angular/router/src/recognize.ts
index aaa4104300..ab707180c4 100644
--- a/modules/@angular/router/src/recognize.ts
+++ b/modules/@angular/router/src/recognize.ts
@@ -37,7 +37,7 @@ function constructActivatedRoute(componentResolver: ComponentResolver, match: Ma
 function recognizeMany(componentResolver: ComponentResolver, config: Route[], urls: TreeNode<UrlSegment>[],
                        existingRoutes: TreeNode<ActivatedRoute>[]): Promise<TreeNode<ActivatedRoute>[]> {
   const recognized = urls.map(url => recognizeOne(componentResolver, config, url, existingRoutes));
-  return Promise.all(<any>recognized).then(flatten);
+  return Promise.all(<any>recognized).then(<any>flatten);
 }
 
 function createOrReuseRoute(match: MatchResult, factory: ComponentFactory<any>, existing: TreeNode<ActivatedRoute> | null): ActivatedRoute {
diff --git a/modules/@angular/router/test/router.spec.ts b/modules/@angular/router/test/router.spec.ts
index eef2424212..5eeafce613 100644
--- a/modules/@angular/router/test/router.spec.ts
+++ b/modules/@angular/router/test/router.spec.ts
@@ -15,7 +15,7 @@ import {
 import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
 import { ComponentResolver } from '@angular/core';
 import { SpyLocation } from '@angular/common/testing';
-import { UrlSerializer, DefaultUrlSerializer, RouterOutletMap, Router, ActivatedRoute, ROUTER_DIRECTIVES } from '../index';
+import { UrlSerializer, DefaultUrlSerializer, RouterOutletMap, Router, ActivatedRoute, ROUTER_DIRECTIVES } from '../src/index';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/map';
 
diff --git a/modules/@angular/router/tsconfig.json b/modules/@angular/router/tsconfig.json
index 44f4379cfc..476c97844e 100644
--- a/modules/@angular/router/tsconfig.json
+++ b/modules/@angular/router/tsconfig.json
@@ -13,7 +13,19 @@
     "removeComments": true
   },
   "files": [
+    "src/index.ts",
     "src/router.ts",
+    "src/recognize.ts",
+    "src/router.ts",
+    "src/config.ts",
+    "src/router_outlet_map.ts",
+    "src/router_state.ts",
+    "src/url_serializer.ts",
+    "src/url_tree.ts",
+    "src/directives/router_outlet.ts",
+    "src/directives/router_link.ts",
+    "src/utils/tree.ts",
+    "src/utils/collection.ts",
     "test/utils/tree.spec.ts",
     "test/url_serializer.spec.ts",
     "test/recognize.spec.ts",
diff --git a/modules/@angular/router/tsconfig.publish.es5.json b/modules/@angular/router/tsconfig.publish.es5.json
index 96d01c80d3..7aabbb14fa 100644
--- a/modules/@angular/router/tsconfig.publish.es5.json
+++ b/modules/@angular/router/tsconfig.publish.es5.json
@@ -2,7 +2,6 @@
   "compilerOptions": {
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "strictNullChecks": true,
     "module": "commonjs",
     "target": "es5",
     "noImplicitAny": false,
@@ -14,7 +13,7 @@
     "removeComments": true
   },
   "files": [
-    "src/router.ts",
+    "src/index.ts",
     "typings/index.d.ts"
   ]
 }
diff --git a/modules/@angular/router/tsconfig.publish.es6.json b/modules/@angular/router/tsconfig.publish.es6.json
index d5a4368f51..cf8d30bacf 100644
--- a/modules/@angular/router/tsconfig.publish.es6.json
+++ b/modules/@angular/router/tsconfig.publish.es6.json
@@ -2,7 +2,6 @@
   "compilerOptions": {
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "strictNullChecks": true,
     "target": "es6",
     "noImplicitAny": false,
     "outDir": "dist/es6",
@@ -14,6 +13,6 @@
     "moduleResolution": "node"
   },
   "files": [
-    "src/router.ts"
+    "src/index.ts"
   ]
 }
\ No newline at end of file