diff --git a/public/docs/_examples/protractor.config.js b/public/docs/_examples/protractor.config.js
index 1a128f4ca9..47484d7028 100644
--- a/public/docs/_examples/protractor.config.js
+++ b/public/docs/_examples/protractor.config.js
@@ -32,7 +32,7 @@ exports.config = {
 
   // doesn't seem to work.
   // resultJsonOutputFile: "foo.json",
-  
+
   onPrepare: function() {
     //// SpecReporter
     //var SpecReporter = require('jasmine-spec-reporter');
@@ -60,6 +60,12 @@ exports.config = {
     global.describeIf = describeIf;
     global.itIf = itIf;
     global.sendKeys = sendKeys;
+
+    // Allow changing bootstrap mode to NG1 for upgrade tests
+    global.setProtractorToNg1Mode = function() {
+      browser.useAllAngular2AppRoots = false;
+      browser.rootEl = 'body';
+    };
   },
 
   jasmineNodeOpts: {
@@ -187,4 +193,3 @@ function Reporter(options) {
   }
 
 }
-
diff --git a/public/docs/_examples/upgrade-adapter/e2e-spec.js b/public/docs/_examples/upgrade-adapter/e2e-spec.js
new file mode 100644
index 0000000000..6e00bfafef
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/e2e-spec.js
@@ -0,0 +1,197 @@
+describe('Upgrade Tests', function () {
+
+  // Protractor doesn't support the UpgradeAdapter's asynchronous
+  // bootstrap with Angular 1 at the moment. Get around it by
+  // waiting for an element to get `ng-scope` class.
+  function waitForNg1AsyncBootstrap() {
+    browser.ignoreSynchronization = true;
+    browser.driver.wait(function() {
+      return element(by.css('.ng-scope')).isPresent();
+    }, 5000);
+  }
+
+  describe('NG1 Auto-bootstrap', function() {
+
+    beforeAll(function () {
+      browser.get('/index-ng-app.html');
+      setProtractorToNg1Mode();
+    });
+
+    it('bootstraps as expected', function () {
+      expect(element(by.css('#message')).getText()).toEqual('Hello world');
+    });
+
+  });
+
+  describe('NG1 JavaScript Bootstrap', function() {
+
+    beforeAll(function () {
+      browser.get('/index-bootstrap.html');
+      setProtractorToNg1Mode();
+    });
+
+    it('bootstraps as expected', function () {
+      expect(element(by.css('#message')).getText()).toEqual('Hello world');
+    });
+
+  });
+
+  describe('NG1-2 Hybrid Bootstrap', function() {
+
+    beforeAll(function () {
+      browser.get('/index-1-2-hybrid-bootstrap.html');
+      setProtractorToNg1Mode();
+    });
+
+    it('bootstraps as expected', function () {
+      expect(element(by.css('#message')).getText()).toEqual('Hello world');
+    });
+
+  });
+
+  describe('NG1-2 Hybrid Bootstrap with Shared UpgradeAdapter', function() {
+
+    beforeAll(function () {
+      browser.get('/index-1-2-hybrid-shared-adapter-bootstrap.html');
+      setProtractorToNg1Mode();
+    });
+
+    it('bootstraps as expected', function () {
+      expect(element(by.css('#message')).getText()).toEqual('Hello world');
+    });
+
+  });
+
+  describe('Upgraded static component', function() {
+
+    beforeAll(function () {
+      browser.get('/index-upgrade-static.html');
+      setProtractorToNg1Mode();
+      waitForNg1AsyncBootstrap();
+    });
+
+    it('renders', function () {
+      expect(element(by.css('h2')).getText()).toEqual('Windstorm details!');
+    });
+
+  });
+
+
+  describe('Upgraded component with IO', function() {
+
+    beforeAll(function () {
+      browser.get('/index-upgrade-io.html');
+      setProtractorToNg1Mode();
+      waitForNg1AsyncBootstrap();
+    });
+
+    it('has inputs', function () {
+      expect(element(by.css('h2')).getText()).toEqual('Windstorm details!');
+    });
+
+    it('has outputs', function () {
+      element(by.buttonText('Delete')).click();
+      expect(element(by.css('h2')).getText()).toEqual('Ex-Windstorm details!');
+    });
+
+  });
+
+
+  describe('Downgraded static component', function() {
+
+    beforeAll(function () {
+      browser.get('/index-downgrade-static.html');
+      setProtractorToNg1Mode();
+      waitForNg1AsyncBootstrap();
+    });
+
+    it('renders', function () {
+      expect(element(by.css('h2')).getText()).toEqual('Windstorm details!');
+    });
+
+  });
+
+  describe('Downgraded component with IO', function() {
+
+    beforeAll(function () {
+      browser.get('/index-downgrade-io.html');
+      setProtractorToNg1Mode();
+      waitForNg1AsyncBootstrap();
+    });
+
+    it('has inputs', function () {
+      expect(element.all(by.css('h2')).first().getText()).toEqual('Windstorm details!');
+    });
+
+    it('has outputs', function () {
+      element.all(by.buttonText('Delete')).first().click();
+      expect(element.all(by.css('h2')).first().getText()).toEqual('Ex-Windstorm details!');
+    });
+
+    it('supports ng-repeat', function () {
+      expect(element.all(by.css('hero-detail')).count()).toBe(3);
+    });
+
+  });
+
+
+  describe('Downgraded component with content projection', function() {
+
+    beforeAll(function () {
+      browser.get('/index-1-to-2-projection.html');
+      setProtractorToNg1Mode();
+      waitForNg1AsyncBootstrap();
+    });
+
+    it('can be transcluded into', function () {
+      expect(element(by.css('hero-detail')).getText()).toContain('Specific powers of controlling winds');
+    });
+
+  });
+
+
+  describe('Upgraded component with transclusion', function() {
+
+    beforeAll(function () {
+      browser.get('/index-2-to-1-transclusion.html');
+      setProtractorToNg1Mode();
+      waitForNg1AsyncBootstrap();
+    });
+
+    it('can be projected into', function () {
+      expect(element(by.css('hero-detail')).getText()).toContain('Specific powers of controlling winds');
+    });
+
+  });
+
+
+  describe('Upgrading NG1 Providers', function() {
+
+    beforeAll(function () {
+      browser.get('/index-1-to-2-providers.html');
+      setProtractorToNg1Mode();
+      waitForNg1AsyncBootstrap();
+    });
+
+    it('works', function () {
+      expect(element(by.css('h2')).getText()).toBe('1: Windstorm');
+    });
+
+  });
+
+
+  describe('Downgrading NG2 Providers', function() {
+
+    beforeAll(function () {
+      browser.get('/index-2-to-1-providers.html');
+      setProtractorToNg1Mode();
+      waitForNg1AsyncBootstrap();
+    });
+
+    it('works', function () {
+      expect(element(by.css('h2')).getText()).toBe('1: Windstorm');
+    });
+
+  });
+
+});
diff --git a/public/docs/_examples/upgrade-adapter/ts/.gitignore b/public/docs/_examples/upgrade-adapter/ts/.gitignore
new file mode 100644
index 0000000000..2cb7d2a2e9
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/.gitignore
@@ -0,0 +1 @@
+**/*.js
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-2-hybrid-bootstrap/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-2-hybrid-bootstrap/app.module.ts
similarity index 80%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/1-2-hybrid-bootstrap/app.module.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/1-2-hybrid-bootstrap/app.module.ts
index fcf7a21bab..903de63b9c 100644
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/1-2-hybrid-bootstrap/app.module.ts
+++ b/public/docs/_examples/upgrade-adapter/ts/app/1-2-hybrid-bootstrap/app.module.ts
@@ -6,7 +6,9 @@ import {UpgradeAdapter} from 'angular2/upgrade';
 // #enddocregion bootstrap
 
 angular.module('heroApp', [])
-  .run(() => console.log('running'));
+  .controller('MainCtrl', function() {
+    this.message = 'Hello world';
+  });
 
 // #docregion bootstrap
 
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-2-hybrid-shared-adapter-bootstrap/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-2-hybrid-shared-adapter-bootstrap/app.module.ts
similarity index 78%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/1-2-hybrid-shared-adapter-bootstrap/app.module.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/1-2-hybrid-shared-adapter-bootstrap/app.module.ts
index 5a85c9ea1b..39e2e092c4 100644
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/1-2-hybrid-shared-adapter-bootstrap/app.module.ts
+++ b/public/docs/_examples/upgrade-adapter/ts/app/1-2-hybrid-shared-adapter-bootstrap/app.module.ts
@@ -6,7 +6,9 @@ import {upgradeAdapter} from './upgrade_adapter';
 declare var angular:any;
 
 angular.module('heroApp', [])
-  .run(() => console.log('running'));
+  .controller('MainCtrl', function() {
+    this.message = 'Hello world';
+  });
 
 // #docregion bootstrap
 
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-2-hybrid-shared-adapter-bootstrap/upgrade_adapter.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-2-hybrid-shared-adapter-bootstrap/upgrade_adapter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/1-2-hybrid-shared-adapter-bootstrap/upgrade_adapter.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/1-2-hybrid-shared-adapter-bootstrap/upgrade_adapter.ts
diff --git a/public/docs/_examples/upgrade-adapter/ts/app/1-bootstrap/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-bootstrap/app.module.ts
new file mode 100644
index 0000000000..c4b56a5ca6
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/app/1-bootstrap/app.module.ts
@@ -0,0 +1,12 @@
+declare var angular:any;
+
+angular.module('heroApp', [])
+  .controller('MainCtrl', function() {
+    this.message = 'Hello world';
+  });
+
+document.addEventListener('DOMContentLoaded', function() {
+  // #docregion bootstrap
+  angular.bootstrap(document.body, ['heroApp'], {strictDi: true});
+  // #enddocregion bootstrap
+});
diff --git a/public/docs/_examples/upgrade-adapter/ts/app/1-ng-app/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-ng-app/app.module.ts
new file mode 100644
index 0000000000..427c605de3
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/app/1-ng-app/app.module.ts
@@ -0,0 +1,6 @@
+declare var angular:any;
+
+angular.module('heroApp', [])
+  .controller('MainCtrl', function() {
+    this.message = 'Hello world';
+  });
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-projection/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-projection/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-projection/app.module.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/1-to-2-projection/app.module.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-projection/hero-detail.component.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-projection/hero-detail.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-projection/hero-detail.component.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/1-to-2-projection/hero-detail.component.ts
diff --git a/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-projection/main.controller.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-projection/main.controller.ts
new file mode 100644
index 0000000000..e4754e710d
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-projection/main.controller.ts
@@ -0,0 +1,5 @@
+import {Hero} from '../Hero';
+
+export class MainController {
+  hero = new Hero(1, 'Windstorm', 'Specific powers of controlling winds');
+}
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-providers/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-providers/app.module.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/app.module.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-providers/hero-detail.component.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/hero-detail.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-providers/hero-detail.component.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/hero-detail.component.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-providers/heroes.service.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/heroes.service.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-providers/heroes.service.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/heroes.service.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-providers/upgrade_adapter.ts b/public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/upgrade_adapter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-providers/upgrade_adapter.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/1-to-2-providers/upgrade_adapter.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-providers/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-providers/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-providers/app.module.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/2-to-1-providers/app.module.ts
diff --git a/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-providers/hero-detail.component.ts b/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-providers/hero-detail.component.ts
new file mode 100644
index 0000000000..36bb5368aa
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-providers/hero-detail.component.ts
@@ -0,0 +1,11 @@
+import {Heroes} from './heroes';
+
+// #docregion
+export const heroDetailComponent = {
+  template: `
+    <h2>{{$ctrl.hero.id}}: {{$ctrl.hero.name}}</h2>
+  `,
+  controller: ['heroes', function(heroes:Heroes) {
+    this.hero = heroes.get()[0];
+  }]
+};
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-providers/heroes.ts b/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-providers/heroes.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-providers/heroes.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/2-to-1-providers/heroes.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-providers/upgrade_adapter.ts b/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-providers/upgrade_adapter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-providers/upgrade_adapter.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/2-to-1-providers/upgrade_adapter.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-transclusion/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-transclusion/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-transclusion/app.module.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/2-to-1-transclusion/app.module.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-transclusion/container.component.ts b/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-transclusion/container.component.ts
similarity index 86%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-transclusion/container.component.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/2-to-1-transclusion/container.component.ts
index 25921aea75..d60b35ce89 100644
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-transclusion/container.component.ts
+++ b/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-transclusion/container.component.ts
@@ -16,5 +16,5 @@ const HeroDetail = upgradeAdapter.upgradeNg1Component('heroDetail');
   directives: [HeroDetail]
 })
 export class ContainerComponent {
-  hero = new Hero(1, 'Windstorm', 'a descr');
+  hero = new Hero(1, 'Windstorm', 'Specific powers of controlling winds');
 }
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-transclusion/hero-detail.component.ts b/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-transclusion/hero-detail.component.ts
similarity index 83%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-transclusion/hero-detail.component.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/2-to-1-transclusion/hero-detail.component.ts
index 65a28d049a..a8f842781d 100644
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-transclusion/hero-detail.component.ts
+++ b/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-transclusion/hero-detail.component.ts
@@ -4,7 +4,7 @@ export const heroDetailComponent = {
     hero: '='
   },
   template: `
-    <h2>{{hero.name}}</h2>
+    <h2>{{$ctrl.hero.name}}</h2>
     <div>
       <ng-transclude></ng-transclude>
     </div>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-transclusion/upgrade_adapter.ts b/public/docs/_examples/upgrade-adapter/ts/app/2-to-1-transclusion/upgrade_adapter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-transclusion/upgrade_adapter.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/2-to-1-transclusion/upgrade_adapter.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/downgrade-io/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/downgrade-io/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/downgrade-io/app.module.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/downgrade-io/app.module.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/downgrade-io/hero-detail.component.ts b/public/docs/_examples/upgrade-adapter/ts/app/downgrade-io/hero-detail.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/downgrade-io/hero-detail.component.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/downgrade-io/hero-detail.component.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/downgrade-io/main.controller.ts b/public/docs/_examples/upgrade-adapter/ts/app/downgrade-io/main.controller.ts
similarity index 85%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/downgrade-io/main.controller.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/downgrade-io/main.controller.ts
index 382b11fc7c..a43140429e 100644
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/downgrade-io/main.controller.ts
+++ b/public/docs/_examples/upgrade-adapter/ts/app/downgrade-io/main.controller.ts
@@ -7,6 +7,6 @@ export class MainController {
     new Hero(3, 'Spiderman')
   ]
   onDelete(hero:Hero) {
-    console.log('del', hero);
+    hero.name = 'Ex-' + hero.name;
   }
 }
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/downgrade-static/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/downgrade-static/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/downgrade-static/app.module.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/downgrade-static/app.module.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/downgrade-static/hero-detail.component.ts b/public/docs/_examples/upgrade-adapter/ts/app/downgrade-static/hero-detail.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/downgrade-static/hero-detail.component.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/downgrade-static/hero-detail.component.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/hero-detail.directive.ts b/public/docs/_examples/upgrade-adapter/ts/app/hero-detail.directive.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/hero-detail.directive.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/hero-detail.directive.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/hero.ts b/public/docs/_examples/upgrade-adapter/ts/app/hero.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/hero.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/hero.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-io/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/upgrade-io/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-io/app.module.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/upgrade-io/app.module.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-io/container.component.ts b/public/docs/_examples/upgrade-adapter/ts/app/upgrade-io/container.component.ts
similarity index 88%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-io/container.component.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/upgrade-io/container.component.ts
index 495a4d110f..14c2fd77b2 100644
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-io/container.component.ts
+++ b/public/docs/_examples/upgrade-adapter/ts/app/upgrade-io/container.component.ts
@@ -17,7 +17,7 @@ const HeroDetail = upgradeAdapter.upgradeNg1Component('heroDetail');
 })
 export class ContainerComponent {
   hero = new Hero(1, 'Windstorm');
-  heroDeleted(event) {
-    console.log(event);
+  heroDeleted(hero:Hero) {
+    hero.name = 'Ex-' + hero.name;
   }
 }
diff --git a/public/docs/_examples/upgrade-adapter/ts/app/upgrade-io/hero-detail.component.ts b/public/docs/_examples/upgrade-adapter/ts/app/upgrade-io/hero-detail.component.ts
new file mode 100644
index 0000000000..3295fe9382
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/app/upgrade-io/hero-detail.component.ts
@@ -0,0 +1,17 @@
+// #docregion
+export const heroDetail = {
+  bindings: {
+    hero: '=',
+    deleted: '&'
+  },
+  template: `
+    <h2>{{$ctrl.hero.name}} details!</h2>
+    <div><label>id: </label>{{$ctrl.hero.id}}</div>
+    <button ng-click="$ctrl.onDelete()">Delete</button>
+  `,
+  controller: function() {
+    this.onDelete = () => {
+      this.deleted(this.hero);
+    };
+  }
+};
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-io/upgrade_adapter.ts b/public/docs/_examples/upgrade-adapter/ts/app/upgrade-io/upgrade_adapter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-io/upgrade_adapter.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/upgrade-io/upgrade_adapter.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-static/app.module.ts b/public/docs/_examples/upgrade-adapter/ts/app/upgrade-static/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-static/app.module.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/upgrade-static/app.module.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-static/container.component.ts b/public/docs/_examples/upgrade-adapter/ts/app/upgrade-static/container.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-static/container.component.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/upgrade-static/container.component.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-static/hero-detail.component.ts b/public/docs/_examples/upgrade-adapter/ts/app/upgrade-static/hero-detail.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-static/hero-detail.component.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/upgrade-static/hero-detail.component.ts
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-static/upgrade_adapter.ts b/public/docs/_examples/upgrade-adapter/ts/app/upgrade-static/upgrade_adapter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-static/upgrade_adapter.ts
rename to public/docs/_examples/upgrade-adapter/ts/app/upgrade-static/upgrade_adapter.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/app/css/.gitkeep b/public/docs/_examples/upgrade-adapter/ts/example-config.json
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/css/.gitkeep
rename to public/docs/_examples/upgrade-adapter/ts/example-config.json
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-bootstrap.html b/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-bootstrap.html
new file mode 100644
index 0000000000..f05b5e3f10
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-bootstrap.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="styles.css">
+
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+
+  <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+  <script src="node_modules/systemjs/dist/system-polyfills.js"></script>
+  <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+
+  <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="node_modules/systemjs/dist/system.src.js"></script>
+  <script src="node_modules/rxjs/bundles/Rx.js"></script>
+  <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+  <script src="node_modules/angular2/bundles/upgrade.dev.js"></script>
+  <script>
+    System.config({
+      packages: {
+        app: {
+          format: 'register',
+          defaultExtension: 'js'
+        }
+      }
+    });
+    System.import('app/1-2-hybrid-bootstrap/app.module')
+          .then(null, console.error.bind(console));
+  </script>
+</head>
+<body>
+  <div id="message" ng-controller="MainCtrl as mainCtrl">{{ mainCtrl.message }}</div>
+</body>
+</html>
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-shared-adapter-bootstrap.html b/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-shared-adapter-bootstrap.html
new file mode 100644
index 0000000000..9c9b9f07eb
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-shared-adapter-bootstrap.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="styles.css">
+
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+
+  <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+  <script src="node_modules/systemjs/dist/system-polyfills.js"></script>
+  <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+
+  <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="node_modules/systemjs/dist/system.src.js"></script>
+  <script src="node_modules/rxjs/bundles/Rx.js"></script>
+  <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+  <script src="node_modules/angular2/bundles/upgrade.dev.js"></script>
+  <script>
+    System.config({
+      packages: {
+        app: {
+          format: 'register',
+          defaultExtension: 'js'
+        }
+      }
+    });
+    System.import('app/1-2-hybrid-shared-adapter-bootstrap/app.module')
+          .then(null, console.error.bind(console));
+  </script>
+</head>
+<body>
+  <div id="message" ng-controller="MainCtrl as mainCtrl">{{ mainCtrl.message }}</div>
+</body>
+</html>
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-projection.html b/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-projection.html
new file mode 100644
index 0000000000..b2790e9060
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-projection.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="styles.css">
+
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+
+  <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+  <script src="node_modules/systemjs/dist/system-polyfills.js"></script>
+  <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+
+  <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="node_modules/systemjs/dist/system.src.js"></script>
+  <script src="node_modules/rxjs/bundles/Rx.js"></script>
+  <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+  <script src="node_modules/angular2/bundles/upgrade.dev.js"></script>
+  <script>
+    System.config({
+      packages: {
+        app: {
+          format: 'register',
+          defaultExtension: 'js'
+        }
+      }
+    });
+    System.import('app/1-to-2-projection/app.module')
+          .then(null, console.error.bind(console));
+  </script>
+</head>
+<body>
+  <hero-app>
+    <!-- #docregion usecomponent -->
+    <div ng-controller="MainController as mainCtrl">
+      <hero-detail [hero]="mainCtrl.hero">
+        <!-- Everything here will get projected -->
+        <p>{{mainCtrl.hero.description}}</p>
+      </hero-detail>
+    </div>
+    <!-- #enddocregion usecomponent -->
+  </hero-app>
+</body>
+</html>
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-providers.html b/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-providers.html
new file mode 100644
index 0000000000..f27b20bd58
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-providers.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="styles.css">
+
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+
+  <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+  <script src="node_modules/systemjs/dist/system-polyfills.js"></script>
+  <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+
+  <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="node_modules/systemjs/dist/system.src.js"></script>
+  <script src="node_modules/rxjs/bundles/Rx.js"></script>
+  <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+  <script src="node_modules/angular2/bundles/upgrade.dev.js"></script>
+  <script>
+    System.config({
+      packages: {
+        app: {
+          format: 'register',
+          defaultExtension: 'js'
+        }
+      }
+    });
+    System.import('app/1-to-2-providers/app.module')
+          .then(null, console.error.bind(console));
+  </script>
+</head>
+<body>
+  <hero-app>
+    <hero-detail>
+    </hero-detail>
+  </hero-app>
+</body>
+</html>
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-providers.html b/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-providers.html
new file mode 100644
index 0000000000..421367d4c4
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-providers.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="styles.css">
+
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+
+  <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+  <script src="node_modules/systemjs/dist/system-polyfills.js"></script>
+  <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+
+  <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="node_modules/systemjs/dist/system.src.js"></script>
+  <script src="node_modules/rxjs/bundles/Rx.js"></script>
+  <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+  <script src="node_modules/angular2/bundles/upgrade.dev.js"></script>
+  <script>
+    System.config({
+      packages: {
+        app: {
+          format: 'register',
+          defaultExtension: 'js'
+        }
+      }
+    });
+    System.import('app/2-to-1-providers/app.module')
+          .then(null, console.error.bind(console));
+  </script>
+</head>
+<body>
+  <hero-app>
+    <hero-detail>
+    </hero-detail>
+  </hero-app>
+</body>
+</html>
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-transclusion.html b/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-transclusion.html
new file mode 100644
index 0000000000..8c0d48b978
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-transclusion.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="styles.css">
+
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+
+  <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+  <script src="node_modules/systemjs/dist/system-polyfills.js"></script>
+  <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+
+  <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="node_modules/systemjs/dist/system.src.js"></script>
+  <script src="node_modules/rxjs/bundles/Rx.js"></script>
+  <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+  <script src="node_modules/angular2/bundles/upgrade.dev.js"></script>
+  <script>
+    System.config({
+      packages: {
+        app: {
+          format: 'register',
+          defaultExtension: 'js'
+        }
+      }
+    });
+    System.import('app/2-to-1-transclusion/app.module')
+          .then(null, console.error.bind(console));
+  </script>
+</head>
+<body>
+  <hero-app>
+    <my-container></my-container>
+  </hero-app>
+</body>
+</html>
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-bootstrap.html b/public/docs/_examples/upgrade-adapter/ts/index-bootstrap.html
new file mode 100644
index 0000000000..932e1626a2
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/index-bootstrap.html
@@ -0,0 +1,11 @@
+<!-- #docregion -->
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+  <script src="app/1-bootstrap/app.module.js"></script>
+</head>
+<body>
+  <div id="message" ng-controller="MainCtrl as mainCtrl">{{ mainCtrl.message }}</div>
+</body>
+</html>
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-downgrade-io.html b/public/docs/_examples/upgrade-adapter/ts/index-downgrade-io.html
new file mode 100644
index 0000000000..56bc296d74
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/index-downgrade-io.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="styles.css">
+
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+
+  <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+  <script src="node_modules/systemjs/dist/system-polyfills.js"></script>
+  <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+
+  <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="node_modules/systemjs/dist/system.src.js"></script>
+  <script src="node_modules/rxjs/bundles/Rx.js"></script>
+  <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+  <script src="node_modules/angular2/bundles/upgrade.dev.js"></script>
+  <script>
+    System.config({
+      packages: {
+        app: {
+          format: 'register',
+          defaultExtension: 'js'
+        }
+      }
+    });
+    System.import('app/downgrade-io/app.module')
+          .then(null, console.error.bind(console));
+  </script>
+</head>
+<body>
+  <hero-app>
+    <!-- #docregion usecomponent -->
+    <div ng-controller="MainController as mainCtrl">
+      <hero-detail [hero]="mainCtrl.hero"
+                   (deleted)="mainCtrl.onDelete($event)">
+      </hero-detail>
+    </div>
+    <!-- #enddocregion usecomponent -->
+    <!-- #docregion userepeatedcomponent -->
+    <div ng-controller="MainController as mainCtrl">
+      <hero-detail [hero]="hero"
+                   (deleted)="mainCtrl.onDelete($event)"
+                   ng-repeat="hero in mainCtrl.heroes">
+      </hero-detail>
+    </div>
+    <!-- #enddocregion userepeatedcomponent-->
+  </hero-app>
+</body>
+</html>
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-downgrade-static.html b/public/docs/_examples/upgrade-adapter/ts/index-downgrade-static.html
new file mode 100644
index 0000000000..851a4a4e93
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/index-downgrade-static.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="styles.css">
+
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+
+  <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+  <script src="node_modules/systemjs/dist/system-polyfills.js"></script>
+  <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+
+  <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="node_modules/systemjs/dist/system.src.js"></script>
+  <script src="node_modules/rxjs/bundles/Rx.js"></script>
+  <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+  <script src="node_modules/angular2/bundles/upgrade.dev.js"></script>
+  <script>
+    System.config({
+      packages: {
+        app: {
+          format: 'register',
+          defaultExtension: 'js'
+        }
+      }
+    });
+    System.import('app/downgrade-static/app.module')
+          .then(null, console.error.bind(console));
+  </script>
+</head>
+<body>
+  <hero-app>
+    <!-- #docregion usecomponent -->
+    <hero-detail></hero-detail>
+    <!-- #enddocregion usecomponent -->
+  </hero-app>
+</body>
+</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-ng-app.html b/public/docs/_examples/upgrade-adapter/ts/index-ng-app.html
similarity index 51%
rename from public/docs/_examples/upgrade/ts/adapter/app/index-ng-app.html
rename to public/docs/_examples/upgrade-adapter/ts/index-ng-app.html
index f83324ae4c..b6a803dbcd 100644
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-ng-app.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-ng-app.html
@@ -2,10 +2,10 @@
 <!DOCTYPE HTML>
 <html>
 <head>
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+  <script src="app/1-ng-app/app.module.js"></script>
 </head>
 <body ng-app="heroApp" ng-strict-di>
-  <div ng-view></div>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="js/1-ng-app/app.module.js"></script>
+  <div id="message" ng-controller="MainCtrl as mainCtrl">{{ mainCtrl.message }}</div>
 </body>
 </html>
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-upgrade-io.html b/public/docs/_examples/upgrade-adapter/ts/index-upgrade-io.html
new file mode 100644
index 0000000000..0ae08e33a7
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/index-upgrade-io.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="styles.css">
+
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+
+  <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+  <script src="node_modules/systemjs/dist/system-polyfills.js"></script>
+  <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+
+  <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="node_modules/systemjs/dist/system.src.js"></script>
+  <script src="node_modules/rxjs/bundles/Rx.js"></script>
+  <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+  <script src="node_modules/angular2/bundles/upgrade.dev.js"></script>
+  <script>
+    System.config({
+      packages: {
+        app: {
+          format: 'register',
+          defaultExtension: 'js'
+        }
+      }
+    });
+    System.import('app/upgrade-io/app.module')
+          .then(null, console.error.bind(console));
+  </script>
+</head>
+<body>
+  <hero-app>
+    <my-container></my-container>
+  </hero-app>
+</body>
+</html>
diff --git a/public/docs/_examples/upgrade-adapter/ts/index-upgrade-static.html b/public/docs/_examples/upgrade-adapter/ts/index-upgrade-static.html
new file mode 100644
index 0000000000..63f9a8cef7
--- /dev/null
+++ b/public/docs/_examples/upgrade-adapter/ts/index-upgrade-static.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="styles.css">
+
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.3/angular.js"></script>
+
+  <script src="node_modules/es6-shim/es6-shim.min.js"></script>
+  <script src="node_modules/systemjs/dist/system-polyfills.js"></script>
+  <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+
+  <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
+  <script src="node_modules/systemjs/dist/system.src.js"></script>
+  <script src="node_modules/rxjs/bundles/Rx.js"></script>
+  <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
+  <script src="node_modules/angular2/bundles/upgrade.dev.js"></script>
+  <script>
+    System.config({
+      packages: {
+        app: {
+          format: 'register',
+          defaultExtension: 'js'
+        }
+      }
+    });
+    System.import('app/upgrade-static/app.module')
+          .then(null, console.error.bind(console));
+  </script>
+</head>
+<body>
+  <hero-app>
+    <my-container></my-container>
+  </hero-app>
+</body>
+</html>
diff --git a/public/docs/_examples/upgrade/README.md b/public/docs/_examples/upgrade-phonecat/README.md
similarity index 100%
rename from public/docs/_examples/upgrade/README.md
rename to public/docs/_examples/upgrade-phonecat/README.md
diff --git a/public/docs/_examples/upgrade/ts/classes/.bowerrc b/public/docs/_examples/upgrade-phonecat/ts/classes/.bowerrc
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/.bowerrc
rename to public/docs/_examples/upgrade-phonecat/ts/classes/.bowerrc
diff --git a/public/docs/_examples/upgrade/ts/classes/.gitignore b/public/docs/_examples/upgrade-phonecat/ts/classes/.gitignore
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/.gitignore
rename to public/docs/_examples/upgrade-phonecat/ts/classes/.gitignore
diff --git a/public/docs/_examples/upgrade/ts/classes/app/img/.gitkeep b/public/docs/_examples/upgrade-phonecat/ts/classes/app/css/.gitkeep
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/img/.gitkeep
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/css/.gitkeep
diff --git a/public/docs/_examples/upgrade/ts/classes/app/css/animations.css b/public/docs/_examples/upgrade-phonecat/ts/classes/app/css/animations.css
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/css/animations.css
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/css/animations.css
diff --git a/public/docs/_examples/upgrade/ts/classes/app/css/app.css b/public/docs/_examples/upgrade-phonecat/ts/classes/app/css/app.css
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/css/app.css
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/css/app.css
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/css/.gitkeep b/public/docs/_examples/upgrade-phonecat/ts/classes/app/img/.gitkeep
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/css/.gitkeep
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/img/.gitkeep
diff --git a/public/docs/_examples/upgrade/ts/classes/app/img/glyphicons-halflings-white.png b/public/docs/_examples/upgrade-phonecat/ts/classes/app/img/glyphicons-halflings-white.png
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/img/glyphicons-halflings-white.png
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/img/glyphicons-halflings-white.png
diff --git a/public/docs/_examples/upgrade/ts/classes/app/img/glyphicons-halflings.png b/public/docs/_examples/upgrade-phonecat/ts/classes/app/img/glyphicons-halflings.png
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/img/glyphicons-halflings.png
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/img/glyphicons-halflings.png
diff --git a/public/docs/_examples/upgrade/ts/classes/app/index.html b/public/docs/_examples/upgrade-phonecat/ts/classes/app/index.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/index.html
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/index.html
diff --git a/public/docs/_examples/upgrade/ts/classes/app/js/app.module.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/app/js/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/js/app.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/js/app.module.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/app/js/core/checkmark.filter.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/app/js/core/checkmark.filter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/js/core/checkmark.filter.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/js/core/checkmark.filter.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/app/js/core/core.module.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/app/js/core/core.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/js/core/core.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/js/core/core.module.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/app/js/core/phone.factory.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/app/js/core/phone.factory.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/js/core/phone.factory.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/js/core/phone.factory.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/app/js/phone_detail/phone_detail.controller.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_detail/phone_detail.controller.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/js/phone_detail/phone_detail.controller.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_detail/phone_detail.controller.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/app/js/phone_detail/phone_detail.html b/public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_detail/phone_detail.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/js/phone_detail/phone_detail.html
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_detail/phone_detail.html
diff --git a/public/docs/_examples/upgrade/ts/classes/app/js/phone_detail/phone_detail.module.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_detail/phone_detail.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/js/phone_detail/phone_detail.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_detail/phone_detail.module.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/app/js/phone_list/phone_list.controller.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_list/phone_list.controller.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/js/phone_list/phone_list.controller.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_list/phone_list.controller.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/app/js/phone_list/phone_list.html b/public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_list/phone_list.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/js/phone_list/phone_list.html
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_list/phone_list.html
diff --git a/public/docs/_examples/upgrade/ts/classes/app/js/phone_list/phone_list.module.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_list/phone_list.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/app/js/phone_list/phone_list.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/app/js/phone_list/phone_list.module.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/bower.json b/public/docs/_examples/upgrade-phonecat/ts/classes/bower.json
similarity index 64%
rename from public/docs/_examples/upgrade/ts/ng2_components/bower.json
rename to public/docs/_examples/upgrade-phonecat/ts/classes/bower.json
index 3f8ec94656..0179178b02 100644
--- a/public/docs/_examples/upgrade/ts/ng2_components/bower.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/classes/bower.json
@@ -6,15 +6,15 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "angular": "1.5.0",
-    "angular-mocks": "1.5.0",
+    "angular": "1.5.3",
+    "angular-mocks": "1.5.3",
     "jquery": "~2.1.1",
     "bootstrap": "~3.1.1",
-    "angular-route": "1.5.0",
-    "angular-resource": "1.5.0",
-    "angular-animate": "1.5.0"
+    "angular-route": "1.5.3",
+    "angular-resource": "1.5.3",
+    "angular-animate": "1.5.3"
   },
   "resolutions": {
-    "angular": "1.5.0"
+    "angular": "1.5.3"
   }
 }
diff --git a/public/docs/_examples/upgrade/ts/classes/package.1.json b/public/docs/_examples/upgrade-phonecat/ts/classes/package.1.json
similarity index 93%
rename from public/docs/_examples/upgrade/ts/classes/package.1.json
rename to public/docs/_examples/upgrade-phonecat/ts/classes/package.1.json
index 10fb943821..0b7b72bf3e 100644
--- a/public/docs/_examples/upgrade/ts/classes/package.1.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/classes/package.1.json
@@ -6,7 +6,7 @@
   "repository": "https://github.com/angular/angular-phonecat",
   "license": "MIT",
   "dependencies": {
-    "systemjs": "0.19.22"
+    "systemjs": "0.19.25"
   },
   "devDependencies": {
     "karma": "^0.12.16",
@@ -18,8 +18,8 @@
     "tmp": "0.0.23",
     "bower": "^1.3.1",
     "shelljs": "^0.2.6",
-    "typescript": "1.8.2",
-    "typings": "^0.6.8"
+    "typescript": "1.8.9",
+    "typings": "^0.7.12"
   },
   "scripts": {
     "postinstall": "bower install",
diff --git a/public/docs/_examples/upgrade/ts/classes/test/e2e/scenarios.js b/public/docs/_examples/upgrade-phonecat/ts/classes/test/e2e/scenarios.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/test/e2e/scenarios.js
rename to public/docs/_examples/upgrade-phonecat/ts/classes/test/e2e/scenarios.js
diff --git a/public/docs/_examples/upgrade/ts/classes/test/jasmine_matchers.d.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/test/jasmine_matchers.d.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/test/jasmine_matchers.d.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/test/jasmine_matchers.d.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/test/karma.conf.1.js b/public/docs/_examples/upgrade-phonecat/ts/classes/test/karma.conf.1.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/test/karma.conf.1.js
rename to public/docs/_examples/upgrade-phonecat/ts/classes/test/karma.conf.1.js
diff --git a/public/docs/_examples/upgrade/ts/classes/test/karma_test_shim.js b/public/docs/_examples/upgrade-phonecat/ts/classes/test/karma_test_shim.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/test/karma_test_shim.js
rename to public/docs/_examples/upgrade-phonecat/ts/classes/test/karma_test_shim.js
diff --git a/public/docs/_examples/upgrade/ts/classes/test/protractor-conf.js b/public/docs/_examples/upgrade-phonecat/ts/classes/test/protractor-conf.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/test/protractor-conf.js
rename to public/docs/_examples/upgrade-phonecat/ts/classes/test/protractor-conf.js
diff --git a/public/docs/_examples/upgrade/ts/classes/test/unit/checkmark.filter.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/test/unit/checkmark.filter.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/test/unit/checkmark.filter.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/test/unit/checkmark.filter.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/test/unit/phone.factory.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/test/unit/phone.factory.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/test/unit/phone.factory.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/test/unit/phone.factory.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/test/unit/phone_detail.controller.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/test/unit/phone_detail.controller.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/test/unit/phone_detail.controller.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/test/unit/phone_detail.controller.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/test/unit/phone_list.controller.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/classes/test/unit/phone_list.controller.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/test/unit/phone_list.controller.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/classes/test/unit/phone_list.controller.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/tsconfig.1.json b/public/docs/_examples/upgrade-phonecat/ts/classes/tsconfig.1.json
similarity index 100%
rename from public/docs/_examples/upgrade/ts/classes/tsconfig.1.json
rename to public/docs/_examples/upgrade-phonecat/ts/classes/tsconfig.1.json
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/.bowerrc b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/.bowerrc
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/.bowerrc
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/.bowerrc
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/.gitignore b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/.gitignore
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/.gitignore
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/.gitignore
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/img/.gitkeep b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/css/.gitkeep
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/img/.gitkeep
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/css/.gitkeep
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/css/animations.css b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/css/animations.css
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/css/animations.css
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/css/animations.css
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/css/app.css b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/css/app.css
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/css/app.css
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/css/app.css
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/css/.gitkeep b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/img/.gitkeep
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/css/.gitkeep
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/img/.gitkeep
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/img/glyphicons-halflings-white.png b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/img/glyphicons-halflings-white.png
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/img/glyphicons-halflings-white.png
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/img/glyphicons-halflings-white.png
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/img/glyphicons-halflings.png b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/img/glyphicons-halflings.png
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/img/glyphicons-halflings.png
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/img/glyphicons-halflings.png
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/index.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/index.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/index.html
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/index.html
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/app.module.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/app.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/app.module.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/core/checkmark.pipe.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/core/checkmark.pipe.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/core/checkmark.pipe.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/core/checkmark.pipe.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/core/core.module.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/core/core.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/core/core.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/core/core.module.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/core/phones.service.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/core/phones.service.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/core/phones.service.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/core/phones.service.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/core/upgrade_adapter.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/core/upgrade_adapter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/core/upgrade_adapter.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/core/upgrade_adapter.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_detail/phone_detail.component.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_detail/phone_detail.component.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.component.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_detail/phone_detail.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_detail/phone_detail.html
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.html
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_detail/phone_detail.module.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_detail/phone_detail.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.module.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_detail/phone_detail_without_pipes.component.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail_without_pipes.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_detail/phone_detail_without_pipes.component.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail_without_pipes.component.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/order_by.pipe.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/order_by.pipe.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/order_by.pipe.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/order_by.pipe.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_filter.pipe.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_filter.pipe.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_filter.pipe.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_filter.pipe.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list.component.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list.component.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.component.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list.html
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.html
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list.module.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.module.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list_without_async.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_async.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list_without_async.html
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_async.html
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.component.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.component.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.component.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html
diff --git a/public/docs/_examples/upgrade/ts/classes/bower.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/bower.json
similarity index 64%
rename from public/docs/_examples/upgrade/ts/classes/bower.json
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/bower.json
index 3f8ec94656..0179178b02 100644
--- a/public/docs/_examples/upgrade/ts/classes/bower.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/bower.json
@@ -6,15 +6,15 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "angular": "1.5.0",
-    "angular-mocks": "1.5.0",
+    "angular": "1.5.3",
+    "angular-mocks": "1.5.3",
     "jquery": "~2.1.1",
     "bootstrap": "~3.1.1",
-    "angular-route": "1.5.0",
-    "angular-resource": "1.5.0",
-    "angular-animate": "1.5.0"
+    "angular-route": "1.5.3",
+    "angular-resource": "1.5.3",
+    "angular-animate": "1.5.3"
   },
   "resolutions": {
-    "angular": "1.5.0"
+    "angular": "1.5.3"
   }
 }
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/package.1.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json
similarity index 88%
rename from public/docs/_examples/upgrade/ts/ng2_final/package.1.json
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json
index b446ef5d92..add11fe0cf 100644
--- a/public/docs/_examples/upgrade/ts/ng2_final/package.1.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json
@@ -6,13 +6,12 @@
   "repository": "https://github.com/angular/angular-phonecat",
   "license": "MIT",
   "dependencies": {
-    "angular2": "2.0.0-beta.7",
-    "es6-promise": "^3.0.2",
+    "angular2": "2.0.0-beta.14",
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",
-    "zone.js": "0.5.15",
-    "systemjs": "0.19.22"
+    "zone.js": "0.6.6",
+    "systemjs": "0.19.25"
   },
   "devDependencies": {
     "karma": "^0.12.16",
@@ -24,8 +23,8 @@
     "tmp": "0.0.23",
     "bower": "^1.3.1",
     "shelljs": "^0.2.6",
-    "typescript": "1.8.2",
-    "typings": "^0.6.8"
+    "typescript": "1.8.9",
+    "typings": "^0.7.12"
   },
   "scripts": {
     "postinstall": "bower install",
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/test/e2e/scenarios.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/e2e/scenarios.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/test/e2e/scenarios.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/e2e/scenarios.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/test/karma.conf.1.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma.conf.1.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/test/karma.conf.1.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma.conf.1.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/test/karma_test_shim.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma_test_shim.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/test/karma_test_shim.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma_test_shim.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/test/protractor-conf.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/protractor-conf.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/test/protractor-conf.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/protractor-conf.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/test/unit/checkmark.pipe.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/checkmark.pipe.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/test/unit/checkmark.pipe.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/checkmark.pipe.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/test/unit/order_by.pipe.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/order_by.pipe.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/test/unit/order_by.pipe.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/order_by.pipe.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/test/unit/phone_detail.component.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/phone_detail.component.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/test/unit/phone_detail.component.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/phone_detail.component.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/test/unit/phone_filter.pipe.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/phone_filter.pipe.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/test/unit/phone_filter.pipe.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/phone_filter.pipe.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/test/unit/phone_list.component.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/phone_list.component.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/test/unit/phone_list.component.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/phone_list.component.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/test/unit/phones.service.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/phones.service.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/test/unit/phones.service.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/unit/phones.service.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/tsconfig.1.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/tsconfig.1.json
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_components/tsconfig.1.json
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_components/tsconfig.1.json
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/.bowerrc b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/.bowerrc
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/.bowerrc
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/.bowerrc
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/.gitignore b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/.gitignore
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/.gitignore
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/.gitignore
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/img/.gitkeep b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/css/.gitkeep
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/img/.gitkeep
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/css/.gitkeep
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/css/animations.css b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/css/animations.css
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/css/animations.css
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/css/animations.css
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/css/app.css b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/css/app.css
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/css/app.css
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/css/app.css
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/css/.gitkeep b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/img/.gitkeep
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/css/.gitkeep
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/img/.gitkeep
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/img/glyphicons-halflings-white.png b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/img/glyphicons-halflings-white.png
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/img/glyphicons-halflings-white.png
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/img/glyphicons-halflings-white.png
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/img/glyphicons-halflings.png b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/img/glyphicons-halflings.png
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/img/glyphicons-halflings.png
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/img/glyphicons-halflings.png
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/index.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/index.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/index.html
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/index.html
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/js/app.component.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/app.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/js/app.component.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/app.component.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/js/core/checkmark.pipe.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/core/checkmark.pipe.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/js/core/checkmark.pipe.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/core/checkmark.pipe.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/js/core/phones.service.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/core/phones.service.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/js/core/phones.service.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/core/phones.service.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/js/core/upgrade_adapter.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/core/upgrade_adapter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/js/core/upgrade_adapter.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/core/upgrade_adapter.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/js/main.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/main.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/js/main.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/main.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_detail/phone_detail.component.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_detail/phone_detail.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_detail/phone_detail.component.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_detail/phone_detail.component.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_detail/phone_detail.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_detail/phone_detail.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_detail/phone_detail.html
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_detail/phone_detail.html
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_list/order_by.pipe.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/order_by.pipe.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_list/order_by.pipe.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/order_by.pipe.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_list/phone_filter.pipe.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_filter.pipe.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_list/phone_filter.pipe.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_filter.pipe.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_list/phone_list.component.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.component.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_list/phone_list.component.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.component.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_list/phone_list.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/app/js/phone_list/phone_list.html
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.html
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/bower.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/bower.json
similarity index 64%
rename from public/docs/_examples/upgrade/ts/ng2_final/bower.json
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/bower.json
index 3f8ec94656..0179178b02 100644
--- a/public/docs/_examples/upgrade/ts/ng2_final/bower.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/bower.json
@@ -6,15 +6,15 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "angular": "1.5.0",
-    "angular-mocks": "1.5.0",
+    "angular": "1.5.3",
+    "angular-mocks": "1.5.3",
     "jquery": "~2.1.1",
     "bootstrap": "~3.1.1",
-    "angular-route": "1.5.0",
-    "angular-resource": "1.5.0",
-    "angular-animate": "1.5.0"
+    "angular-route": "1.5.3",
+    "angular-resource": "1.5.3",
+    "angular-animate": "1.5.3"
   },
   "resolutions": {
-    "angular": "1.5.0"
+    "angular": "1.5.3"
   }
 }
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/package.1.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json
similarity index 88%
rename from public/docs/_examples/upgrade/ts/ng2_components/package.1.json
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json
index b446ef5d92..add11fe0cf 100644
--- a/public/docs/_examples/upgrade/ts/ng2_components/package.1.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json
@@ -6,13 +6,12 @@
   "repository": "https://github.com/angular/angular-phonecat",
   "license": "MIT",
   "dependencies": {
-    "angular2": "2.0.0-beta.7",
-    "es6-promise": "^3.0.2",
+    "angular2": "2.0.0-beta.14",
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",
-    "zone.js": "0.5.15",
-    "systemjs": "0.19.22"
+    "zone.js": "0.6.6",
+    "systemjs": "0.19.25"
   },
   "devDependencies": {
     "karma": "^0.12.16",
@@ -24,8 +23,8 @@
     "tmp": "0.0.23",
     "bower": "^1.3.1",
     "shelljs": "^0.2.6",
-    "typescript": "1.8.2",
-    "typings": "^0.6.8"
+    "typescript": "1.8.9",
+    "typings": "^0.7.12"
   },
   "scripts": {
     "postinstall": "bower install",
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/test/e2e/scenarios.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/e2e/scenarios.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/test/e2e/scenarios.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/e2e/scenarios.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/test/karma.conf.1.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma.conf.1.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/test/karma.conf.1.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma.conf.1.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/test/karma_test_shim.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma_test_shim.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/test/karma_test_shim.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma_test_shim.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/test/protractor-conf.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/protractor-conf.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/test/protractor-conf.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/protractor-conf.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/test/unit/checkmark.pipe.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/checkmark.pipe.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/test/unit/checkmark.pipe.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/checkmark.pipe.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/test/unit/order_by.pipe.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/order_by.pipe.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/test/unit/order_by.pipe.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/order_by.pipe.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/test/unit/phone_detail.component.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phone_detail.component.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/test/unit/phone_detail.component.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phone_detail.component.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/test/unit/phone_filter.pipe.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phone_filter.pipe.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/test/unit/phone_filter.pipe.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phone_filter.pipe.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/test/unit/phone_list.component.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phone_list.component.spec.ts
similarity index 99%
rename from public/docs/_examples/upgrade/ts/ng2_final/test/unit/phone_list.component.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phone_list.component.spec.ts
index a051e75baf..a05cd640f6 100644
--- a/public/docs/_examples/upgrade/ts/ng2_final/test/unit/phone_list.component.spec.ts
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phone_list.component.spec.ts
@@ -2,7 +2,7 @@
 import {provide, ApplicationRef} from 'angular2/core';
 import {HTTP_PROVIDERS} from 'angular2/http';
 import {
-  ROUTER_PROVIDERS
+  ROUTER_PROVIDERS,
   ROUTER_PRIMARY_COMPONENT,
   LocationStrategy
 } from 'angular2/router';
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/test/unit/phones.service.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phones.service.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/test/unit/phones.service.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/unit/phones.service.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/tsconfig.1.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/tsconfig.1.json
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_final/tsconfig.1.json
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_final/tsconfig.1.json
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/.bowerrc b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/.bowerrc
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/.bowerrc
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/.bowerrc
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/.gitignore b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/.gitignore
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/.gitignore
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/.gitignore
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/img/.gitkeep b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/css/.gitkeep
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/img/.gitkeep
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/css/.gitkeep
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/css/animations.css b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/css/animations.css
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/css/animations.css
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/css/animations.css
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/css/app.css b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/css/app.css
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/css/app.css
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/css/app.css
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/css/.gitkeep b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/img/.gitkeep
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/css/.gitkeep
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/img/.gitkeep
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/img/glyphicons-halflings-white.png b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/img/glyphicons-halflings-white.png
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/img/glyphicons-halflings-white.png
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/img/glyphicons-halflings-white.png
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/img/glyphicons-halflings.png b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/img/glyphicons-halflings.png
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/img/glyphicons-halflings.png
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/img/glyphicons-halflings.png
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/index.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/index.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/index.html
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/index.html
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/js/app.module.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/js/app.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/app.module.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/js/core/checkmark.filter.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/core/checkmark.filter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/js/core/checkmark.filter.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/core/checkmark.filter.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/js/core/core.module.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/core/core.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/js/core/core.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/core/core.module.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/js/core/phones.service.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/core/phones.service.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/js/core/phones.service.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/core/phones.service.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/js/core/upgrade_adapter.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/core/upgrade_adapter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/js/core/upgrade_adapter.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/core/upgrade_adapter.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_detail/phone_detail.controller.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_detail/phone_detail.controller.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_detail/phone_detail.controller.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_detail/phone_detail.controller.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_detail/phone_detail.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_detail/phone_detail.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_detail/phone_detail.html
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_detail/phone_detail.html
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_detail/phone_detail.module.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_detail/phone_detail.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_detail/phone_detail.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_detail/phone_detail.module.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_list/phone_list.controller.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_list/phone_list.controller.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_list/phone_list.controller.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_list/phone_list.controller.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_list/phone_list.html b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_list/phone_list.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_list/phone_list.html
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_list/phone_list.html
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_list/phone_list.module.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_list/phone_list.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/app/js/phone_list/phone_list.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/app/js/phone_list/phone_list.module.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/bower.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/bower.json
similarity index 64%
rename from public/docs/_examples/upgrade/ts/ng2_initial/bower.json
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/bower.json
index 3f8ec94656..0179178b02 100644
--- a/public/docs/_examples/upgrade/ts/ng2_initial/bower.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/bower.json
@@ -6,15 +6,15 @@
   "license": "MIT",
   "private": true,
   "dependencies": {
-    "angular": "1.5.0",
-    "angular-mocks": "1.5.0",
+    "angular": "1.5.3",
+    "angular-mocks": "1.5.3",
     "jquery": "~2.1.1",
     "bootstrap": "~3.1.1",
-    "angular-route": "1.5.0",
-    "angular-resource": "1.5.0",
-    "angular-animate": "1.5.0"
+    "angular-route": "1.5.3",
+    "angular-resource": "1.5.3",
+    "angular-animate": "1.5.3"
   },
   "resolutions": {
-    "angular": "1.5.0"
+    "angular": "1.5.3"
   }
 }
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/package.1.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json
similarity index 88%
rename from public/docs/_examples/upgrade/ts/ng2_initial/package.1.json
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json
index b446ef5d92..add11fe0cf 100644
--- a/public/docs/_examples/upgrade/ts/ng2_initial/package.1.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json
@@ -6,13 +6,12 @@
   "repository": "https://github.com/angular/angular-phonecat",
   "license": "MIT",
   "dependencies": {
-    "angular2": "2.0.0-beta.7",
-    "es6-promise": "^3.0.2",
+    "angular2": "2.0.0-beta.14",
     "es6-shim": "^0.35.0",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",
-    "zone.js": "0.5.15",
-    "systemjs": "0.19.22"
+    "zone.js": "0.6.6",
+    "systemjs": "0.19.25"
   },
   "devDependencies": {
     "karma": "^0.12.16",
@@ -24,8 +23,8 @@
     "tmp": "0.0.23",
     "bower": "^1.3.1",
     "shelljs": "^0.2.6",
-    "typescript": "1.8.2",
-    "typings": "^0.6.8"
+    "typescript": "1.8.9",
+    "typings": "^0.7.12"
   },
   "scripts": {
     "postinstall": "bower install",
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/test/e2e/scenarios.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/e2e/scenarios.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/test/e2e/scenarios.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/e2e/scenarios.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/test/karma.conf.1.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/test/karma.conf.1.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/test/karma_test_shim.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma_test_shim.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/test/karma_test_shim.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma_test_shim.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/test/protractor-conf.js b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/protractor-conf.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/test/protractor-conf.js
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/protractor-conf.js
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/test/unit/checkmark.filter.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/unit/checkmark.filter.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/test/unit/checkmark.filter.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/unit/checkmark.filter.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/test/unit/phone_detail.controller.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/unit/phone_detail.controller.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/test/unit/phone_detail.controller.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/unit/phone_detail.controller.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/test/unit/phone_list.controller.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/unit/phone_list.controller.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/test/unit/phone_list.controller.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/unit/phone_list.controller.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/test/unit/phones.service.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/unit/phones.service.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/test/unit/phones.service.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/unit/phones.service.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/tsconfig.1.json b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/tsconfig.1.json
similarity index 100%
rename from public/docs/_examples/upgrade/ts/ng2_initial/tsconfig.1.json
rename to public/docs/_examples/upgrade-phonecat/ts/ng2_initial/tsconfig.1.json
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/.bowerrc b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/.bowerrc
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/.bowerrc
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/.bowerrc
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/.gitignore b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/.gitignore
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/.gitignore
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/.gitignore
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/img/.gitkeep b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/css/.gitkeep
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/img/.gitkeep
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/css/.gitkeep
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/css/animations.css b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/css/animations.css
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/css/animations.css
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/css/animations.css
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/css/app.css b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/css/app.css
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/css/app.css
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/css/app.css
diff --git a/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/img/.gitkeep b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/img/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/img/glyphicons-halflings-white.png b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/img/glyphicons-halflings-white.png
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/img/glyphicons-halflings-white.png
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/img/glyphicons-halflings-white.png
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/img/glyphicons-halflings.png b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/img/glyphicons-halflings.png
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/img/glyphicons-halflings.png
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/img/glyphicons-halflings.png
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/index.html b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/index.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/index.html
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/index.html
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/js/app.module.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/app.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/js/app.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/app.module.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/js/core/checkmark.filter.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/core/checkmark.filter.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/js/core/checkmark.filter.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/core/checkmark.filter.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/js/core/core.module.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/core/core.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/js/core/core.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/core/core.module.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/js/core/phone.factory.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/core/phone.factory.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/js/core/phone.factory.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/core/phone.factory.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_detail/phone_detail.controller.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_detail/phone_detail.controller.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_detail/phone_detail.controller.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_detail/phone_detail.controller.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_detail/phone_detail.html b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_detail/phone_detail.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_detail/phone_detail.html
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_detail/phone_detail.html
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_detail/phone_detail.module.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_detail/phone_detail.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_detail/phone_detail.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_detail/phone_detail.module.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_list/phone_list.controller.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_list/phone_list.controller.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_list/phone_list.controller.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_list/phone_list.controller.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_list/phone_list.html b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_list/phone_list.html
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_list/phone_list.html
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_list/phone_list.html
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_list/phone_list.module.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_list/phone_list.module.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/app/js/phone_list/phone_list.module.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/app/js/phone_list/phone_list.module.ts
diff --git a/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/bower.json b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/bower.json
new file mode 100644
index 0000000000..0179178b02
--- /dev/null
+++ b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/bower.json
@@ -0,0 +1,20 @@
+{
+  "name": "angular-phonecat",
+  "description": "A starter project for AngularJS",
+  "version": "0.0.0",
+  "homepage": "https://github.com/angular/angular-phonecat",
+  "license": "MIT",
+  "private": true,
+  "dependencies": {
+    "angular": "1.5.3",
+    "angular-mocks": "1.5.3",
+    "jquery": "~2.1.1",
+    "bootstrap": "~3.1.1",
+    "angular-route": "1.5.3",
+    "angular-resource": "1.5.3",
+    "angular-animate": "1.5.3"
+  },
+  "resolutions": {
+    "angular": "1.5.3"
+  }
+}
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/package.1.json b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/package.1.json
similarity index 93%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/package.1.json
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/package.1.json
index cbbef829f1..cec9c37aee 100644
--- a/public/docs/_examples/upgrade/ts/typescript-conversion/package.1.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/package.1.json
@@ -6,7 +6,7 @@
   "repository": "https://github.com/angular/angular-phonecat",
   "license": "MIT",
   "dependencies": {
-    "systemjs": "0.19.22"
+    "systemjs": "0.19.25"
   },
   "devDependencies": {
     "bower": "^1.3.1",
@@ -18,8 +18,8 @@
     "protractor": "^3.0.0",
     "shelljs": "^0.2.6",
     "tmp": "0.0.23",
-    "typescript": "^1.8.2",
-    "typings": "^0.6.8"
+    "typescript": "^1.8.9",
+    "typings": "^0.7.12"
   },
   "scripts": {
     "postinstall": "bower install",
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/test/e2e/scenarios.js b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/e2e/scenarios.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/test/e2e/scenarios.js
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/e2e/scenarios.js
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/test/jasmine_matchers.d.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/jasmine_matchers.d.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/test/jasmine_matchers.d.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/jasmine_matchers.d.ts
diff --git a/public/docs/_examples/upgrade/ts/classes/test/karma.conf.1.js b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/karma.conf.1.js
similarity index 96%
rename from public/docs/_examples/upgrade/ts/classes/test/karma.conf.1.js
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/karma.conf.1.js
index 646cdeb55a..8f2e7d178f 100644
--- a/public/docs/_examples/upgrade/ts/classes/test/karma.conf.1.js
+++ b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/karma.conf.1.js
@@ -32,9 +32,7 @@ module.exports = function(config){
     junitReporter : {
       outputFile: 'test_out/unit.xml',
       suite: 'unit'
-    },
-
-    logLevel: 'LOG_DEBUG'
+    }
 
   });
 };
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/test/karma_test_shim.js b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/karma_test_shim.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/test/karma_test_shim.js
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/karma_test_shim.js
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/test/protractor-conf.js b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/protractor-conf.js
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/test/protractor-conf.js
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/protractor-conf.js
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/test/unit/checkmark.filter.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/unit/checkmark.filter.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/test/unit/checkmark.filter.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/unit/checkmark.filter.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/test/unit/phone.factory.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/unit/phone.factory.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/test/unit/phone.factory.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/unit/phone.factory.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/test/unit/phone_detail.controller.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/unit/phone_detail.controller.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/test/unit/phone_detail.controller.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/unit/phone_detail.controller.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/test/unit/phone_list.controller.spec.ts b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/unit/phone_list.controller.spec.ts
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/test/unit/phone_list.controller.spec.ts
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/test/unit/phone_list.controller.spec.ts
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/tsconfig.1.json b/public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/tsconfig.1.json
similarity index 100%
rename from public/docs/_examples/upgrade/ts/typescript-conversion/tsconfig.1.json
rename to public/docs/_examples/upgrade-phonecat/ts/typescript-conversion/tsconfig.1.json
diff --git a/public/docs/_examples/upgrade/.gitignore b/public/docs/_examples/upgrade/.gitignore
deleted file mode 100644
index 6e8b20ba28..0000000000
--- a/public/docs/_examples/upgrade/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-!karma.conf.js
-!package.json
-!tsconfig.json
diff --git a/public/docs/_examples/upgrade/ts/adapter/.gitignore b/public/docs/_examples/upgrade/ts/adapter/.gitignore
deleted file mode 100644
index 0caf9d9ce2..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-app/**/*.js
-app/**/*.js.map
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-1-2-hybrid-bootstrap.html b/public/docs/_examples/upgrade/ts/adapter/app/index-1-2-hybrid-bootstrap.html
deleted file mode 100644
index 0c6ab1c17a..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-1-2-hybrid-bootstrap.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="../node_modules/systemjs/dist/system.js"></script>
-  <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-  <script src="../node_modules/angular2/bundles/upgrade.dev.js"></script>
-  <script>
-    System.config({
-      packages: {
-        'js': {defaultExtension: 'js'}
-      }
-    });
-    System.import('js/1-2-hybrid-bootstrap/app.module')
-      .catch(function(e) { console.error(e); });
-  </script>
-</body>
-</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-1-2-hybrid-shared-adapter-bootstrap.html b/public/docs/_examples/upgrade/ts/adapter/app/index-1-2-hybrid-shared-adapter-bootstrap.html
deleted file mode 100644
index 7d2f2748b7..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-1-2-hybrid-shared-adapter-bootstrap.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="../node_modules/systemjs/dist/system.js"></script>
-  <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-  <script src="../node_modules/angular2/bundles/upgrade.dev.js"></script>
-  <script>
-    System.config({
-      packages: {
-        'js': {defaultExtension: 'js'}
-      }
-    });
-    System.import('js/1-2-hybrid-shared-adapter-bootstrap/app.module')
-      .catch(function(e) { console.error(e); });
-  </script>
-</body>
-</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-1-to-2-projection.html b/public/docs/_examples/upgrade/ts/adapter/app/index-1-to-2-projection.html
deleted file mode 100644
index 089a668b26..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-1-to-2-projection.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-  <hero-app>
-    <!-- #docregion usecomponent -->
-    <div ng-controller="MainController as mainCtrl">
-      <hero-detail [hero]="mainCtrl.hero">
-        <!-- Everything here will get projected -->
-        <p>{{mainCtrl.hero.description}}</p>
-      </hero-detail>
-    </div>
-    <!-- #enddocregion usecomponent -->
-  </hero-app>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="../node_modules/systemjs/dist/system.js"></script>
-  <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-  <script src="../node_modules/angular2/bundles/upgrade.dev.js"></script>
-  <script>
-    System.config({
-      packages: {
-        'js': {defaultExtension: 'js'}
-      }
-    });
-    System.import('js/1-to-2-projection/app.module')
-      .catch(function(e) { console.error(e); });
-  </script>
-</body>
-</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-1-to-2-providers.html b/public/docs/_examples/upgrade/ts/adapter/app/index-1-to-2-providers.html
deleted file mode 100644
index 7a14dd0db9..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-1-to-2-providers.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-  <hero-app>
-    <hero-detail>
-    </hero-detail>
-  </hero-app>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="../node_modules/systemjs/dist/system.js"></script>
-  <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-  <script src="../node_modules/angular2/bundles/upgrade.dev.js"></script>
-  <script>
-    System.config({
-      packages: {
-        'js': {defaultExtension: 'js'}
-      }
-    });
-    System.import('js/1-to-2-providers/app.module')
-      .catch(function(e) { console.error(e); });
-  </script>
-</body>
-</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-2-to-1-providers.html b/public/docs/_examples/upgrade/ts/adapter/app/index-2-to-1-providers.html
deleted file mode 100644
index 6fa63fae06..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-2-to-1-providers.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-  <hero-app>
-    <hero-detail>
-    </hero-detail>
-  </hero-app>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="../node_modules/systemjs/dist/system.js"></script>
-  <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-  <script src="../node_modules/angular2/bundles/upgrade.dev.js"></script>
-  <script>
-    System.config({
-      packages: {
-        'js': {defaultExtension: 'js'}
-      }
-    });
-    System.import('js/2-to-1-providers/app.module')
-      .catch(function(e) { console.error(e); });
-  </script>
-</body>
-</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-2-to-1-transclusion.html b/public/docs/_examples/upgrade/ts/adapter/app/index-2-to-1-transclusion.html
deleted file mode 100644
index f99223054a..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-2-to-1-transclusion.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-  <hero-app>
-    <my-container></my-container>
-  </hero-app>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="../node_modules/systemjs/dist/system.js"></script>
-  <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-  <script src="../node_modules/angular2/bundles/upgrade.dev.js"></script>
-  <script>
-    System.config({
-      packages: {
-        'js': {defaultExtension: 'js'}
-      }
-    });
-    System.import('js/2-to-1-transclusion/app.module')
-      .catch(function(e) { console.error(e); });
-  </script>
-</body>
-</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-bootstrap.html b/public/docs/_examples/upgrade/ts/adapter/app/index-bootstrap.html
deleted file mode 100644
index aa89f22ced..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-bootstrap.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- #docregion -->
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-  <div ng-view></div>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="js/1-bootstrap/app.module.js"></script>
-</body>
-</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-downgrade-io.html b/public/docs/_examples/upgrade/ts/adapter/app/index-downgrade-io.html
deleted file mode 100644
index caccf11655..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-downgrade-io.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-  <hero-app>
-    <!-- #docregion usecomponent -->
-    <div ng-controller="MainController as mainCtrl">
-      <hero-detail [hero]="mainCtrl.hero"
-                   (deleted)="mainCtrl.onDelete($event)">
-      </hero-detail>
-    </div>
-    <!-- #enddocregion usecomponent -->
-    <!-- #docregion userepeatedcomponent -->
-    <div ng-controller="MainController as mainCtrl">
-      <hero-detail [hero]="hero"
-                   (deleted)="mainCtrl.onDelete($event)"
-                   ng-repeat="hero in mainCtrl.heroes">
-      </hero-detail>
-    </div>
-    <!-- #enddocregion userepeatedcomponent-->
-  </hero-app>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="../node_modules/systemjs/dist/system.js"></script>
-  <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-  <script src="../node_modules/angular2/bundles/upgrade.dev.js"></script>
-  <script>
-    System.config({
-      packages: {
-        'js': {defaultExtension: 'js'}
-      }
-    });
-    System.import('js/downgrade-io/app.module')
-      .catch(function(e) { console.error(e); });
-  </script>
-</body>
-</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-downgrade-static.html b/public/docs/_examples/upgrade/ts/adapter/app/index-downgrade-static.html
deleted file mode 100644
index dbbd02859f..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-downgrade-static.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-  <hero-app>
-    <!-- #docregion usecomponent -->
-    <hero-detail></hero-detail>
-    <!-- #enddocregion usecomponent -->
-  </hero-app>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="../node_modules/systemjs/dist/system.js"></script>
-  <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-  <script src="../node_modules/angular2/bundles/upgrade.dev.js"></script>
-  <script>
-    System.config({
-      packages: {
-        'js': {defaultExtension: 'js'}
-      }
-    });
-    System.import('js/downgrade-static/app.module')
-      .catch(function(e) { console.error(e); });
-  </script>
-</body>
-</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-upgrade-io.html b/public/docs/_examples/upgrade/ts/adapter/app/index-upgrade-io.html
deleted file mode 100644
index aa8a57cc6a..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-upgrade-io.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-  <hero-app>
-    <my-container></my-container>
-  </hero-app>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="../node_modules/systemjs/dist/system.js"></script>
-  <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-  <script src="../node_modules/angular2/bundles/upgrade.dev.js"></script>
-  <script>
-    System.config({
-      packages: {
-        'js': {defaultExtension: 'js'}
-      }
-    });
-    System.import('js/upgrade-io/app.module')
-      .catch(function(e) { console.error(e); });
-  </script>
-</body>
-</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/index-upgrade-static.html b/public/docs/_examples/upgrade/ts/adapter/app/index-upgrade-static.html
deleted file mode 100644
index b0a85ce95c..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/index-upgrade-static.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-  <hero-app>
-    <my-container></my-container>
-  </hero-app>
-  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0-rc.0/angular.js"></script>
-  <script src="../node_modules/systemjs/dist/system.js"></script>
-  <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-  <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-  <script src="../node_modules/angular2/bundles/upgrade.dev.js"></script>
-  <script>
-    System.config({
-      packages: {
-        'js': {defaultExtension: 'js'}
-      }
-    });
-    System.import('js/upgrade-static/app.module')
-      .catch(function(e) { console.error(e); });
-  </script>
-</body>
-</html>
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-autobootstrap/app.module.ts b/public/docs/_examples/upgrade/ts/adapter/app/js/1-autobootstrap/app.module.ts
deleted file mode 100644
index aaf3a2ca85..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/1-autobootstrap/app.module.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare var angular:any;
-
-angular.module('heroApp', []);
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-bootstrap/app.module.ts b/public/docs/_examples/upgrade/ts/adapter/app/js/1-bootstrap/app.module.ts
deleted file mode 100644
index cc58467d56..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/1-bootstrap/app.module.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-declare var angular:any;
-
-angular.module('heroApp', [])
-  .run(() => console.log('running'));
-
-// #docregion bootstrap
-angular.bootstrap(document.body, ['heroApp'], {strictDi: true});
-// #enddocregion bootstrap
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-ng-app/app.module.ts b/public/docs/_examples/upgrade/ts/adapter/app/js/1-ng-app/app.module.ts
deleted file mode 100644
index 0e6c12fa7a..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/1-ng-app/app.module.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare var angular:any;
-
-angular.module('heroApp', [])
-  .run(() => console.log('running'));
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-projection/main.controller.ts b/public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-projection/main.controller.ts
deleted file mode 100644
index 11a2c5b38b..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/1-to-2-projection/main.controller.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import {Hero} from '../Hero';
-
-export class MainController {
-  hero = new Hero(1, 'Windstorm', 'A descr');
-}
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-providers/hero-detail.component.ts b/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-providers/hero-detail.component.ts
deleted file mode 100644
index 8658eb3fa4..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/2-to-1-providers/hero-detail.component.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-// #docregion
-export const heroDetailComponent = {
-  template: `
-    <h2>{{heroDetail.hero.id}}: {{heroDetail.hero.name}}</h2>
-  `,
-  controller: ['heroes', function(heroes) {
-    this.hero = heroes.get()[0];
-  }]
-};
diff --git a/public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-io/hero-detail.component.ts b/public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-io/hero-detail.component.ts
deleted file mode 100644
index 5ebc958b18..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/app/js/upgrade-io/hero-detail.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// #docregion
-export const heroDetail = {
-  bindings: {
-    hero: '=',
-    deleted: '&'
-  },
-  template: `
-    <h2>{{heroDetail.hero.name}} details!</h2>
-    <div><label>id: </label>{{heroDetail.hero.id}}</div>
-    <button ng-click="heroDetail.onDelete()">Delete</button>
-  `,
-  controller: function() {
-    this.onDelete = () => {
-      this.deleted({hero: this.hero});
-    };
-  }
-};
diff --git a/public/docs/_examples/upgrade/ts/adapter/package.json b/public/docs/_examples/upgrade/ts/adapter/package.json
deleted file mode 100644
index 5e84bdf221..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/package.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "name": "adapter",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "typescript": "1.8.2",
-    "typings": "^0.6.8"
-  },
-  "dependencies": {
-    "angular2": "2.0.0-beta.7",
-    "es6-promise": "3.0.2",
-    "es6-shim": "0.33.13",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "systemjs": "0.19.22",
-    "zone.js": "0.5.15"
-  },
-  "scripts": {
-    "tsc": "tsc -p . -w",
-    "typings": "typings"
-  }
-}
diff --git a/public/docs/_examples/upgrade/ts/adapter/tsconfig.json b/public/docs/_examples/upgrade/ts/adapter/tsconfig.json
deleted file mode 100644
index c1216959ee..0000000000
--- a/public/docs/_examples/upgrade/ts/adapter/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "module": "system",
-    "moduleResolution": "node",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true
-  },
-  "exclude": [
-    "node_modules",
-    "typings/main.d.ts",
-    "typings/main"
-  ]
-}
diff --git a/public/docs/_examples/upgrade/ts/classes/typings.json b/public/docs/_examples/upgrade/ts/classes/typings.json
deleted file mode 100644
index 3925b59066..0000000000
--- a/public/docs/_examples/upgrade/ts/classes/typings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "ambientDependencies": {
-    "angular": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular.d.ts#3bebbe1baee04846cc46ed7249e8117e4cd7c7ff",
-    "angular-mocks": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-mocks.d.ts#77dd2668f85730372aa8e62152e652048e8b6b87",
-    "angular-resource": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-resource.d.ts#c6609aff88f2c59e4df9adb93df5c7932adfd7b4",
-    "angular-route": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-route.d.ts#cf172aab99c3139a718aa8e65398a22c53dd7ead",
-    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#26c98c8a9530c44f8c801ccc3b2057e2101187ee",
-    "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#cf2a968f0edd7d30773f7d23fe3708fa029d5ab7"
-  }
-}
diff --git a/public/docs/_examples/upgrade/ts/ng2_components/typings.json b/public/docs/_examples/upgrade/ts/ng2_components/typings.json
deleted file mode 100644
index 8351ca2854..0000000000
--- a/public/docs/_examples/upgrade/ts/ng2_components/typings.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ambientDependencies": {
-    "angular": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular.d.ts#3bebbe1baee04846cc46ed7249e8117e4cd7c7ff",
-    "angular-mocks": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-mocks.d.ts#77dd2668f85730372aa8e62152e652048e8b6b87",
-    "angular-resource": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-resource.d.ts#c6609aff88f2c59e4df9adb93df5c7932adfd7b4",
-    "angular-route": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-route.d.ts#cf172aab99c3139a718aa8e65398a22c53dd7ead",
-    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#26c98c8a9530c44f8c801ccc3b2057e2101187ee",
-    "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#cf2a968f0edd7d30773f7d23fe3708fa029d5ab7",
-    "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#6697d6f7dadbf5773cb40ecda35a76027e0783b2"
-  }
-}
diff --git a/public/docs/_examples/upgrade/ts/ng2_final/typings.json b/public/docs/_examples/upgrade/ts/ng2_final/typings.json
deleted file mode 100644
index 3b324843f7..0000000000
--- a/public/docs/_examples/upgrade/ts/ng2_final/typings.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "ambientDependencies": {
-    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#26c98c8a9530c44f8c801ccc3b2057e2101187ee",
-    "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#6697d6f7dadbf5773cb40ecda35a76027e0783b2"
-  }
-}
diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/typings.json b/public/docs/_examples/upgrade/ts/ng2_initial/typings.json
deleted file mode 100644
index 8351ca2854..0000000000
--- a/public/docs/_examples/upgrade/ts/ng2_initial/typings.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ambientDependencies": {
-    "angular": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular.d.ts#3bebbe1baee04846cc46ed7249e8117e4cd7c7ff",
-    "angular-mocks": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-mocks.d.ts#77dd2668f85730372aa8e62152e652048e8b6b87",
-    "angular-resource": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-resource.d.ts#c6609aff88f2c59e4df9adb93df5c7932adfd7b4",
-    "angular-route": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-route.d.ts#cf172aab99c3139a718aa8e65398a22c53dd7ead",
-    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#26c98c8a9530c44f8c801ccc3b2057e2101187ee",
-    "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#cf2a968f0edd7d30773f7d23fe3708fa029d5ab7",
-    "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#6697d6f7dadbf5773cb40ecda35a76027e0783b2"
-  }
-}
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/bower.json b/public/docs/_examples/upgrade/ts/typescript-conversion/bower.json
deleted file mode 100644
index 3f8ec94656..0000000000
--- a/public/docs/_examples/upgrade/ts/typescript-conversion/bower.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name": "angular-phonecat",
-  "description": "A starter project for AngularJS",
-  "version": "0.0.0",
-  "homepage": "https://github.com/angular/angular-phonecat",
-  "license": "MIT",
-  "private": true,
-  "dependencies": {
-    "angular": "1.5.0",
-    "angular-mocks": "1.5.0",
-    "jquery": "~2.1.1",
-    "bootstrap": "~3.1.1",
-    "angular-route": "1.5.0",
-    "angular-resource": "1.5.0",
-    "angular-animate": "1.5.0"
-  },
-  "resolutions": {
-    "angular": "1.5.0"
-  }
-}
diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/typings.json b/public/docs/_examples/upgrade/ts/typescript-conversion/typings.json
deleted file mode 100644
index 55b63ee44f..0000000000
--- a/public/docs/_examples/upgrade/ts/typescript-conversion/typings.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "ambientDependencies": {
-    "angular": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular.d.ts#3bebbe1baee04846cc46ed7249e8117e4cd7c7ff",
-    "angular-mocks": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-mocks.d.ts#77dd2668f85730372aa8e62152e652048e8b6b87",
-    "angular-resource": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-resource.d.ts#c6609aff88f2c59e4df9adb93df5c7932adfd7b4",
-    "angular-route": "github:DefinitelyTyped/DefinitelyTyped/angularjs/angular-route.d.ts#cf172aab99c3139a718aa8e65398a22c53dd7ead",
-    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#26c98c8a9530c44f8c801ccc3b2057e2101187ee",
-    "jquery": "github:DefinitelyTyped/DefinitelyTyped/jquery/jquery.d.ts#470954c4f427e0805a2d633636a7c6aa7170def8"
-  }
-}
diff --git a/public/docs/ts/latest/guide/upgrade.jade b/public/docs/ts/latest/guide/upgrade.jade
index 5b876af92b..45b61cbffb 100644
--- a/public/docs/ts/latest/guide/upgrade.jade
+++ b/public/docs/ts/latest/guide/upgrade.jade
@@ -182,7 +182,7 @@ include ../_util-fns
   An Angular 1 component directive that is fully aligned with the Angular 2
   architecture may look something like this:
     
-+makeExample('upgrade/ts/adapter/app/js/hero-detail.directive.ts')
++makeExample('upgrade-adapter/ts/app/hero-detail.directive.ts')
 
 :marked
   Angular 1.5 introduces the [component API](https://docs.angularjs.org/api/ng/type/angular.Module)
@@ -197,7 +197,7 @@ include ../_util-fns
   The component directive example from above looks like this when expressed
   using the component API:
   
-+makeExample('upgrade/ts/adapter/app/js/upgrade-io/hero-detail.component.ts')
++makeExample('upgrade-adapter/ts/app/upgrade-io/hero-detail.component.ts')
 
 
 
@@ -400,14 +400,14 @@ figure.image-display
 
   Say we have an `ng-app` driven bootstrap such as this one:
   
-+makeExample('upgrade/ts/adapter/app/index-ng-app.html', null, null, {otl: /(ng-app.*ng-strict-di)/})
++makeExample('upgrade-adapter/ts/index-ng-app.html', null, null, {otl: /(ng-app.*ng-strict-di)/})
 
 :marked
   We can remove the `ng-app` and `ng-strict-di` directives from the HTML
   and instead switch to calling `angular.bootstrap` from JavaScript, which
   will result in the same thing:
 
-+makeExample('upgrade/ts/adapter/app/js/1-bootstrap/app.module.ts', 'bootstrap')
++makeExample('upgrade-adapter/ts/app/1-bootstrap/app.module.ts', 'bootstrap')
 
 :marked
   To then switch the application into hybrid mode, we must first
@@ -419,7 +419,7 @@ figure.image-display
   [angular.bootstrap](https://docs.angularjs.org/api/ng/function/angular.bootstrap)
   so that it is easy to make the switch:
 
-+makeExample('upgrade/ts/adapter/app/js/1-2-hybrid-bootstrap/app.module.ts', 'bootstrap')
++makeExample('upgrade-adapter/ts/app/1-2-hybrid-bootstrap/app.module.ts', 'bootstrap')
 
 :marked
   At this point we'll be running a hybrid Angular 1+2 application! All the
@@ -441,12 +441,12 @@ figure.image-display
   It'll be useful to have a module for a shared `UpgradeAdapter` instance in
   the project:
   
-+makeExample('upgrade/ts/adapter/app/js/1-2-hybrid-shared-adapter-bootstrap/upgrade_adapter.ts', null, 'upgrade_adapter.ts')
++makeExample('upgrade-adapter/ts/app/1-2-hybrid-shared-adapter-bootstrap/upgrade_adapter.ts', null, 'upgrade_adapter.ts')
 
 :marked
   This shared instance can then be pulled in to all the modules that need it:
   
-+makeExample('upgrade/ts/adapter/app/js/1-2-hybrid-shared-adapter-bootstrap/app.module.ts', 'bootstrap')
++makeExample('upgrade-adapter/ts/app/1-2-hybrid-shared-adapter-bootstrap/app.module.ts', 'bootstrap')
 
 :marked
   ## Using Angular 2 Components from Angular 1 Code
@@ -460,20 +460,20 @@ figure
   
   Say we have a simple Angular 2 component that shows information about a hero:
   
-+makeExample('upgrade/ts/adapter/app/js/downgrade-static/hero-detail.component.ts', null, 'hero-detail.component.ts')
++makeExample('upgrade-adapter/ts/app/downgrade-static/hero-detail.component.ts', null, 'hero-detail.component.ts')
 
 :marked
   If we want to use this component from Angular 1, we need to *downgrade* it
   using the upgrade adapter. What we get when we do that is an Angular 1
   *directive*, which we can then register into our Angular 1 module:
   
-+makeExample('upgrade/ts/adapter/app/js/downgrade-static/app.module.ts', 'downgradecomponent')
++makeExample('upgrade-adapter/ts/app/downgrade-static/app.module.ts', 'downgradecomponent')
 
 :marked
   What we have here is an Angular 1 directive called `heroDetail`, which we can
   use like any other directive in our Angular 1 templates. 
   
-+makeExample('upgrade/ts/adapter/app/index-downgrade-static.html', 'usecomponent')
++makeExample('upgrade-adapter/ts/index-downgrade-static.html', 'usecomponent')
 
 .alert.is-helpful
   :marked
@@ -487,13 +487,13 @@ figure
   Angular 2 hero detail component with inputs and outputs might look
   like this:
    
-+makeExample('upgrade/ts/adapter/app/js/downgrade-io/hero-detail.component.ts', null, 'hero-detail.component.ts')
++makeExample('upgrade-adapter/ts/app/downgrade-io/hero-detail.component.ts', null, 'hero-detail.component.ts')
 
 :marked
   These inputs and outputs can be supplied from the Angular 1 template, and the
   `UpgradeAdapter` takes care of bridging them over:
   
-+makeExample('upgrade/ts/adapter/app/index-downgrade-io.html', 'usecomponent')
++makeExample('upgrade-adapter/ts/index-downgrade-io.html', 'usecomponent')
 
 :marked
   Note that even though we are in an Angular 1 template, **we're using Angular 2
@@ -508,7 +508,7 @@ figure
   directives on the element, even though it has Angular 2 binding attributes on it.
   For  example, we can easily make multiple copies of the component using `ng-repeat`:
   
-+makeExample('upgrade/ts/adapter/app/index-downgrade-io.html', 'userepeatedcomponent')
++makeExample('upgrade-adapter/ts/index-downgrade-io.html', 'userepeatedcomponent')
 
 :marked
   ## Using Angular 1 Component Directives from Angular 2 Code
@@ -533,7 +533,7 @@ figure
   A simple example of an upgradable component is one that just has a template
   and a controller: 
    
-+makeExample('upgrade/ts/adapter/app/js/upgrade-static/hero-detail.component.ts', null, 'hero-detail.component.ts')
++makeExample('upgrade-adapter/ts/app/upgrade-static/hero-detail.component.ts', null, 'hero-detail.component.ts')
 
 :marked
   We can *upgrade* this component to Angular 2 using the `UpgradeAdapter`'s
@@ -542,7 +542,7 @@ figure
   want to use it from an Angular 2 component, we list it the in the `directives`
   metadata of the component and then just use it in the Angular 2 template:
   
-+makeExample('upgrade/ts/adapter/app/js/upgrade-static/container.component.ts', null, 'container.component.ts')
++makeExample('upgrade-adapter/ts/app/upgrade-static/container.component.ts', null, 'container.component.ts')
 
 .alert.is-helpful
   :marked
@@ -592,13 +592,13 @@ table
   As an example, say we have a hero detail Angular 1 component directive
   with one input and one output:
   
-+makeExample('upgrade/ts/adapter/app/js/upgrade-io/hero-detail.component.ts', null, 'hero-detail.component.ts')
++makeExample('upgrade-adapter/ts/app/upgrade-io/hero-detail.component.ts', null, 'hero-detail.component.ts')
 
 :marked
   We can upgrade this component to Angular 2, and then provide the input
   and output using Angular 2 template syntax:
   
-+makeExample('upgrade/ts/adapter/app/js/upgrade-io/container.component.ts', null, 'container.component.ts')
++makeExample('upgrade-adapter/ts/app/upgrade-io/container.component.ts', null, 'container.component.ts')
 
 
 :marked
@@ -615,14 +615,14 @@ figure
   Angular 2 components that support content projection make use of an `<ng-content>`
   tag within them. Here's an example of such a component:
   
-+makeExample('upgrade/ts/adapter/app/js/1-to-2-projection/hero-detail.component.ts', null, 'hero-detail.component.ts')
++makeExample('upgrade-adapter/ts/app/1-to-2-projection/hero-detail.component.ts', null, 'hero-detail.component.ts')
 
 :marked
   When using the component from Angular 1, we can supply contents for it. Just
   like they would be transcluded in Angular 1, they get projected to the location
   of the `<ng-content>` tag in Angular 2:
   
-+makeExample('upgrade/ts/adapter/app/index-1-to-2-projection.html', 'usecomponent')
++makeExample('upgrade-adapter/ts/index-1-to-2-projection.html', 'usecomponent')
 
 .alert.is-helpful
   :marked
@@ -642,7 +642,7 @@ figure
   the `ng-transclude` directive in its template to mark the transclusion
   point:
   
-+makeExample('upgrade/ts/adapter/app/js/2-to-1-transclusion/hero-detail.component.ts', null, 'hero-detail.component.ts')
++makeExample('upgrade-adapter/ts/app/2-to-1-transclusion/hero-detail.component.ts', null, 'hero-detail.component.ts')
 
 .alert.is-helpful
   :marked
@@ -654,7 +654,7 @@ figure
   If we upgrade this component and use it from Angular 2, we can populate
   the component tag with contents that will then get transcluded:
   
-+makeExample('upgrade/ts/adapter/app/js/2-to-1-transclusion/container.component.ts', null, 'container.component.ts')
++makeExample('upgrade-adapter/ts/app/2-to-1-transclusion/container.component.ts', null, 'container.component.ts')
 
 :marked
   ## Making Angular 1 Dependencies Injectable to Angular 2
@@ -668,19 +668,19 @@ figure
   Angular 2. This makes it possible to then inject it somewhere in Angular 2
   code. For example, we might have a service called `HeroesService` in Angular 1:
   
-+makeExample('upgrade/ts/adapter/app/js/1-to-2-providers/heroes.service.ts', null, 'heroes.service.ts')
++makeExample('upgrade-adapter/ts/app/1-to-2-providers/heroes.service.ts', null, 'heroes.service.ts')
 
 :marked
   We can upgrade the service using the `UpgradeAdapter`'s `upgradeNg1Provider` method
   by giving it the name of the service. This adds the service into Angular 2's root injector.
   
-+makeExample('upgrade/ts/adapter/app/js/1-to-2-providers/app.module.ts', 'register', 'app.module.ts')
++makeExample('upgrade-adapter/ts/app/1-to-2-providers/app.module.ts', 'register', 'app.module.ts')
 
 :marked
   We can then inject it in Angular 2 using a string token that matches
   its original name in Angular 1:
   
-+makeExample('upgrade/ts/adapter/app/js/1-to-2-providers/hero-detail.component.ts', null, 'hero-detail.component.ts')
++makeExample('upgrade-adapter/ts/app/1-to-2-providers/hero-detail.component.ts', null, 'hero-detail.component.ts')
 
 .alert.is-helpful
   :marked
@@ -700,7 +700,7 @@ figure
   
   For example, we might have an Angular 2 service called `Heroes`:
   
-+makeExample('upgrade/ts/adapter/app/js/2-to-1-providers/heroes.ts', null, 'heroes.ts')
++makeExample('upgrade-adapter/ts/app/2-to-1-providers/heroes.ts', null, 'heroes.ts')
 
 :marked
   We can again use the `UpgradeAdapter` for this, but first we need to register `Heroes`
@@ -715,12 +715,12 @@ figure
   then plug the factory into an Angular 1 module, at which point we also choose what the
   name of the dependency will be in Angular 1:
   
-+makeExample('upgrade/ts/adapter/app/js/2-to-1-providers/app.module.ts', 'register', 'app.module.ts')
++makeExample('upgrade-adapter/ts/app/2-to-1-providers/app.module.ts', 'register', 'app.module.ts')
 
 :marked
   After this, the service is injectable anywhere in our Angular 1 code:
   
-+makeExample('upgrade/ts/adapter/app/js/2-to-1-providers/hero-detail.component.ts', null, 'hero-detail.component.ts')
++makeExample('upgrade-adapter/ts/app/2-to-1-providers/hero-detail.component.ts', null, 'hero-detail.component.ts')
 
 .l-main-section
 :marked
@@ -854,7 +854,7 @@ code-example(format="").
   Let's also add run scripts for the `tsc` TypeScript compiler and the `typings`
   tool to `package.json`:
 
-+makeJson('upgrade/ts/typescript-conversion/package.1.json', {paths: 'scripts'}, 'package.json', {otl: /(\"tsc.*|\"typings.*)/g})
++makeJson('upgrade-phonecat/ts/typescript-conversion/package.1.json', {paths: 'scripts'}, 'package.json', {otl: /(\"tsc.*|\"typings.*)/g})
 
 
 :marked
@@ -877,7 +877,7 @@ code-example(format="").
   will *replace* the various `<script>` tags we had earlier for loading the
   application components:
   
-+makeExample('upgrade/ts/typescript-conversion/app/index.html', 'scripts', 'app/index.html')
++makeExample('upgrade-phonecat/ts/typescript-conversion/app/index.html', 'scripts', 'app/index.html')
 
 :marked
   This configuration tells SystemJS that we have a module called `app.module` that
@@ -889,7 +889,7 @@ code-example(format="").
   in the [Quickstart](../quickstart.html). It instructs the TypeScript compiler how
   to interpret our source files.
   
-+makeJson('upgrade/ts/typescript-conversion/tsconfig.1.json', null, 'tsconfig.json')
++makeJson('upgrade-phonecat/ts/typescript-conversion/tsconfig.1.json', null, 'tsconfig.json')
 
 :marked
   We are telling the TypeScript compiler to turn our TypeScript files to ES5 code
@@ -924,7 +924,7 @@ code-example(format="").
   
   Beginning from the checkmark filter, here are the converted contents:
   
-+makeExample('upgrade/ts/typescript-conversion/app/js/core/checkmark.filter.ts', null, 'app/js/core/checkmark.filter.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/app/js/core/checkmark.filter.ts', null, 'app/js/core/checkmark.filter.ts')
 
 :marked
   This file now has the filter factory function as the default export. Apart from 
@@ -935,14 +935,14 @@ code-example(format="").
   Moving to the `Phone` factory file, it now has the factory function as the default
   export:
   
-+makeExample('upgrade/ts/typescript-conversion/app/js/core/phone.factory.ts', null, 'app/js/core/phone.factory.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/app/js/core/phone.factory.ts', null, 'app/js/core/phone.factory.ts')
 
 :marked
   The `core` module's main module file will now import both the checkmark filter
   and the Phone factory. This is where we actually register them into the Angular module.
   We then export the module itself as this file's default export:
   
-+makeExample('upgrade/ts/typescript-conversion/app/js/core/core.module.ts', null, 'app/js/core/core.module.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/app/js/core/core.module.ts', null, 'app/js/core/core.module.ts')
 
 :marked
   Notice that with this organization pattern, the files that hold the application
@@ -954,31 +954,31 @@ code-example(format="").
   Now switching to the phone detail module, we'll make similar changes here. In the
   controller file we export the controller function as the default export:
 
-+makeExample('upgrade/ts/typescript-conversion/app/js/phone_detail/phone_detail.controller.ts', null, 'app/js/phone_detail/phone_detail.controller.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/app/js/phone_detail/phone_detail.controller.ts', null, 'app/js/phone_detail/phone_detail.controller.ts')
 
 :marked
   In the main module file we import the controller and register it into the Angular
   module, which itself is then exported:
 
-+makeExample('upgrade/ts/typescript-conversion/app/js/phone_detail/phone_detail.module.ts', null, 'app/js/phone_detail/phone_detail.module.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/app/js/phone_detail/phone_detail.module.ts', null, 'app/js/phone_detail/phone_detail.module.ts')
 
 :marked
   Then we'll repeat the same steps once more for the phone list module.
   The controller file exports the controller function:
   
-+makeExample('upgrade/ts/typescript-conversion/app/js/phone_list/phone_list.controller.ts', null, 'app/js/phone_list/phone_list.controller.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/app/js/phone_list/phone_list.controller.ts', null, 'app/js/phone_list/phone_list.controller.ts')
 
 :marked
   And the main module file imports the controller and registers it:
   
-+makeExample('upgrade/ts/typescript-conversion/app/js/phone_list/phone_list.module.ts', null, 'app/js/phone_list/phone_list.module.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/app/js/phone_list/phone_list.module.ts', null, 'app/js/phone_list/phone_list.module.ts')
 
 :marked
   Finally, we can now pull everything together in `app.module.ts`. It here we'll
   import each of the three submodule files and register them as dependencies
   of the main application module:
   
-+makeExample('upgrade/ts/typescript-conversion/app/js/app.module.ts', 'pre-bootstrap', 'app/js/app.module.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/app/js/app.module.ts', 'pre-bootstrap', 'app/js/app.module.ts')
 
 :marked
   Note that we don't have to repeat the submodule name strings here. Since the
@@ -996,7 +996,7 @@ code-example(format="").
   to Angular as well. So, remove the `ng-app` attribute from `index.html`, and add
   this at the end of `app.module.ts`:
 
-+makeExample('upgrade/ts/typescript-conversion/app/js/app.module.ts', 'bootstrap', 'app/js/app.module.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/app/js/app.module.ts', 'bootstrap', 'app/js/app.module.ts')
 
 :marked
   We now have a fully functional version of the application, all converted
@@ -1026,7 +1026,7 @@ code-example(format="").
   the application files. For this we'll use a shim file that will tweak the way
   files get loaded:
   
-+makeExample('upgrade/ts/typescript-conversion/test/karma_test_shim.js', null, 'test/karma_test_shim.js')
++makeExample('upgrade-phonecat/ts/typescript-conversion/test/karma_test_shim.js', null, 'test/karma_test_shim.js')
 
 .alert.is-important The shim is likely to be replaced by improved tooling, but is currently needed.
 
@@ -1036,7 +1036,7 @@ code-example(format="").
   We will *watch* them so that the test suite is triggered when changes occur, but we
   won't have Karma *include* them because that is now done by SystemJS and the shim.
   
-+makeExample('upgrade/ts/typescript-conversion/test/karma.conf.1.js', 'files', 'test/karma.conf.js')
++makeExample('upgrade-phonecat/ts/typescript-conversion/test/karma.conf.1.js', 'files', 'test/karma.conf.js')
 
 :marked
   Now we have the infrastructure in place and can convert the test files themselves.
@@ -1046,24 +1046,24 @@ code-example(format="").
   In the checkmark filter spec, we'll import the core module file, so that it is
   available when we load the corresponding Angular module:
   
-+makeExample('upgrade/ts/typescript-conversion/test/unit/checkmark.filter.spec.ts', 'top', 'test/unit/checkmark.filter.spec.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/test/unit/checkmark.filter.spec.ts', 'top', 'test/unit/checkmark.filter.spec.ts')
 
 :marked
   We'll do the exact same thing for the phone factory spec:
 
-+makeExample('upgrade/ts/typescript-conversion/test/unit/phone.factory.spec.ts', 'top', 'test/unit/phone.factory.spec.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/test/unit/phone.factory.spec.ts', 'top', 'test/unit/phone.factory.spec.ts')
 
 :marked
   In the phone detail controller spec, on the other hand, we should import
   the phone detail module:
 
-+makeExample('upgrade/ts/typescript-conversion/test/unit/phone_detail.controller.spec.ts', 'top', 'test/unit/phone_detail.controller.spec.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/test/unit/phone_detail.controller.spec.ts', 'top', 'test/unit/phone_detail.controller.spec.ts')
 
 :marked
   Finally, the phone list controller spec should import the phone list
   module:
   
-+makeExample('upgrade/ts/typescript-conversion/test/unit/phone_list.controller.spec.ts', 'top', 'test/unit/phone_list.controller.spec.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/test/unit/phone_list.controller.spec.ts', 'top', 'test/unit/phone_list.controller.spec.ts')
 
 :marked
   There's one more issue we have in our controller tests, which is that TypeScript
@@ -1077,7 +1077,7 @@ code-example(format="").
   satisfy the compiler and let us use our custom matcher while retaining the nice
   type safety features of TypeScript:
   
-+makeExample('upgrade/ts/typescript-conversion/test/jasmine_matchers.d.ts', null, 'test/jasmine_matchers.d.ts')
++makeExample('upgrade-phonecat/ts/typescript-conversion/test/jasmine_matchers.d.ts', null, 'test/jasmine_matchers.d.ts')
 
 :marked
   And now we have a fully functional test suite for our TypeScript-enabled
@@ -1103,7 +1103,7 @@ code-example(format="").
   possible for the TypeScript compiler to notify us when we're trying to
   use it with incompatible types.
   
-+makeExample('upgrade/ts/classes/app/js/core/checkmark.filter.ts', null, 'app/js/core/checkmark.filter.ts', {otl: /(:\w+)/g})
++makeExample('upgrade-phonecat/ts/classes/app/js/core/checkmark.filter.ts', null, 'app/js/core/checkmark.filter.ts', {otl: /(:\w+)/g})
   
 .l-sub-section
   :marked
@@ -1133,7 +1133,7 @@ code-example(format="").
   
   Here's what our new class for the phone list controller looks like.
   
-+makeExample('upgrade/ts/classes/app/js/phone_list/phone_list.controller.ts', null, 'app/js/phone_list/phone_list.controller.ts')
++makeExample('upgrade-phonecat/ts/classes/app/js/phone_list/phone_list.controller.ts', null, 'app/js/phone_list/phone_list.controller.ts')
 
 :marked
   What was previously done in the controller function is now done in the class
@@ -1151,7 +1151,7 @@ code-example(format="").
   passed to the controller. This interface is not exported and is just used internally
   inside this module:
   
-+makeExample('upgrade/ts/classes/app/js/phone_detail/phone_detail.controller.ts', null, 'app/js/phone_detail/phone_detail.controller.ts')
++makeExample('upgrade-phonecat/ts/classes/app/js/phone_detail/phone_detail.controller.ts', null, 'app/js/phone_detail/phone_detail.controller.ts')
   
 :marked
   This makes our controller code look a lot more like Angular 2 already. We're
@@ -1197,7 +1197,7 @@ code-example(format="").
   tags to `index.html`. They should go before the `<script>` tag that has the
   `System.config()` invocation:
   
-+makeExample('upgrade/ts/ng2_initial/app/index.html', 'ng2')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/index.html', 'ng2')
 
 :marked
   The first two scripts are for adding some ES6 features to older browsers
@@ -1207,7 +1207,7 @@ code-example(format="").
   While we're at it, let's also load the same files into unit tests by
   updating the Karma config:
   
-+makeExample('upgrade/ts/ng2_initial/test/karma.conf.1.js', 'ng2', 'test/karma.conf.js', {otl: /(.*\.\.\/node\_modules\/angular2.*)/})
++makeExample('upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js', 'ng2', 'test/karma.conf.js', {otl: /(.*\.\.\/node\_modules\/angular2.*)/})
 
 :marked
   ## Bootstrapping A Hybrid 1+2 PhoneCat
@@ -1224,7 +1224,7 @@ code-example(format="").
   to `node`, so that it knows to look for these definitions from the `angular2` NPM
   package.
   
-+makeJson('upgrade/ts/ng2_initial/tsconfig.1.json', null, 'tsconfig.json', {otl: /(\"moduleResolution.*)/})
++makeJson('upgrade-phonecat/ts/ng2_initial/tsconfig.1.json', null, 'tsconfig.json', {otl: /(\"moduleResolution.*)/})
 
 :marked
   To boostrap a hybrid application, we first need to initialize an `UpgradeAdapter`,
@@ -1232,12 +1232,12 @@ code-example(format="").
   versions of the framework together. Let's import the `UpgradeAdapter` class into
   `app.module.ts`:
   
-+makeExample('upgrade/ts/ng2_initial/app/js/app.module.ts', 'adapter-import', 'app/js/app.module.ts')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/app.module.ts', 'adapter-import', 'app/js/app.module.ts')
 
 :marked
   We can then make an adapter by instantiating the class:
   
-+makeExample('upgrade/ts/ng2_initial/app/js/core/upgrade_adapter.ts', 'adapter-init')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/core/upgrade_adapter.ts', 'adapter-init')
   
 :marked
   Now we can use that adapter to bootstrap our application as a hybrid.
@@ -1246,7 +1246,7 @@ code-example(format="").
   They are still the element that will become the root of the application,
   and the names of the root Angular 1.x modules that we want to include:
   
-+makeExample('upgrade/ts/ng2_initial/app/js/app.module.ts', 'bootstrap')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/app.module.ts', 'bootstrap')
   
 :marked
   We are now running both Angular 1 and 2 at the same time. That's pretty
@@ -1273,20 +1273,20 @@ code-example(format="").
   include it in `index.html` separately. As the service uses RxJS Observables,
   we also need to bring in the RxJS bundle:
   
-+makeExample('upgrade/ts/ng2_initial/app/index.html', 'ng2-http')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/index.html', 'ng2-http')
 
 :marked
   We'll also do the same in `karma.conf.js` so that `Http` will be available in
   unit tests:
   
-+makeExample('upgrade/ts/ng2_initial/test/karma.conf.1.js', 'ng2-http')
++makeExample('upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js', 'ng2-http')
 
 :marked
   Before the `Http` service is available for injection, we still need to register
   it into our application's dependency injector. We should import the `HTTP_PROVIDERS`
   constant in `app.module.ts`:
   
-+makeExample('upgrade/ts/ng2_initial/app/js/app.module.ts', 'http-import')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/app.module.ts', 'http-import')
 
 :marked
   In a regular Angular 2 application we would now pass `HTTP_PROVIDERS` into
@@ -1298,14 +1298,14 @@ code-example(format="").
   What we must do instead is register `HTTP_PROVIDERS` into the `UpgradeAdapter`
   separately. It has a method called `addProvider` for that purpose:
   
-+makeExample('upgrade/ts/ng2_initial/app/js/app.module.ts', 'add-http-providers')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/app.module.ts', 'add-http-providers')
 
 :marked
   Now we're ready to upgrade the Phones factory itself. We'll put the Angular 2
   implementation in a new file called `phones.service.ts` in the core module. It will be a TypeScript
   class decorated as `@Injectable`:
   
-+makeExample('upgrade/ts/ng2_initial/app/js/core/phones.service.ts', 'class', 'app/js/core/phones.service.ts')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/core/phones.service.ts', 'class', 'app/js/core/phones.service.ts')
 
 :marked
   The `@Injectable` decorator will attach some dependency injection metadata
@@ -1319,18 +1319,18 @@ code-example(format="").
   used in the two instance methods, one of which loads the list of all phones,
   and the other the details of a particular phone:
 
-+makeExample('upgrade/ts/ng2_initial/app/js/core/phones.service.ts', 'fullclass')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/core/phones.service.ts', 'fullclass')
 
 :marked
   The methods now return Observables of type `Phone` and `Phone[]`. This is
   a type we don't have yet, so let's add a simple interface for it:
   
-+makeExample('upgrade/ts/ng2_initial/app/js/core/phones.service.ts', 'phone-interface', 'app/js/core/phones.service.ts')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/core/phones.service.ts', 'phone-interface', 'app/js/core/phones.service.ts')
 
 :marked
   Here's the full, final code for the service:
   
-+makeExample('upgrade/ts/ng2_initial/app/js/core/phones.service.ts', 'full', 'app/js/core/phones.service.ts')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/core/phones.service.ts', 'full', 'app/js/core/phones.service.ts')
 
 :marked
   Notice that we're importing the `map` operator of the RxJS `Observable` separately.
@@ -1354,12 +1354,12 @@ code-example(format="").
   so that we're using the same object everywhere. Let's put this new file
   under `core`:
   
-+makeExample('upgrade/ts/ng2_initial/app/js/core/upgrade_adapter.ts', 'full', 'app/js/core/upgrade_adapter.ts')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/core/upgrade_adapter.ts', 'full', 'app/js/core/upgrade_adapter.ts')
 
 :marked
   In `app.module.ts` we should now just import this adapter instead of making a separate one:
   
-+makeExample('upgrade/ts/ng2_initial/app/js/app.module.ts', 'adapter-state-import')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/app.module.ts', 'adapter-state-import')
 
 :marked
   Also remove the line from `app.module.ts` that is instantiating `UpgradeAdapter`. It's no
@@ -1369,7 +1369,7 @@ code-example(format="").
   While doing that, we can remove the module's dependency to `ngResource`, which
   we're no longer using.
   
-+makeExample('upgrade/ts/ng2_initial/app/js/core/core.module.ts', null, 'app/js/core/core.module.ts')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/core/core.module.ts', null, 'app/js/core/core.module.ts')
 
 :marked
   Note that we actually needed to do two registrations here:
@@ -1384,9 +1384,9 @@ code-example(format="").
   but it's really an instance of the `Phones` class and we can annotate its type
   accordingly:
   
-+makeExample('upgrade/ts/ng2_initial/app/js/phone_detail/phone_detail.controller.ts', null, 'app/js/phone_detail/phone_detail.controller.ts')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/phone_detail/phone_detail.controller.ts', null, 'app/js/phone_detail/phone_detail.controller.ts')
 
-+makeExample('upgrade/ts/ng2_initial/app/js/phone_list/phone_list.controller.ts', null, 'app/js/phone_list/phone_list.controller.ts')
++makeExample('upgrade-phonecat/ts/ng2_initial/app/js/phone_list/phone_list.controller.ts', null, 'app/js/phone_list/phone_list.controller.ts')
 
 :marked
   What we have here are two Angular 1 controllers using an Angular 2 service!
@@ -1406,13 +1406,13 @@ code-example(format="").
   the Angular 2 test support library in our unit test suite. We first need to 
   add the angular `testing` bundle to list of files that Karma is loading:
   
-+makeExample('upgrade/ts/ng2_initial/test/karma.conf.1.js', 'ng2-testing')
++makeExample('upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js', 'ng2-testing')
 
 :marked
   Then we'll update the Karma test shim. It'll make some of Angular 2 core
   providers available before starting to load any of the spec files:
   
-+makeExample('upgrade/ts/ng2_initial/test/karma_test_shim.js', null, 'test/karma_test_shim.js')
++makeExample('upgrade-phonecat/ts/ng2_initial/test/karma_test_shim.js', null, 'test/karma_test_shim.js')
 
 .alert.is-important The shim is likely to be replaced by improved tooling, but is needed right now.
 
@@ -1423,7 +1423,7 @@ code-example(format="").
   test in Angular 2. Rename `phones.factory.spec.ts` to `phones.service.spec.ts` and
   set the contents as follows:
   
-+makeExample('upgrade/ts/ng2_initial/test/unit/phones.service.spec.ts', null, 'test/unit/phones.service.spec.ts')
++makeExample('upgrade-phonecat/ts/ng2_initial/test/unit/phones.service.spec.ts', null, 'test/unit/phones.service.spec.ts')
 
 :marked
   Here we first load the `Phones` provider and then test that an instance of
@@ -1444,7 +1444,7 @@ code-example(format="").
   using to load what it needs. As the mocked value, we're returning an Observable
   that will emit a single value - the mock phone data:
   
-+makeExample('upgrade/ts/ng2_initial/test/unit/phone_detail.controller.spec.ts', null, 'test/unit/phone_detail.controller.spec.ts')
++makeExample('upgrade-phonecat/ts/ng2_initial/test/unit/phone_detail.controller.spec.ts', null, 'test/unit/phone_detail.controller.spec.ts')
 
 .alert.is-important
   :marked
@@ -1457,7 +1457,7 @@ code-example(format="").
   method of the `Phones` service, and check that the controller makes the resulting
   value available:
   
-+makeExample('upgrade/ts/ng2_initial/test/unit/phone_list.controller.spec.ts', null, 'test/unit/phone_list.controller.spec.ts')
++makeExample('upgrade-phonecat/ts/ng2_initial/test/unit/phone_list.controller.spec.ts', null, 'test/unit/phone_list.controller.spec.ts')
 
 :marked
   ## Upgrading Controllers to Components
@@ -1473,7 +1473,7 @@ code-example(format="").
   Rename `phone_list.controller.ts` to `phone_list.component.ts`. Then rename the controller class
   inside to just `PhoneList` and decorate it as a `@Component`:
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.component.ts', 'top', 'app/js/phone_list/phone_list.component.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.component.ts', 'top', 'app/js/phone_list/phone_list.component.ts')
 
 :marked
   The `selector` attribute is a CSS selector that defines where on the page the component
@@ -1492,7 +1492,7 @@ code-example(format="").
   We now also need to convert the template of this component into Angular 2 syntax.
   In the search controls we need to use Angular 2 syntax for the two `ngModel`s
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html', 'controls', 'app/js/phone_list/phone_list.html')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html', 'controls', 'app/js/phone_list/phone_list.html')
 
 :marked
   In the list we need to replace the `ng-repeat` with an `*ngFor` and its
@@ -1503,7 +1503,7 @@ code-example(format="").
   property binding. Note that we're also adding a `name` CSS class for the phone name.
   This is something we'll need for our Protractor tests:
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html', 'list', 'app/js/phone_list/phone_list.html')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_pipes.html', 'list', 'app/js/phone_list/phone_list.html')
 
 :marked
   In the module file we're going to plug this component into our application. Instead
@@ -1511,7 +1511,7 @@ code-example(format="").
   The directive is a downgraded version of our component, and the `UpgradeAdapter`
   handles the bridging between the two:
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_list/phone_list.module.ts', null, 'app/js/phone_list/phone_list.module.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.module.ts', null, 'app/js/phone_list/phone_list.module.ts')
 
 :marked
   The `<angular.IDirectiveFactory>` type annotation here is to let the TypeScript compiler
@@ -1523,7 +1523,7 @@ code-example(format="").
   We can do that by using a simple template that uses the directive
   we just registered:
 
-+makeExample('upgrade/ts/ng2_components/app/js/app.module.ts', 'list-route')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/app.module.ts', 'list-route')
 
 :marked
   When the application runs, the Angular 1.x directive compiler will match
@@ -1550,13 +1550,13 @@ code-example(format="").
   this pipe is specialized to filter `Phone` objects and we can use
   type annotations to make this explicit:
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_list/phone_filter.pipe.ts', null, 'app/js/phone_list/phone_filter.pipe.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_filter.pipe.ts', null, 'app/js/phone_list/phone_filter.pipe.ts')
 
 :marked
   Since we're adding new code, it's a good idea to add some unit tests for
   it too. Here are a few tests for `PhoneFilterPipe`:
   
-+makeExample('upgrade/ts/ng2_components/test/unit/phone_filter.pipe.spec.ts', null, 'test/unit/phone_filter.pipe.spec.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/test/unit/phone_filter.pipe.spec.ts', null, 'test/unit/phone_filter.pipe.spec.ts')
 
 :marked
   For sorting, we'll use a more generic pipe, just called `OrderBy`. It
@@ -1564,24 +1564,24 @@ code-example(format="").
   an array of the same type of thing it was given. In the implementation we
   copy the input array, sort the copy, and return it.
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_list/order_by.pipe.ts', null, 'app/js/phone_list/order_by.pipe.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_list/order_by.pipe.ts', null, 'app/js/phone_list/order_by.pipe.ts')
 
 :marked
   Here's a unit test for `OrderByPipe` as well:
   
-+makeExample('upgrade/ts/ng2_components/test/unit/order_by.pipe.spec.ts', null, 'test/unit/order_by.pipe.spec.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/test/unit/order_by.pipe.spec.ts', null, 'test/unit/order_by.pipe.spec.ts')
 
 :marked
   We can now integrate these new pipes with our component. Before the pipes
   are available there, we need to declare them in the `@Component` decorator.
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_list/phone_list.component.ts', 'top', 'app/js/phone_list/phone_list.component.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.component.ts', 'top', 'app/js/phone_list/phone_list.component.ts')
 
 :marked
   In the template we need to use the `phoneFilter` pipe instead of `filter`.
   No changes are needed for the `orderBy`
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_list/phone_list_without_async.html', 'list', 'app/js/phone_list/phone_list.html')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list_without_async.html', 'list', 'app/js/phone_list/phone_list.html')
 
 :marked
   Now that the phone list is an Angular 2 component, there's one more neat trick
@@ -1591,19 +1591,19 @@ code-example(format="").
   With Angular 2, we can instead just put the Observable itself on the
   component, and can skip the subscription callback:
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_list/phone_list.component.ts', 'full', 'app/js/phone_list/phone_list.component.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.component.ts', 'full', 'app/js/phone_list/phone_list.component.ts')
 
 :marked
   This is made possible by the `async` pipe, which we can apply in the template.
   It knows how to turn an Observable to the (latest) value it has emitted:
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_list/phone_list.html', 'list', 'app/js/phone_list/phone_list.html')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_list/phone_list.html', 'list', 'app/js/phone_list/phone_list.html')
 
 :marked
   That takes care of the phone list. Here's the updated unit test file for
   that component to complete the migration:
   
-+makeExample('upgrade/ts/ng2_components/test/unit/phone_list.component.spec.ts', null, 'test/unit/phone_list.component.spec.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/test/unit/phone_list.component.spec.ts', null, 'test/unit/phone_list.component.spec.ts')
 
 :marked
   Before this test will run, we'll need to augment our Karma configuration
@@ -1611,14 +1611,14 @@ code-example(format="").
   before when we were testing the controller in isolation, but our new test
   exercises the component as a whole, which includes the template.
   
-+makeExample('upgrade/ts/ng2_components/test/karma.conf.1.js', 'html', 'test/karma.conf.js')
++makeExample('upgrade-phonecat/ts/ng2_components/test/karma.conf.1.js', 'html', 'test/karma.conf.js')
 
 :marked
   Now we can start looking at our other controller, which is the one for
   the phone details. Rename `phone_detail.controller.ts` to `phone_detail.component.ts`,
   and set the contents as follows:
     
-+makeExample('upgrade/ts/ng2_components/app/js/phone_detail/phone_detail_without_pipes.component.ts', null, 'app/js/phone_detail/phone_detail.component.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail_without_pipes.component.ts', null, 'app/js/phone_detail/phone_detail.component.ts')
 
 :marked
   This is pretty similar to what we did with the phone list. The one new change
@@ -1632,7 +1632,7 @@ code-example(format="").
   We explicitly need to tell the `UpgradeAdapter` to upgrade `$routeParams` so that
   it is available for injection in Angular 2. We can do it in `app.module.ts`:
   
-+makeExample('upgrade/ts/ng2_components/app/js/app.module.ts', 'upgrade-route-params', 'app/js/app.module.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/app.module.ts', 'upgrade-route-params', 'app/js/app.module.ts')
 
   
     
@@ -1640,7 +1640,7 @@ code-example(format="").
   We now also need to convert the template of this component into Angular 2 syntax.
   Here is the new template in its entirety:
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_detail/phone_detail.html', null, 'app/js/phone_detail/phone_detail.html')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.html', null, 'app/js/phone_detail/phone_detail.html')
 
 :marked
   There are several notable changes here:
@@ -1666,13 +1666,13 @@ code-example(format="").
   In the module file we'll now register a `pcPhoneDetail` directive instead of a
   controller. The directive is a downgraded version of the `PhoneDetail` component.
     
-+makeExample('upgrade/ts/ng2_components/app/js/phone_detail/phone_detail.module.ts', null, 'app/js/phone_detail/phone_detail.module.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.module.ts', null, 'app/js/phone_detail/phone_detail.module.ts')
 
 :marked
   In the router configuration in `app.module.ts`, we'll switch the details route to
   instantiate a component as well:
 
-+makeExample('upgrade/ts/ng2_components/app/js/app.module.ts', 'detail-route')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/app.module.ts', 'detail-route')
 
 :marked
   There's one additional step we need to take, which is to upgrade the
@@ -1685,31 +1685,31 @@ code-example(format="").
   It just comes in a different kind of package. While changing it, also
   rename the file to `checkmark.pipe.ts`:
   
-+makeExample('upgrade/ts/ng2_components/app/js/core/checkmark.pipe.ts', null, 'app/js/core/checkmark.pipe.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/core/checkmark.pipe.ts', null, 'app/js/core/checkmark.pipe.ts')
 
 :marked
   As we apply this change, we should also remove the registration of the filter
   from the core module file. The module's content becomes:
 
-+makeExample('upgrade/ts/ng2_components/app/js/core/core.module.ts', null, 'app/js/core/core.module.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/core/core.module.ts', null, 'app/js/core/core.module.ts')
 
 :marked
   The unit test file for the filter also now becomes the unit test filter
   for the pipe. While we're still testing the same thing, we need to change
   how we set things up:
   
-+makeExample('upgrade/ts/ng2_components/test/unit/checkmark.pipe.spec.ts', null, 'test/unit/checkmark.pipe.spec.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/test/unit/checkmark.pipe.spec.ts', null, 'test/unit/checkmark.pipe.spec.ts')
 
 :marked
   In the component we should now import and declare our newly created pipe:
   
-+makeExample('upgrade/ts/ng2_components/app/js/phone_detail/phone_detail.component.ts', 'top', 'app/js/phone_detail/phone_detail.component.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/app/js/phone_detail/phone_detail.component.ts', 'top', 'app/js/phone_detail/phone_detail.component.ts')
 
 :marked
   With the phone detail component now migrated as well, we can go and migrate
   its unit tests too.
   
-+makeExample('upgrade/ts/ng2_components/test/unit/phone_detail.component.spec.ts', null, 'test/unit/phone_detail.component.spec.ts')
++makeExample('upgrade-phonecat/ts/ng2_components/test/unit/phone_detail.component.spec.ts', null, 'test/unit/phone_detail.component.spec.ts')
 
 :marked
   As we discussed earlier, Protractor tests should largely remain functional
@@ -1799,7 +1799,7 @@ table
   but it isn't included by default. Just like we did with `Http`, we need to
   include it in `index.html` before the `System.config()` script first:
   
-+makeExample('upgrade/ts/ng2_final/app/index.html', 'ng2-router', 'app/index.html')
++makeExample('upgrade-phonecat/ts/ng2_final/app/index.html', 'ng2-router', 'app/index.html')
 
 :marked
   Angular 2 applications all come with a *root component*, which, among other
@@ -1808,7 +1808,7 @@ table
   Let's change this now and add an `AppComponent` class into a new file
   `app.component.ts`:
 
-+makeExample('upgrade/ts/ng2_final/app/js/app.component.ts', null, 'app/js/app.component.ts')
++makeExample('upgrade-phonecat/ts/ng2_final/app/js/app.component.ts', null, 'app/js/app.component.ts')
 
 :marked
   This is a component that plugs in to an `<pc-app>` element on the page,
@@ -1821,7 +1821,7 @@ table
   We should put this `<pc-app>` element in the HTML so that the root component
   has something to attach to. It replaces the old Angular 1 `ng-view` directive:
   
-+makeExample('upgrade/ts/ng2_final/app/index.html', 'body', 'app/index.html')
++makeExample('upgrade-phonecat/ts/ng2_final/app/index.html', 'body', 'app/index.html')
 
 :marked
   In the `PhoneDetail` component we now need to change how the phone id parameter
@@ -1830,20 +1830,20 @@ table
   object provided by the Angular 2 router. We use it to obtain the `phoneId` from
   the params:
   
-+makeExample('upgrade/ts/ng2_final/app/js/phone_detail/phone_detail.component.ts', null, 'app/js/phone_detail/phone_detail.component.ts')
++makeExample('upgrade-phonecat/ts/ng2_final/app/js/phone_detail/phone_detail.component.ts', null, 'app/js/phone_detail/phone_detail.component.ts')
 
 :marked
   We should also make the corresponding change in the unit test. We provide
   an instance of the `RouteParams` class instead of the `$routeParams` object:
   
-+makeExample('upgrade/ts/ng2_final/test/unit/phone_detail.component.spec.ts', 'routeparams', 'test/unit/phone_detail.component.spec.ts')
++makeExample('upgrade-phonecat/ts/ng2_final/test/unit/phone_detail.component.spec.ts', 'routeparams', 'test/unit/phone_detail.component.spec.ts')
 
 :marked
   With that, we're ready to switch the bootstrap method of the application from that
   of the `UpgradeAdapter` to the main Angular 2 `bootstrap`. Let's import it together
   with the router and the new app component in `app.module.ts`
   
-+makeExample('upgrade/ts/ng2_final/app/js/main.ts', 'importbootstrap')
++makeExample('upgrade-phonecat/ts/ng2_final/app/js/main.ts', 'importbootstrap')
 
 :marked
   We'll now use the regular Angular 2 `bootstrap` function to bootstrap the app 
@@ -1854,7 +1854,7 @@ table
   with  `upgradeAdapter.addProvider` until now, as well as the providers and
   directives of the router:
   
-+makeExample('upgrade/ts/ng2_final/app/js/main.ts', 'bootstrap')
++makeExample('upgrade-phonecat/ts/ng2_final/app/js/main.ts', 'bootstrap')
 
 :marked
   We are now running a pure Angular 2 application!
@@ -1865,18 +1865,18 @@ table
   its `routerLink` directive. We just need to refer to the route names we
   used in the `@RouteConfig`:
   
-+makeExample('upgrade/ts/ng2_final/app/js/phone_list/phone_list.html', 'list', 'app/js/phone_list/phone_list.html')
++makeExample('upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.html', 'list', 'app/js/phone_list/phone_list.html')
 
 :marked
   For this to work the directive just needs to be declared in the component:
   
-+makeExample('upgrade/ts/ng2_final/app/js/phone_list/phone_list.component.ts', 'top')
++makeExample('upgrade-phonecat/ts/ng2_final/app/js/phone_list/phone_list.component.ts', 'top')
 
 :marked
   Also, the unit tests for `PhoneList` now need to set up some router providers
   so that the `RouterLink` directive can be injected in the tests:
 
-+makeExample('upgrade/ts/ng2_final/test/unit/phone_list.component.spec.ts', null)
++makeExample('upgrade-phonecat/ts/ng2_final/test/unit/phone_list.component.spec.ts', null)
 
 :marked
   To bring our Protractor test suite up to speed with the latest changes,
@@ -1885,7 +1885,7 @@ table
   should not be looking for one but instead find *Angular 2 apps* from
   the page. Add the following configuration option to `protractor-conf.js`:
   
-+makeExample('upgrade/ts/ng2_final/test/protractor-conf.js', 'ng2')
++makeExample('upgrade-phonecat/ts/ng2_final/test/protractor-conf.js', 'ng2')
 
 :marked
   Also, there are a couple of Protractor API calls in our test code that
@@ -1894,12 +1894,12 @@ table
   that use WebDriver's generic URL APIs instead. The first of these is
   the redirection spec:
   
-+makeExample('upgrade/ts/ng2_final/test/e2e/scenarios.js', 'redirect')
++makeExample('upgrade-phonecat/ts/ng2_final/test/e2e/scenarios.js', 'redirect')
 
 :marked
   And the second is the phone links spec:
   
-+makeExample('upgrade/ts/ng2_final/test/e2e/scenarios.js', 'links')
++makeExample('upgrade-phonecat/ts/ng2_final/test/e2e/scenarios.js', 'links')
 
 :marked
   Now our E2E test suite is passing too, and we're ready to remove
@@ -1921,7 +1921,7 @@ table
   
   When you're done, this is what `main.ts` should look like:
   
-+makeExample('upgrade/ts/ng2_final/app/js/main.ts', null, 'app/js/main.ts')
++makeExample('upgrade-phonecat/ts/ng2_final/app/js/main.ts', null, 'app/js/main.ts')
 
 :marked
   You may also completely remove the following files. They are Angular 1
@@ -1949,12 +1949,12 @@ code-example(format="").
   with SystemJS, import `js/main`. When you're done, this is what `index.html`
   should look like:
   
-+makeExample('upgrade/ts/ng2_final/app/index.html', null, 'app/index.html')
++makeExample('upgrade-phonecat/ts/ng2_final/app/index.html', null, 'app/index.html')
 
 :marked
   And this is what `karma.conf.js` should look like:
   
-+makeExample('upgrade/ts/ng2_final/test/karma.conf.1.js', null, 'test/karma.conf.js')
++makeExample('upgrade-phonecat/ts/ng2_final/test/karma.conf.1.js', null, 'test/karma.conf.js')
 
 :marked
   That is the last we'll see of Angular 1! It has served us well but now