diff --git a/modules/@angular/router/src/recognize.ts b/modules/@angular/router/src/recognize.ts
index c94581be91..aaa4104300 100644
--- a/modules/@angular/router/src/recognize.ts
+++ b/modules/@angular/router/src/recognize.ts
@@ -1,11 +1,10 @@
 import { UrlTree, UrlSegment, equalUrlSegments } from './url_tree';
-import { shallowEqual, flatten, first, merge } from './util';
-import { TreeNode, rootNode } from './tree';
+import { shallowEqual, flatten, first, merge } from './utils/collection';
+import { TreeNode, rootNode } from './utils/tree';
 import { RouterState, ActivatedRoute, Params, PRIMARY_OUTLET } from './router_state';
 import { RouterConfig, Route } from './config';
 import { ComponentResolver, ComponentFactory, Type } from '@angular/core';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { Observer } from 'rxjs/Observer';
 
 export function recognize(componentResolver: ComponentResolver, config: RouterConfig,
                           url: UrlTree, existingState: RouterState): Promise<RouterState> {
diff --git a/modules/@angular/router/src/router.ts b/modules/@angular/router/src/router.ts
index 9252a290f8..856b40ac95 100644
--- a/modules/@angular/router/src/router.ts
+++ b/modules/@angular/router/src/router.ts
@@ -3,12 +3,12 @@ import { Location } from '@angular/common';
 import { UrlSerializer } from './url_serializer';
 import { RouterOutletMap } from './router_outlet_map';
 import { recognize } from './recognize';
-import { rootNode, TreeNode } from './tree';
+import { rootNode, TreeNode } from './utils/tree';
 import { UrlTree } from './url_tree';
 import { createEmptyState, RouterState, ActivatedRoute, PRIMARY_OUTLET } from './router_state';
 import { RouterConfig } from './config';
 import { RouterOutlet } from './directives/router_outlet';
-import { forEach } from './util';
+import { forEach } from './utils/collection';
 import { Subscription } from 'rxjs/Subscription';
 
 /**
diff --git a/modules/@angular/router/src/router_state.ts b/modules/@angular/router/src/router_state.ts
index 456f175333..93f19bb3d5 100644
--- a/modules/@angular/router/src/router_state.ts
+++ b/modules/@angular/router/src/router_state.ts
@@ -1,4 +1,4 @@
-import { Tree, TreeNode } from './tree';
+import { Tree, TreeNode } from './utils/tree';
 import { UrlSegment } from './url_tree';
 import { Observable } from 'rxjs/Observable';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
diff --git a/modules/@angular/router/src/url_serializer.ts b/modules/@angular/router/src/url_serializer.ts
index c2900a41a0..1dbd74d17c 100644
--- a/modules/@angular/router/src/url_serializer.ts
+++ b/modules/@angular/router/src/url_serializer.ts
@@ -1,5 +1,5 @@
 import { UrlTree, UrlSegment } from './url_tree';
-import { rootNode, TreeNode } from './tree';
+import { rootNode, TreeNode } from './utils/tree';
 
 /**
  * Defines a way to serialize/deserialize a url tree.
diff --git a/modules/@angular/router/src/url_tree.ts b/modules/@angular/router/src/url_tree.ts
index bdfd1b8e81..915c4c6b98 100644
--- a/modules/@angular/router/src/url_tree.ts
+++ b/modules/@angular/router/src/url_tree.ts
@@ -1,5 +1,5 @@
-import { Tree, TreeNode } from './tree';
-import { shallowEqual } from './util';
+import { Tree, TreeNode } from './utils/tree';
+import { shallowEqual } from './utils/collection';
 
 /**
  * A URL in the tree form.
diff --git a/modules/@angular/router/src/util.ts b/modules/@angular/router/src/utils/collection.ts
similarity index 100%
rename from modules/@angular/router/src/util.ts
rename to modules/@angular/router/src/utils/collection.ts
diff --git a/modules/@angular/router/src/tree.ts b/modules/@angular/router/src/utils/tree.ts
similarity index 100%
rename from modules/@angular/router/src/tree.ts
rename to modules/@angular/router/src/utils/tree.ts
diff --git a/modules/@angular/router/test/tree.spec.ts b/modules/@angular/router/test/utils/tree.spec.ts
similarity index 97%
rename from modules/@angular/router/test/tree.spec.ts
rename to modules/@angular/router/test/utils/tree.spec.ts
index 5d832558df..abaf8a192a 100644
--- a/modules/@angular/router/test/tree.spec.ts
+++ b/modules/@angular/router/test/utils/tree.spec.ts
@@ -1,4 +1,4 @@
-import {Tree, TreeNode} from '../src/tree';
+import {Tree, TreeNode} from '../../src/utils/tree';
 
 describe('tree', () => {
   it("should return the root of the tree", () => {
diff --git a/modules/@angular/router/tsconfig.json b/modules/@angular/router/tsconfig.json
index b789a05c6f..44f4379cfc 100644
--- a/modules/@angular/router/tsconfig.json
+++ b/modules/@angular/router/tsconfig.json
@@ -14,7 +14,7 @@
   },
   "files": [
     "src/router.ts",
-    "test/tree.spec.ts",
+    "test/utils/tree.spec.ts",
     "test/url_serializer.spec.ts",
     "test/recognize.spec.ts",
     "test/router.spec.ts",