diff --git a/ng2-components/ng2-alfresco-upload/demo/.editorconfig b/ng2-components/ng2-alfresco-upload/demo/.editorconfig
index 8ed330c4a2..c310eb95da 100644
--- a/ng2-components/ng2-alfresco-upload/demo/.editorconfig
+++ b/ng2-components/ng2-alfresco-upload/demo/.editorconfig
@@ -1,10 +1,19 @@
+# http://editorconfig.org
 
 root = true
 
-[{src,scripts}/**.{ts,json,js}]
-end_of_line = crlf
+[*]
 charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
 indent_style = space
 indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[package.json]
+indent_style = space
+indent_size = 2
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/ng2-components/ng2-alfresco-upload/demo/index.html b/ng2-components/ng2-alfresco-upload/demo/index.html
index 48321ca9ce..923ab8b012 100644
--- a/ng2-components/ng2-alfresco-upload/demo/index.html
+++ b/ng2-components/ng2-alfresco-upload/demo/index.html
@@ -11,17 +11,15 @@
     <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css">
 
     <!-- 1. Load libraries -->
-    <!-- IE required polyfills, in this exact order -->
-    <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>
+    <!-- Polyfill(s) for older browsers -->
+    <script src="node_modules/core-js/client/shim.min.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>
-    <script src="node_modules/angular2/bundles/router.dev.js"></script>
-    <script src="node_modules/angular2/bundles/http.dev.js"></script>
-    <script src="node_modules/alfresco-core-rest-api/bundle.js"></script>
+
+    <!-- Additional Alfresco libraries -->
+    <script src="node_modules/alfresco-js-api/bundle.js"></script>
 
     <script src="systemjs.config.js"></script>
     <script>
@@ -34,4 +32,4 @@
 <my-app></my-app>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json
index 161d985f2d..f98e3c3ffb 100644
--- a/ng2-components/ng2-alfresco-upload/demo/package.json
+++ b/ng2-components/ng2-alfresco-upload/demo/package.json
@@ -44,15 +44,28 @@
     "alfresco"
   ],
   "dependencies": {
-    "angular2": "2.0.0-beta.15",
-    "es6-shim": "^0.35.0",
+    "@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",
+    "core-js": "^2.4.0",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.6",
+    "zone.js": "^0.6.12",
+    "angular2-in-memory-web-api": "0.0.11",
+
     "material-design-icons": "^2.2.3",
     "material-design-lite": "^1.1.3",
-    "ng2-alfresco-upload": "^0.1.0",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "systemjs": "0.19.26",
-    "zone.js": "0.6.10"
+    "alfresco-js-api": "^0.1.0",
+    "ng2-alfresco-core": "^0.1.0",
+    "ng2-translate": "2.1.0",
+    "ng2-alfresco-upload": "^0.1.0"
   },
   "devDependencies": {
     "browser-sync": "^2.10.0",
@@ -60,7 +73,7 @@
     "concurrently": "^2.0.0",
     "tslint": "^3.8.1",
     "typescript": "^1.8.10",
-    "typings": "^0.7.12"
+    "typings": "^1.0.4"
   },
   "publishConfig": {
     "registry": "http://devproducts.alfresco.me:4873/"
diff --git a/ng2-components/ng2-alfresco-upload/demo/src/main.ts b/ng2-components/ng2-alfresco-upload/demo/src/main.ts
index 8857d91fb3..99a6327dd2 100644
--- a/ng2-components/ng2-alfresco-upload/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-upload/demo/src/main.ts
@@ -1,117 +1,117 @@
-/*!
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Component, OnInit } from 'angular2/core';
-import { bootstrap } from 'angular2/platform/browser';
-import { HTTP_PROVIDERS } from 'angular2/http';
-import {
-    ALFRESCO_CORE_PROVIDERS,
-    AlfrescoSettingsService,
-    AlfrescoAuthenticationService
-} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
-import { ALFRESCO_ULPOAD_COMPONENTS, UploadService } from 'ng2-alfresco-upload/dist/ng2-alfresco-upload';
-
-
-@Component({
-    selector: 'my-app',
-    template: `<label for="token"><b>Insert a valid access token / ticket:</b></label><br>
-               <input id="token" type="text" size="48" (change)="updateToken()" [(ngModel)]="token"><br>
-               <label for="token"><b>Insert the ip of your Alfresco instance:</b></label><br>
-               <input id="token" type="text" size="48" (change)="updateHost()" [(ngModel)]="host"><br><br>
-               <div *ngIf="!authenticated" style="color:#FF2323">
-                    Authentication failed to ip {{ host }} with user: admin, admin, you can still try to add a valid token to perform
-                    operations.
-               </div>
-               <hr>
-               <alfresco-upload-button [showUdoNotificationBar]="true"
-                                       [uploadFolders]="false"
-                                       [multipleFiles]="false"
-                                       (onSuccess)="customMethod($event)">
-               </alfresco-upload-button>
-
-               <br><br>
-
-               <alfresco-upload-button [showUdoNotificationBar]="true"
-                                       [uploadFolders]="true"
-                                       [multipleFiles]="false"
-                                       (onSuccess)="customMethod($event)">
-               </alfresco-upload-button>
-
-               <br><br>
-
-               <alfresco-upload-button [showUdoNotificationBar]="true"
-                                       [uploadFolders]="false"
-                                       [multipleFiles]="true"
-                                       (onSuccess)="customMethod($event)">
-               </alfresco-upload-button>
-
-               <br><br>
-
-               <alfresco-upload-drag-area (onSuccess)="customMethod($event)" >
-                     <div style="width: 200px; height: 100px; border: 1px solid #888888">
-                         DRAG HERE
-                     </div>
-               </alfresco-upload-drag-area>
-               <file-uploading-dialog></file-uploading-dialog>
-               `,
-    directives: [ALFRESCO_ULPOAD_COMPONENTS]
-})
-export class MyDemoApp implements OnInit {
-
-    authenticated: boolean;
-
-    host: string = 'http://192.168.99.100:8080';
-
-    token: string;
-
-    constructor(private authService: AlfrescoAuthenticationService, private alfrescoSettingsService: AlfrescoSettingsService) {
-        alfrescoSettingsService.host = this.host;
-
-        if (localStorage.getItem('token')) {
-            this.token = localStorage.getItem('token');
-        }
-    }
-
-    public updateToken(): void {
-        localStorage.setItem('token', this.token);
-    }
-
-    public updateHost(): void {
-        this.alfrescoSettingsService.host = this.host;
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Component, OnInit } from '@angular/core';
+import { bootstrap } from '@angular/platform-browser-dynamic';
+import { HTTP_PROVIDERS } from '@angular/http';
+import {
+    ALFRESCO_CORE_PROVIDERS,
+    AlfrescoSettingsService,
+    AlfrescoAuthenticationService
+} from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { ALFRESCO_ULPOAD_COMPONENTS, UploadService } from 'ng2-alfresco-upload/dist/ng2-alfresco-upload';
+
+
+@Component({
+    selector: 'my-app',
+    template: `<label for="token"><b>Insert a valid access token / ticket:</b></label><br>
+               <input id="token" type="text" size="48" (change)="updateToken()" [(ngModel)]="token"><br>
+               <label for="token"><b>Insert the ip of your Alfresco instance:</b></label><br>
+               <input id="token" type="text" size="48" (change)="updateHost()" [(ngModel)]="host"><br><br>
+               <div *ngIf="!authenticated" style="color:#FF2323">
+                    Authentication failed to ip {{ host }} with user: admin, admin, you can still try to add a valid token to perform
+                    operations.
+               </div>
+               <hr>
+               <alfresco-upload-button [showUdoNotificationBar]="true"
+                                       [uploadFolders]="false"
+                                       [multipleFiles]="false"
+                                       (onSuccess)="customMethod($event)">
+               </alfresco-upload-button>
+
+               <br><br>
+
+               <alfresco-upload-button [showUdoNotificationBar]="true"
+                                       [uploadFolders]="true"
+                                       [multipleFiles]="false"
+                                       (onSuccess)="customMethod($event)">
+               </alfresco-upload-button>
+
+               <br><br>
+
+               <alfresco-upload-button [showUdoNotificationBar]="true"
+                                       [uploadFolders]="false"
+                                       [multipleFiles]="true"
+                                       (onSuccess)="customMethod($event)">
+               </alfresco-upload-button>
+
+               <br><br>
+
+               <alfresco-upload-drag-area (onSuccess)="customMethod($event)" >
+                     <div style="width: 200px; height: 100px; border: 1px solid #888888">
+                         DRAG HERE
+                     </div>
+               </alfresco-upload-drag-area>
+               <file-uploading-dialog></file-uploading-dialog>
+               `,
+    directives: [ALFRESCO_ULPOAD_COMPONENTS]
+})
+export class MyDemoApp implements OnInit {
+
+    authenticated: boolean;
+
+    host: string = 'http://192.168.99.100:8080';
+
+    token: string;
+
+    constructor(private authService: AlfrescoAuthenticationService, private alfrescoSettingsService: AlfrescoSettingsService) {
+        alfrescoSettingsService.host = this.host;
+
+        if (localStorage.getItem('token')) {
+            this.token = localStorage.getItem('token');
+        }
+    }
+
+    public updateToken(): void {
+        localStorage.setItem('token', this.token);
+    }
+
+    public updateHost(): void {
+        this.alfrescoSettingsService.host = this.host;
         this.login();
-    }
-
-    public customMethod(event: Object): void {
-        console.log('File uploaded');
-    }
-
-    public ngOnInit(): void {
-        this.login();
-    }
-
-    public login(): void {
-        this.authService.login('admin', 'admin').subscribe(token => {
-            this.authenticated = true;
-        });
-    }
-}
-
-bootstrap(MyDemoApp, [
-    HTTP_PROVIDERS,
-    ALFRESCO_CORE_PROVIDERS,
-    UploadService
-]);
+    }
+
+    public customMethod(event: Object): void {
+        console.log('File uploaded');
+    }
+
+    public ngOnInit(): void {
+        this.login();
+    }
+
+    public login(): void {
+        this.authService.login('admin', 'admin').subscribe(token => {
+            this.authenticated = true;
+        });
+    }
+}
+
+bootstrap(MyDemoApp, [
+    HTTP_PROVIDERS,
+    ALFRESCO_CORE_PROVIDERS,
+    UploadService
+]);
diff --git a/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js b/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js
index ccc35fa435..50ac0b4afe 100644
--- a/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-upload/demo/systemjs.config.js
@@ -1,57 +1,55 @@
 /**
- * @license
- * Copyright 2016 Alfresco Software, Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * System configuration for Angular 2 samples
+ * Adjust as necessary for your application needs.
  */
-
-(function (global) {
-
+(function(global) {
     // map tells the System loader where to look for things
     var map = {
-        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core',
-        'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload',
-        'rxjs': 'node_modules/rxjs',
-        'angular2': 'node_modules/angular2',
-        'ng2-translate': 'node_modules/ng2-translate',
-        'app': 'dist/main'
-    };
+        'app':                        'dist', // 'dist',
+        '@angular':                   'node_modules/@angular',
+        'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api',
+        'rxjs':                       'node_modules/rxjs',
 
+        'ng2-translate': 'node_modules/ng2-translate',
+        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core',
+        'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload'
+    };
     // packages tells the System loader how to load when no filename and/or no extension
     var packages = {
-        'src': {
-            defaultExtension: 'js'
-        },
-        'ng2-alfresco-core': {
-            defaultExtension: 'js'
-        },
-        'ng2-alfresco-upload': {
-            defaultExtension: 'js'
-        },
-        'rxjs': {
-            defaultExtension: 'js'
-        },
-        'angular2': {
-            defaultExtension: 'js'
-        }
-    };
+        'app':                        { main: 'main.js',  defaultExtension: 'js' },
+        'rxjs':                       { defaultExtension: 'js' },
+        'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
 
+        'ng2-translate': { defaultExtension: 'js' },
+        'ng2-alfresco-core': { defaultExtension: 'js' },
+        'ng2-alfresco-upload': { defaultExtension: 'js' }
+    };
+    var ngPackageNames = [
+        'common',
+        'compiler',
+        'core',
+        'http',
+        'platform-browser',
+        'platform-browser-dynamic',
+        'router',
+        'router-deprecated',
+        'upgrade'
+    ];
+    // Individual files (~300 requests):
+    function packIndex(pkgName) {
+        packages['@angular/'+pkgName] = { main: 'index.js', defaultExtension: 'js' };
+    }
+    // Bundled (~40 requests):
+    function packUmd(pkgName) {
+        packages['@angular/'+pkgName] = { main: pkgName + '.umd.js', defaultExtension: 'js' };
+    }
+    // Most environments should use UMD; some (Karma) need the individual index files
+    var setPackageConfig = System.packageWithIndex ? packIndex : packUmd;
+    // Add package entries for angular packages
+    ngPackageNames.forEach(setPackageConfig);
     var config = {
-        defaultJSExtensions: true,
         map: map,
         packages: packages
     };
-
     System.config(config);
-
 })(this);
diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json
index fc619c6d8f..1cec091d0a 100644
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -43,6 +43,10 @@
     {
       "name": "Eugenio Romano",
       "email": "eugenio.romano@alfresco.com"
+    },
+    {
+      "name": "Denys Vuika",
+      "email": "denys.vuika@gmail.com"
     }
   ],
   "keywords": [
@@ -53,19 +57,25 @@
     "alfresco"
   ],
   "dependencies": {
-    "alfresco-core-rest-api": "^0.1.0",
-    "angular2": "2.0.0-beta.15",
-    "es6-module-loader": "^0.17.8",
-    "es6-shim": "^0.35.0",
-    "ng2-alfresco-core": "^0.1.0",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "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",
+    "core-js": "^2.4.0",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.6",
     "zone.js": "^0.6.12",
-    "ng2-translate": "1.11.1"
-  },
-  "peerDependencies": {
-    "angular2": "2.0.0-beta.15"
+    "angular2-in-memory-web-api": "0.0.11",
+
+    "alfresco-core-rest-api": "^0.1.0",
+    "ng2-alfresco-core": "^0.1.0",
+    "ng2-translate": "2.1.0"
   },
   "devDependencies": {
     "concurrently": "^2.1.0",
@@ -86,7 +96,7 @@
     "traceur": "^0.0.91",
     "tslint": "^3.8.1",
     "typescript": "^1.8.10",
-    "typings": "^0.7.12"
+    "typings": "^1.0.4"
   },
   "license-check-config": {
     "src": [
diff --git a/ng2-components/ng2-alfresco-upload/src/assets/translation.service.mock.ts b/ng2-components/ng2-alfresco-upload/src/assets/translation.service.mock.ts
index 81abc5753a..b28942f5d0 100644
--- a/ng2-components/ng2-alfresco-upload/src/assets/translation.service.mock.ts
+++ b/ng2-components/ng2-alfresco-upload/src/assets/translation.service.mock.ts
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { Observable } from 'rxjs/Observable';
-import { EventEmitter } from 'angular2/core';
+import { Observable } from 'rxjs/Rx';
+import { EventEmitter } from '@angular/core';
 
 export interface LangChangeEvent {
     lang: string;
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts
index 2d5226002e..880ad0e21c 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts
@@ -15,6 +15,15 @@
  * limitations under the License.
  */
 
+import { describe, it, expect } from '@angular/core/testing';
+
+describe('FileUploadDialog', () => {
+   it ('should be migrated to angular 2 rc.1', () => {
+       expect(false).toBe(true);
+   });
+});
+
+/*
 import { TEST_BROWSER_PLATFORM_PROVIDERS, TEST_BROWSER_APPLICATION_PROVIDERS } from 'angular2/platform/testing/browser';
 import { it, describe, expect, injectAsync, beforeEachProviders, TestComponentBuilder, setBaseTestProviders } from 'angular2/testing';
 import { provide } from 'angular2/core';
@@ -53,3 +62,4 @@ describe('FileUploadDialog', () => {
             });
     }));
 });
+*/
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
index 5ce2ffe993..ef251bcd0c 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Component, ChangeDetectorRef, OnInit } from 'angular2/core';
+import { Component, ChangeDetectorRef, OnInit } from '@angular/core';
 import { FileModel } from '../models/file.model';
 import { FileUploadingListComponent } from './file-uploading-list.component';
 import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html
index 453a40e4b0..955373fdce 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.html
@@ -10,7 +10,7 @@
         <th>{{'FILE_UPLOAD.FILE_INFO.SIZE' | translate}}</th>
         <th>{{'FILE_UPLOAD.FILE_INFO.ACTION' | translate}}</th>
     </tr>
-    <tr *ngFor="#file of filesUploadingList">
+    <tr *ngFor="let file of filesUploadingList">
         <td class="mdl-data-table__cell--non-numeric"><div class="truncate">{{file.name}}</div></td>
         <td _ngcontent-hvq-3="">
             <div _ngcontent-hvq-3="" class="mdl-progress mdl-js-progress is-upgraded" id="{{file.id}}"
diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts
index 79f11cf78c..e53a100ea0 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts
@@ -16,7 +16,7 @@
  */
 
 
-import { Component, ElementRef, Input } from 'angular2/core';
+import { Component, ElementRef, Input } from '@angular/core';
 import { FileModel } from '../models/file.model';
 import { AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
 
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts
index 1d4e0741b9..5f041bc983 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts
@@ -15,6 +15,16 @@
  * limitations under the License.
  */
 
+
+import { describe, it, expect } from '@angular/core/testing';
+
+describe('AlfrescoUploadButton', () => {
+    it ('should be migrated to angular 2 rc.1', () => {
+        expect(false).toBe(true);
+    });
+});
+
+/*
 import { it, describe, expect, injectAsync, beforeEachProviders, TestComponentBuilder } from 'angular2/testing';
 import { provide } from 'angular2/core';
 import { UploadButtonComponent } from './upload-button.component';
@@ -105,3 +115,4 @@ describe('AlfrescoUploadButton', () => {
                 });
         }));
 });
+*/
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
index 2ae11f33a0..5ac07ddde3 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts
@@ -16,7 +16,7 @@
  */
 
 
-import { Component, ViewChild, ElementRef, Input, Output, EventEmitter } from 'angular2/core';
+import { Component, ViewChild, ElementRef, Input, Output, EventEmitter } from '@angular/core';
 import { UploadService } from '../services/upload.service';
 import { FileModel } from '../models/file.model';
 import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts
index e18f4e06bf..548fff22c9 100644
--- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts
+++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Component, ViewChild, Input, Output, EventEmitter } from 'angular2/core';
+import { Component, ViewChild, Input, Output, EventEmitter } from '@angular/core';
 import { UploadService } from '../services/upload.service';
 import { FileDraggableDirective } from '../directives/file-draggable.directive';
 import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
diff --git a/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts b/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts
index a1bb1d10d1..bb4a57a753 100644
--- a/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts
+++ b/ng2-components/ng2-alfresco-upload/src/directives/file-draggable.directive.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Directive, ElementRef, EventEmitter, Output } from 'angular2/core';
+import { Directive, ElementRef, EventEmitter, Output } from '@angular/core';
 
 /**
  * [file-draggable]
diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts
index c4bd7315b7..fda3163482 100644
--- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts
+++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.spec.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { it, describe, beforeEach, expect } from 'angular2/testing';
+import { it, describe, beforeEach, expect } from '@angular/core/testing';
 import { UploadService } from './upload.service';
 import { FileModel } from './../models/file.model';
 
diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
index a852cfae9b..099343fc24 100644
--- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
+++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
@@ -16,12 +16,12 @@
  */
 
 
-import { FileModel } from '../models/file.model';
-import { EventEmitter, Injectable } from 'angular2/core';
+import { EventEmitter, Injectable } from '@angular/core';
+import { Response } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
-import { Response } from 'angular2/http';
 import { AlfrescoSettingsService } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
+import { FileModel } from '../models/file.model';
 
 declare let AlfrescoApi: any;
 
@@ -53,8 +53,8 @@ export class UploadService {
 
     constructor(private settings: AlfrescoSettingsService) {
         console.log('UploadService constructor');
-        this.filesUpload$ = new Observable(observer =>  this._filesUploadObserver = observer).share();
-        this.totalCompleted$ = new Observable(observer =>  this._totalCompletedObserver = observer).share();
+        this.filesUpload$ = new Observable<FileModel[]>(observer =>  this._filesUploadObserver = observer).share();
+        this.totalCompleted$ = new Observable<number>(observer =>  this._totalCompletedObserver = observer).share();
         this._alfrescoClient = this.getAlfrescoClient();
     }