diff --git a/APM - Final Updated/.vscode/settings.json b/APM - Final Updated/.vscode/settings.json
index 5aa28878928ad0cbe324014e27f01b100ad37b81..97c72b2b407f2480692ada651c571ec637349f34 100644
--- a/APM - Final Updated/.vscode/settings.json	
+++ b/APM - Final Updated/.vscode/settings.json	
@@ -3,7 +3,7 @@
     "files.exclude": {
         "**/.git": true,
         "**/.DS_Store": true,
-        "**/*.js": true,
+        "**/app/**/*.js": true,
         "**/*.map": true
     },
     // Controls auto save of dirty files. Accepted values:  "off", "afterDelay", "onFocusChange". If set to "afterDelay" you can configure the delay in "files.autoSaveDelay".
diff --git a/APM - Final Updated/app/app.component.ts b/APM - Final Updated/app/app.component.ts
index 20c9547987f34d46f136fd19be765aaafd34dd83..06baed1d3ae65706b60d494539fd30d940b13e6d 100644
--- a/APM - Final Updated/app/app.component.ts	
+++ b/APM - Final Updated/app/app.component.ts	
@@ -1,7 +1,7 @@
-import { Component } from 'angular2/core';
-import { HTTP_PROVIDERS } from 'angular2/http';
+import { Component } from '@angular/core';
+import { HTTP_PROVIDERS } from '@angular/http';
 import 'rxjs/Rx';   // Load all features
-import { ROUTER_PROVIDERS, RouteConfig, ROUTER_DIRECTIVES } from 'angular2/router';
+import { ROUTER_PROVIDERS, RouteConfig, ROUTER_DIRECTIVES } from '@angular/router-deprecated';
 
 import { ProductListComponent } from './products/product-list.component';
 import { ProductService } from './products/product.service';
diff --git a/APM - Final Updated/app/home/welcome.component.ts b/APM - Final Updated/app/home/welcome.component.ts
index c6242d1d97e3136ff891e7956ed579390acf8fec..7fd8c957ade568ed92214c96a7c6aeb3735db9ad 100644
--- a/APM - Final Updated/app/home/welcome.component.ts	
+++ b/APM - Final Updated/app/home/welcome.component.ts	
@@ -1,4 +1,4 @@
-import { Component } from 'angular2/core';
+import { Component } from '@angular/core';
 
 @Component({
     templateUrl: 'app/home/welcome.component.html'
diff --git a/APM - Final Updated/app/main.ts b/APM - Final Updated/app/main.ts
index d14d4c4fc1fab1d27795038f5628c1e3ef801f8e..cf71e662110cdc65b42b4e02222e715939604e26 100644
--- a/APM - Final Updated/app/main.ts	
+++ b/APM - Final Updated/app/main.ts	
@@ -1,4 +1,4 @@
-import { bootstrap }    from 'angular2/platform/browser';
+import { bootstrap }    from '@angular/platform-browser-dynamic';
 
 // Our main component
 import { AppComponent } from './app.component';
diff --git a/APM - Final Updated/app/products/product-detail.component.ts b/APM - Final Updated/app/products/product-detail.component.ts
index 0af7b90cddd1776df908aa6ea1a5c2717825812e..0ee9c7548d346dd34006834bc9259da5716cb31a 100644
--- a/APM - Final Updated/app/products/product-detail.component.ts	
+++ b/APM - Final Updated/app/products/product-detail.component.ts	
@@ -1,5 +1,5 @@
-import { Component, OnInit } from 'angular2/core';
-import { RouteParams, Router } from 'angular2/router';
+import { Component, OnInit } from '@angular/core';
+import { RouteParams, Router } from '@angular/router-deprecated';
 
 import { IProduct } from './product';
 import { ProductService } from './product.service';
diff --git a/APM - Final Updated/app/products/product-filter.pipe.ts b/APM - Final Updated/app/products/product-filter.pipe.ts
index cd29de3c067983a777923257a130ac45c23c626e..b67fa573f30a96cbf0c3b5096775c9a164262ec3 100644
--- a/APM - Final Updated/app/products/product-filter.pipe.ts	
+++ b/APM - Final Updated/app/products/product-filter.pipe.ts	
@@ -1,4 +1,4 @@
-import {  PipeTransform, Pipe } from 'angular2/core';
+import {  PipeTransform, Pipe } from '@angular/core';
 import { IProduct } from './product';
 
 @Pipe({
diff --git a/APM - Final Updated/app/products/product-list.component.ts b/APM - Final Updated/app/products/product-list.component.ts
index 9648505a034d5d72e2df2e4ba1d52aec094838df..7aae90c166322de6b1ad0ae9b1fbb20c84c0e820 100644
--- a/APM - Final Updated/app/products/product-list.component.ts	
+++ b/APM - Final Updated/app/products/product-list.component.ts	
@@ -1,5 +1,5 @@
-import { Component, OnInit }  from 'angular2/core';
-import { ROUTER_DIRECTIVES } from 'angular2/router';
+import { Component, OnInit }  from '@angular/core';
+import { ROUTER_DIRECTIVES } from '@angular/router-deprecated';
 
 import { IProduct } from './product';
 import { ProductFilterPipe } from './product-filter.pipe';
diff --git a/APM - Final Updated/app/products/product.service.ts b/APM - Final Updated/app/products/product.service.ts
index 4ecc837e29533b8f4fa7925b6cc680891ad8bff1..2c4852c824d43c3a0aa91db195916172d8d97aac 100644
--- a/APM - Final Updated/app/products/product.service.ts	
+++ b/APM - Final Updated/app/products/product.service.ts	
@@ -1,5 +1,5 @@
-import { Injectable } from 'angular2/core';
-import { Http, Response } from 'angular2/http';
+import { Injectable } from '@angular/core';
+import { Http, Response } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
 
 import { IProduct } from './product';
diff --git a/APM - Final Updated/app/shared/star.component.ts b/APM - Final Updated/app/shared/star.component.ts
index 6d850c8085d4a2d0f1c1eb06401d073593664fb8..59ed8a487e521b44c94e26b48ce8a1f1dadd5509 100644
--- a/APM - Final Updated/app/shared/star.component.ts	
+++ b/APM - Final Updated/app/shared/star.component.ts	
@@ -1,5 +1,5 @@
 import { Component, OnChanges, Input,
-         Output, EventEmitter } from 'angular2/core';
+         Output, EventEmitter } from '@angular/core';
 
 @Component({
     selector: 'ai-star',
diff --git a/APM - Final Updated/index.html b/APM - Final Updated/index.html
index cfdc3b8723388e3c3f4663cf21d0e3e434e1bc1e..e6b4d27733e4707de24ea42682537f005156a62e 100644
--- a/APM - Final Updated/index.html	
+++ b/APM - Final Updated/index.html	
@@ -9,34 +9,17 @@
     <link href="node_modules/bootstrap/dist/css/bootstrap.css" rel="stylesheet" />
     <link href="app/app.component.css" rel="stylesheet" />
 
-    <!-- 1. Load libraries -->
-    <!-- IE required polyfills, in this exact order -->
-    <script src="node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
+    <!-- Polyfill(s) for older browsers -->
     <script src="node_modules/es6-shim/es6-shim.min.js"></script>
-    <script src="node_modules/angular2/bundles/angular2-polyfills.js"></script>
     
+    <script src="node_modules/zone.js/dist/zone.js"></script>
+    <script src="node_modules/reflect-metadata/Reflect.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>
 
-    <!-- Required for http -->
-    <script src="node_modules/angular2/bundles/http.dev.js"></script>
-
-    <!-- Required for routing -->
-    <script src="node_modules/angular2/bundles/router.dev.js"></script>
-
-    <!-- 2. Configure SystemJS -->
+    <!-- Configure SystemJS -->
+    <script src="systemjs.config.js"></script>
     <script>
-        System.config({
-        packages: {        
-          app: {
-            format: 'register',
-            defaultExtension: 'js'
-          }
-        }
-      });
-      System.import('app/main')
-            .then(null, console.error.bind(console));
+      System.import('app').catch(function(err){ console.error(err);  });
     </script>
 </head>
 
diff --git a/APM - Final Updated/package.json b/APM - Final Updated/package.json
index 2c20fde09699e912de59062dfb18e17d985ae335..c034d3ca47b6c6af5b529b979521fb00191484f8 100644
--- a/APM - Final Updated/package.json	
+++ b/APM - Final Updated/package.json	
@@ -14,12 +14,22 @@
     },
     "license": "ISC",
     "dependencies": {
-        "angular2": "2.0.0-beta.17",
-        "systemjs": "0.19.26",
+        "@angular/common": "2.0.0-rc.1",
+        "@angular/compiler": "2.0.0-rc.1",
+        "@angular/core": "2.0.0-rc.1",
+        "@angular/http": "2.0.0-rc.1",
+        "@angular/platform-browser": "2.0.0-rc.1",
+        "@angular/platform-browser-dynamic": "2.0.0-rc.1",
+        "@angular/router": "2.0.0-rc.1",
+        "@angular/router-deprecated": "2.0.0-rc.1",
+        "@angular/upgrade": "2.0.0-rc.1",
+        
+        "systemjs": "0.19.27",
         "es6-shim": "^0.35.0",
-        "reflect-metadata": "0.1.2",
-        "rxjs": "5.0.0-beta.2",
+        "reflect-metadata": "^0.1.3",
+        "rxjs": "5.0.0-beta.6",
         "zone.js": "^0.6.12",
+        
         "bootstrap": "^3.3.6"
     },
     "devDependencies": {
@@ -30,4 +40,4 @@
         "typings": "^0.8.1"
     },
     "repository": {}
-}
+}
\ No newline at end of file
diff --git a/APM - Final Updated/systemjs.config.js b/APM - Final Updated/systemjs.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..1715d44d19e092c931fec0e97d1a0478ebe0cb26
--- /dev/null
+++ b/APM - Final Updated/systemjs.config.js	
@@ -0,0 +1,43 @@
+/**
+ * System configuration for Angular 2 samples
+ * Adjust as necessary for your application needs.
+ */
+(function(global) {
+
+  // map tells the System loader where to look for things
+  var map = {
+    'app':                        'app',
+    'rxjs':                       'node_modules/rxjs',
+    '@angular':                   'node_modules/@angular'
+  };
+
+  // packages tells the System loader how to load when no filename and/or no extension
+  var packages = {
+    'app':    { main: 'main.js',  defaultExtension: 'js' },
+    'rxjs':   { defaultExtension: 'js' }
+  };
+
+  var packageNames = [
+    '@angular/common',
+    '@angular/compiler',
+    '@angular/core',
+    '@angular/http',
+    '@angular/platform-browser',
+    '@angular/platform-browser-dynamic',
+    '@angular/router-deprecated'
+  ];
+
+  // add package entries for angular packages in the form 
+  // '@angular/common': { main: 'index.js', defaultExtension: 'js' }
+  packageNames.forEach(function(pkgName) {
+    packages[pkgName] = { main: 'index.js', defaultExtension: 'js' };
+  });
+
+  var config = {
+    map: map,
+    packages: packages
+  }
+
+  System.config(config);
+
+})(this);
\ No newline at end of file
diff --git a/APM - Final Updated/typings.json b/APM - Final Updated/typings.json
index 4c40274b265d095a0cc2530ccbd9610295246234..70b0e6903397fcdc4af28f81b748fa276a7e49b7 100644
--- a/APM - Final Updated/typings.json	
+++ b/APM - Final Updated/typings.json	
@@ -1,4 +1,5 @@
 {
   "ambientDependencies": {
-"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#7de6c3dd94feaeb21f20054b9f30d5dabc5efabd"  }
+    "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"
+  }
 }
\ No newline at end of file