diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json
index e6578f4793..72657833c6 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json
@@ -10,7 +10,7 @@
         "start": "rm -rf dist && npm install && http-server -c-1 -o -p 8875 .",
         "build": "rm -rf dist && tsc"
     },
-    "license": "MIT",
+    "license": "Apache-2.0",
     "dependencies": {
         "angular2": "2.0.0-beta.13",
         "es6-promise": "3.0.2",
diff --git a/ng2-components/ng2-alfresco-login/demo/README.md b/ng2-components/ng2-alfresco-login/demo/README.md
index 9f87666579..c1d8756aa8 100644
--- a/ng2-components/ng2-alfresco-login/demo/README.md
+++ b/ng2-components/ng2-alfresco-login/demo/README.md
@@ -1,4 +1,4 @@
-# angular2-testing
+# angular2-alfresco-login
 
 Install:
 
diff --git a/ng2-components/ng2-alfresco-login/demo/index.html b/ng2-components/ng2-alfresco-login/demo/index.html
index 9d31e0a7e8..d9aef08600 100644
--- a/ng2-components/ng2-alfresco-login/demo/index.html
+++ b/ng2-components/ng2-alfresco-login/demo/index.html
@@ -5,6 +5,11 @@
     <title>Angular 2 Testing</title>
     <base href="/">
 
+    <!-- Google Material Design Lite -->
+    <link rel="stylesheet" href="node_modules/material-design-lite/material.min.css">
+    <script src="node_modules/material-design-lite/material.min.js"></script>
+    <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>
@@ -16,6 +21,7 @@
     <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>
 
     <script>
         System.config({
@@ -23,14 +29,13 @@
             map: {
                 'ng2-alfresco-core': 'node_modules/ng2-alfresco-core',
                 'ng2-alfresco-login': 'node_modules/ng2-alfresco-login',
-                'ng2-translate': 'node_modules/ng2-translate',
                 'rxjs': 'node_modules/rxjs',
                 'angular2' : 'node_modules/angular2',
-                'ng2-translate' : 'node_modules/ng2-translate',
-                'app': 'dist/src'
+                'ng2-translate': 'node_modules/ng2-translate',
+                'src': 'src'
             },
             packages: {
-                'app': {
+                'src': {
                     defaultExtension: 'js'
                 },
                 'ng2-alfresco-core': {
@@ -39,9 +44,6 @@
                 'ng2-alfresco-login': {
                     defaultExtension: 'js'
                 },
-                'ng2-translate': {
-                    defaultExtension: 'js'
-                },
                 'rxjs': {
                     defaultExtension: 'js'
                 },
@@ -51,7 +53,7 @@
             }
         });
 
-        System.import('dist/src/my-app').catch(console.log.bind(console));
+        System.import('dist/main').catch(console.log.bind(console));
     </script>
 
 </head>
diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json
index 3de2324449..a698655e30 100644
--- a/ng2-components/ng2-alfresco-login/demo/package.json
+++ b/ng2-components/ng2-alfresco-login/demo/package.json
@@ -5,34 +5,45 @@
   "author": "Alfresco Software, Ltd.",
   "main": "index.js",
   "scripts": {
-    "postinstall": "npm run typings",
+    "postinstall": "npm run build && npm run typings",
     "typings": "typings install",
-    "start": "npm run test && http-server -c-1 -o -p 8875 .",
-    "build": "rm -rf dist && tsc",
-    "pretest": "npm install && npm run build"
+    "start": "rm -rf dist && npm install && npm run server",
+    "server": "lite-server",
+    "build": "rm -rf dist && tsc"
   },
-  "license": "MIT",
+  "license": "Apache-2.0",
+  "contributors": [
+    {
+      "name": "Maurizio Vitale",
+      "email": "maurizio.vitale@alfresco.com"
+    }
+  ],
+  "keywords": [
+    "ng2",
+    "angular",
+    "angular2",
+    "alfresco"
+  ],
   "dependencies": {
-    "angular2": "2.0.0-beta.13",
-    "es6-promise": "3.0.2",
-    "es6-shim": "0.35.0",
+    "alfresco-core-rest-api": "^0.1.0",
+    "angular2": "2.0.0-beta.15",
+    "es6-shim": "^0.35.0",
+    "material-design-icons": "^2.2.3",
+    "material-design-lite": "^1.1.3",
+    "ng2-alfresco-core": "^0.1.0",
     "ng2-alfresco-login": "^0.1.0",
-    "ng2-translate": "^1.11.3",
-    "ng2-translate": "^1.11.2",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.2",
-    "zone.js": "0.6.6"
+    "systemjs": "0.19.26",
+    "zone.js": "0.6.10"
   },
   "devDependencies": {
-    "http-server": "0.8.5",
-    "systemjs": "0.19.17",
-    "typescript": "1.7.5",
-    "typings": "0.6.8"
+    "browser-sync": "^2.10.0",
+    "concurrently": "^2.0.0",
+    "lite-server": "^2.2.0",
+    "typescript": "^1.8.10",
+    "typings": "^0.7.12"
   },
-  "keywords": [
-    "angular2",
-    "typescript"
-  ],
   "publishConfig": {
     "registry": "http://devproducts.alfresco.me:4873/"
   }
diff --git a/ng2-components/ng2-alfresco-login/demo/src/components/my-login.component.ts b/ng2-components/ng2-alfresco-login/demo/src/components/app-component.ts
similarity index 85%
rename from ng2-components/ng2-alfresco-login/demo/src/components/my-login.component.ts
rename to ng2-components/ng2-alfresco-login/demo/src/components/app-component.ts
index 03fd96fec7..e7d3400269 100644
--- a/ng2-components/ng2-alfresco-login/demo/src/components/my-login.component.ts
+++ b/ng2-components/ng2-alfresco-login/demo/src/components/app-component.ts
@@ -18,11 +18,9 @@
  */
 
 import { Component } from 'angular2/core';
-import { AlfrescoLoginComponent } from 'ng2-alfresco-login/ng2-alfresco-login';
+import { AlfrescoLoginComponent, AlfrescoAuthenticationService } from 'ng2-alfresco-login/dist/ng2-alfresco-login';
 import { Router, RouteConfig, ROUTER_DIRECTIVES } from 'angular2/router';
-import { AlfrescoSettingsService } from 'ng2-alfresco-core/services';
-import { AlfrescoAuthenticationService } from 'ng2-alfresco-login/ng2-alfresco-login';
-
+import { AlfrescoSettingsService } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
 
 @Component({
     selector: 'my-login',
@@ -33,7 +31,7 @@ import { AlfrescoAuthenticationService } from 'ng2-alfresco-login/ng2-alfresco-l
 @RouteConfig([
     {path: '/', name: 'Login', component: AlfrescoLoginComponent, useAsDefault: true}
 ])
-export class MyLoginComponent {
+export class AppComponent {
 
     constructor(public auth: AlfrescoAuthenticationService,
                 public router: Router,
diff --git a/ng2-components/ng2-alfresco-login/demo/src/my-app.ts b/ng2-components/ng2-alfresco-login/demo/src/main.ts
similarity index 53%
rename from ng2-components/ng2-alfresco-login/demo/src/my-app.ts
rename to ng2-components/ng2-alfresco-login/demo/src/main.ts
index b4b1ea707a..7a3337b33d 100644
--- a/ng2-components/ng2-alfresco-login/demo/src/my-app.ts
+++ b/ng2-components/ng2-alfresco-login/demo/src/main.ts
@@ -15,20 +15,20 @@
  * limitations under the License.
  */
 
-import {bootstrap}    from 'angular2/platform/browser';
-import {MyLoginComponent} from './components/my-login.component';
-import {ALFRESCO_AUTHENTICATION} from 'ng2-alfresco-login/ng2-alfresco-login';
-import {ROUTER_PROVIDERS} from 'angular2/router';
-import {provide} from 'angular2/core';
-import {HTTP_PROVIDERS}    from 'angular2/http';
-import {TranslateService, TranslateLoader} from 'ng2-translate/ng2-translate';
-import {ALFRESCO_CORE_PROVIDERS, AlfrescoTranslationService} from 'ng2-alfresco-core/services';
+import { bootstrap }    from 'angular2/platform/browser';
+import { AppComponent } from './components/app-component';
+import { ALFRESCO_AUTHENTICATION } from 'ng2-alfresco-login/dist/ng2-alfresco-login';
+import { ROUTER_PROVIDERS } from 'angular2/router';
+import { provide } from 'angular2/core';
+import { Http } from 'angular2/http';
+import { HTTP_PROVIDERS }    from 'angular2/http';
+import { ALFRESCO_CORE_PROVIDERS, AlfrescoTranslationService, AlfrescoTranslationLoader } from 'ng2-alfresco-core/dist/ng2-alfresco-core';
 
-bootstrap(MyLoginComponent, [
+bootstrap(AppComponent, [
     ROUTER_PROVIDERS,
     HTTP_PROVIDERS,
-    provide(TranslateLoader, {useClass: AlfrescoTranslationService}),
-    TranslateService,
+    AlfrescoTranslationLoader,
+    AlfrescoTranslationService,
     ALFRESCO_AUTHENTICATION,
     ALFRESCO_CORE_PROVIDERS
 ]);
diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json
index 83fa263c16..7887754995 100644
--- a/ng2-components/ng2-alfresco-upload/demo/package.json
+++ b/ng2-components/ng2-alfresco-upload/demo/package.json
@@ -5,7 +5,7 @@
   "author": "Alfresco Software, Ltd.",
   "main": "index.js",
   "scripts": {
-    "postinstall": "npm run build && npm run typings",
+    "postinstall": "npm run typings && npm run build",
     "typings": "typings install",
     "start": "rm -rf dist && npm install && npm run server",
     "server": "lite-server",
diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json
index c5d6a26ec6..97ab296972 100644
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -1,101 +1,102 @@
 {
-  "name": "ng2-alfresco-upload",
-  "description": "Alfresco Angular2 Upload Component",
-  "version": "0.1.10",
-  "author": "Alfresco Software, Ltd.",
-  "scripts": {
-    "typings": "typings install",
-    "start": "npm run test && http-server -c-1 -o -p 8875 .",
-    "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
-    "tslint": "npm run tslint-src && npm run tslint-root",
-    "tslint-src": "tslint -c tslint.json src/**/*.ts",
-    "tslint-root": "tslint -c tslint.json *.ts",
-    "copytemplates": "npm run copy-html && npm run copy-css && npm run copy-i18n",
-    "copy-html": "copyfiles './src/**/*.html' dist",
-    "copy-css": "copyfiles './src/**/*.css' dist",
-    "copy-i18n": "copyfiles './i18n/**/*.json' dist",
-    "licensecheck": "license-check",
-    "tsc": "tsc",
-    "pretest": "npm run build",
-    "test": "karma start karma.conf.js",
-    "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
-    "coverage": "http-server -c-1 -o -p 9875 ./coverage",
-    "prepublish": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues"
-  },
-  "license": "Apache-2.0",
-  "contributors": [
-    {
-      "name": "Mario Romano",
-      "email": "mario.romano83@gmail.com"
+    "name": "ng2-alfresco-upload",
+    "description": "Alfresco Angular2 Upload Component",
+    "version": "0.1.10",
+    "author": "Alfresco Software, Ltd.",
+    "scripts": {
+        "typings": "typings install",
+        "start": "npm run test && http-server -c-1 -o -p 8875 .",
+        "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
+        "tslint": "npm run tslint-src && npm run tslint-root",
+        "tslint-src": "tslint -c tslint.json src/**/*.ts",
+        "tslint-root": "tslint -c tslint.json *.ts",
+        "copytemplates": "npm run copy-html && npm run copy-css && npm run copy-i18n",
+        "copy-html": "copyfiles './src/**/*.html' dist",
+        "copy-css": "copyfiles './src/**/*.css' dist",
+        "copy-i18n": "copyfiles './i18n/**/*.json' dist",
+        "licensecheck": "license-check",
+        "tsc": "tsc",
+        "pretest": "npm run build",
+        "test": "karma start karma.conf.js",
+        "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
+        "coverage": "http-server -c-1 -o -p 9875 ./coverage",
+        "prepublish": "npm run build"
     },
-    {
-      "name": "Eugenio Romano",
-      "email": "eugenio.romano83@gmail.com"
-    }
-  ],
-  "keywords": [
-    "ng2",
-    "angular",
-    "angular2",
-    "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",
-    "zone.js": "^0.6.12",
-    "ng2-translate": "^1.11.3"
-  },
-  "peerDependencies": {
-    "angular2": "2.0.0-beta.15"
-  },
-  "devDependencies": {
-    "copyfiles": "^0.2.1",
-    "coveralls": "^2.11.9",
-    "http-server": "0.8.5",
-    "jasmine-ajax": "^3.2.0",
-    "jasmine-core": "2.4.1",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-jasmine-ajax": "^0.1.13",
-    "karma-mocha-reporter": "^2.0.3",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^0.7.12"
-  },
-  "license-check-config": {
-    "src": [
-      "**/*.js",
-      "**/*.ts",
-      "!/**/coverage/**/*",
-      "!/**/demo/**/*",
-      "!/**/node_modules/**/*",
-      "!/**/typings/**/*",
-      "!*.js"
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/Alfresco/dev-platform-webcomponents.git"
+    },
+    "bugs": {
+        "url": "https://github.com/Alfresco/dev-platform-webcomponents/issues"
+    },
+    "license": "Apache-2.0",
+    "contributors": [
+        {
+            "name": "Mario Romano",
+            "email": "mario.romano83@gmail.com"
+        },
+        {
+            "name": "Eugenio Romano",
+            "email": "eugenio.romano83@gmail.com"
+        }
     ],
-    "path": "assets/license_header.txt",
-    "blocking": false,
-    "logInfo": false,
-    "logError": true
-  },
-  "publishConfig": {
-    "registry": "http://devproducts.alfresco.me:4873/"
-  }
+    "keywords": [
+        "ng2",
+        "angular",
+        "angular2",
+        "upload",
+        "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",
+        "zone.js": "^0.6.12",
+        "ng2-translate": "^1.11.3"
+    },
+    "peerDependencies": {
+        "angular2": "2.0.0-beta.15"
+    },
+    "devDependencies": {
+        "copyfiles": "^0.2.1",
+        "coveralls": "^2.11.9",
+        "http-server": "0.8.5",
+        "jasmine-ajax": "^3.2.0",
+        "jasmine-core": "2.4.1",
+        "karma": "~0.13.22",
+        "karma-chrome-launcher": "~1.0.1",
+        "karma-coverage": "^1.0.0",
+        "karma-jasmine": "~1.0.2",
+        "karma-jasmine-ajax": "^0.1.13",
+        "karma-mocha-reporter": "^2.0.3",
+        "license-check": "^1.0.4",
+        "remap-istanbul": "^0.6.3",
+        "traceur": "^0.0.91",
+        "tslint": "^3.8.1",
+        "typescript": "^1.8.10",
+        "typings": "^0.7.12"
+    },
+    "license-check-config": {
+        "src": [
+            "**/*.js",
+            "**/*.ts",
+            "!/**/coverage/**/*",
+            "!/**/demo/**/*",
+            "!/**/node_modules/**/*",
+            "!/**/typings/**/*",
+            "!*.js"
+        ],
+        "path": "assets/license_header.txt",
+        "blocking": false,
+        "logInfo": false,
+        "logError": true
+    },
+    "publishConfig": {
+        "registry": "http://devproducts.alfresco.me:4873/"
+    }
 }
diff --git a/ng2-components/ng2-alfresco-viewer/demo/index.html b/ng2-components/ng2-alfresco-viewer/demo/index.html
index 4e4b68ce73..5de4858715 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/index.html
+++ b/ng2-components/ng2-alfresco-viewer/demo/index.html
@@ -22,28 +22,24 @@
     <script src="node_modules/angular2/bundles/router.dev.js"></script>
     <script src="node_modules/angular2/bundles/http.dev.js"></script>
 
+    <script src="node_modules/pdfjs-dist/build/pdf.js"></script>
+    <script src="node_modules/pdfjs-dist/build/pdf.worker.js"></script>
+    <script src="node_modules/pdfjs-dist/web/pdf_viewer.js"></script>
+
     <script>
         System.config({
             defaultJSExtensions: true,
             map: {
-                'ng2-alfresco-core': 'node_modules/ng2-alfresco-core',
-                'ng2-alfresco-upload': 'node_modules/ng2-alfresco-upload',
-                'ng2-translate': 'node_modules/ng2-translate',
+                'ng2-alfresco-viewer': 'node_modules/ng2-alfresco-viewer',
                 'rxjs': 'node_modules/rxjs',
-                'angular2' : 'node_modules/angular2',
-                'app': 'dist/src'
+                'angular2': 'node_modules/angular2',
+                'app': 'dist/main'
             },
             packages: {
-                'app': {
+                'src': {
                     defaultExtension: 'js'
                 },
-                'ng2-alfresco-core': {
-                    defaultExtension: 'js'
-                },
-                'ng2-alfresco-upload': {
-                    defaultExtension: 'js'
-                },
-                'ng2-translate': {
+                'ng2-alfresco-viewer': {
                     defaultExtension: 'js'
                 },
                 'rxjs': {
@@ -54,8 +50,7 @@
                 }
             }
         });
-
-        System.import('dist/src/my-app').catch(console.log.bind(console));
+        System.import('app').catch(console.log.bind(console));
     </script>
 
 </head>
diff --git a/ng2-components/ng2-alfresco-viewer/localTestFile.pdf b/ng2-components/ng2-alfresco-viewer/demo/localTestFile.pdf
similarity index 100%
rename from ng2-components/ng2-alfresco-viewer/localTestFile.pdf
rename to ng2-components/ng2-alfresco-viewer/demo/localTestFile.pdf
diff --git a/ng2-components/ng2-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json
index f80798e164..e035db23a0 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/package.json
+++ b/ng2-components/ng2-alfresco-viewer/demo/package.json
@@ -5,20 +5,20 @@
     "author": "Alfresco Software, Ltd.",
     "main": "index.js",
     "scripts": {
-        "postinstall": "npm run build && npm run typings && npm link ng2-alfresco-upload && npm link ng2-alfresco-core",
+        "postinstall": "npm run typings && npm run build  && npm link ng2-alfresco-viewer",
         "typings": "typings install",
         "start": "rm -rf dist && npm install && http-server -c-1 -o -p 8875 .",
         "build": "rm -rf dist && tsc"
     },
-    "license": "MIT",
+    "license": "Apache-2.0",
     "dependencies": {
-        "angular2": "2.0.0-beta.13",
+        "angular2": "2.0.0-beta.15",
         "es6-promise": "3.0.2",
         "es6-shim": "0.35.0",
         "reflect-metadata": "0.1.2",
         "rxjs": "5.0.0-beta.2",
         "zone.js": "0.6.6",
-        "ng2-translate": "^1.11.2",
+        "ng2-alfresco-viewer": "^0.1.4",
         "material-design-icons": "^2.2.3",
         "material-design-lite": "^1.1.3"
     },
diff --git a/ng2-components/ng2-alfresco-viewer/demo/src/components/my-demo.component.ts b/ng2-components/ng2-alfresco-viewer/demo/src/components/my-demo.component.ts
deleted file mode 100644
index da206ea2a0..0000000000
--- a/ng2-components/ng2-alfresco-viewer/demo/src/components/my-demo.component.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-///<reference path="../../node_modules/angular2/typings/browser.d.ts"/>
-
-/**
- * @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 } from 'angular2/core';
-import { ALFRESCO_ULPOAD_COMPONENT } from 'ng2-alfresco-upload/dist/ng2-alfresco-upload';
-
-@Component({
-    selector: 'my-demo',
-    template: `<alfresco-upload-button [showDialogUpload]="true"
-                                       [showUdoNotificationBar]="true"
-                                       [uploadFolders]="false"
-                                       [multipleFiles]="false">
-               </alfresco-upload-button>`,
-    directives: [ALFRESCO_ULPOAD_COMPONENT]
-})
-export class MyDemoComponent {
-
-}
diff --git a/ng2-components/ng2-alfresco-viewer/demo/src/my-app.ts b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts
similarity index 58%
rename from ng2-components/ng2-alfresco-viewer/demo/src/my-app.ts
rename to ng2-components/ng2-alfresco-viewer/demo/src/main.ts
index e5cdfbba1a..ad810ccdf1 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/src/my-app.ts
+++ b/ng2-components/ng2-alfresco-viewer/demo/src/main.ts
@@ -15,26 +15,22 @@
  * limitations under the License.
  */
 
-import { Component, provide } from 'angular2/core';
+import { Component } from 'angular2/core';
 import { bootstrap } from 'angular2/platform/browser';
-import { HTTP_PROVIDERS } from 'angular2/http';
-import { MyDemoComponent } from "./components/my-demo.component";
-import { TranslateLoader, TranslateService } from 'ng2-translate/ng2-translate';
-import { AlfrescoTranslationLoader } from 'ng2-alfresco-core/services';
+import { ViewerComponent } from 'ng2-alfresco-viewer/dist/ng2-alfresco-viewer';
 
 @Component({
     selector: 'my-app',
-    template: '<my-demo></my-demo>',
-    directives: [MyDemoComponent]
+    template: `   <alfresco-viewer [urlFile]="'localTestFile.pdf'">
+                    <div class="mdl-spinner mdl-js-spinner is-active"></div>
+                   </alfresco-viewer>`,
+    directives: [ViewerComponent]
 })
-class VgDemo {
+class MyDemoApp {
     constructor() {
-
+        console.log('constructor');
     }
 }
-
-bootstrap(VgDemo, [
-    HTTP_PROVIDERS,
-    provide(TranslateLoader, {useClass: AlfrescoTranslationLoader}),
-    TranslateService
+bootstrap(MyDemoApp, [
+    ViewerComponent
 ]);
diff --git a/ng2-components/ng2-alfresco-viewer/demo/tsconfig.json b/ng2-components/ng2-alfresco-viewer/demo/tsconfig.json
index 0c6b9dc687..aca217c6cc 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/tsconfig.json
+++ b/ng2-components/ng2-alfresco-viewer/demo/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
-        "target": "ES5",
-        "module": "commonjs",
+        "target": "es5",
+        "module": "system",
         "moduleResolution": "node",
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
@@ -11,8 +11,9 @@
         "outDir": "dist"
     },
     "exclude": [
+        "dist",
         "node_modules",
-        "typings",
-        "dist"
+        "typings/main",
+        "typings/main.d.ts"
     ]
 }
diff --git a/ng2-components/ng2-alfresco-viewer/demo/typings.json b/ng2-components/ng2-alfresco-viewer/demo/typings.json
index 39a2ebcc56..f14695119f 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/typings.json
+++ b/ng2-components/ng2-alfresco-viewer/demo/typings.json
@@ -1,9 +1,6 @@
 {
-  "name": "angular2-testing",
-  "dependencies": {},
-  "devDependencies": {},
-  "ambientDependencies": {
-    "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
-    "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#dd638012d63e069f2c99d06ef4dcc9616a943ee4"
-  }
+    "ambientDependencies": {
+        "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
+        "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#d594ef506d1efe2fea15f8f39099d19b39436b71"
+    }
 }
diff --git a/ng2-components/ng2-alfresco-viewer/index.html b/ng2-components/ng2-alfresco-viewer/index.html
deleted file mode 100644
index a213920f4e..0000000000
--- a/ng2-components/ng2-alfresco-viewer/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Angular 2 Viewer - Demo</title>
-    <base href="/">
-
-    <link rel="stylesheet" href="node_modules/material-design-lite/material.min.css">
-    <script src="node_modules/material-design-lite/material.min.js"></script>
-    <link rel="stylesheet" href="node_modules/material-design-icons/iconfont/material-icons.css">
-
-    <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/router.dev.js"></script>
-    <script src="node_modules/angular2/bundles/http.dev.js"></script>
-
-    <script src="node_modules/pdfjs-dist/build/pdf.js"></script>
-    <script src="node_modules/pdfjs-dist/build/pdf.worker.js"></script>
-    <script src="node_modules/pdfjs-dist/web/pdf_viewer.js"></script>
-
-    <script>
-        System.config({
-            defaultJSExtensions: true,
-            map: {
-                'rxjs': 'node_modules/rxjs',
-                'angular2': 'node_modules/angular2',
-                'app': 'dist/main'
-            },
-            packages: {
-                'pdfjsDistBuildPdf': {
-                    defaultExtension: 'js'
-                },
-                'app': {
-                    defaultExtension: 'js'
-                },
-                'rxjs': {
-                    defaultExtension: 'js'
-                },
-                'angular2': {
-                    defaultExtension: 'js'
-                }
-            }
-        });
-
-        System.import('app').catch(console.log.bind(console));
-    </script>
-
-</head>
-<body>
-<alfresco-viewer [urlFile]="'localTestFile.pdf'">
-    <div class="mdl-spinner mdl-js-spinner is-active"></div>
-</alfresco-viewer>
-</body>
-</html>
diff --git a/ng2-components/ng2-alfresco-viewer/main.ts b/ng2-components/ng2-alfresco-viewer/main.ts
deleted file mode 100644
index 66d3024f3e..0000000000
--- a/ng2-components/ng2-alfresco-viewer/main.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*!
- * @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 {bootstrap} from 'angular2/platform/browser';
-import {ViewerComponent} from './ng2-alfresco-viewer';
-
-bootstrap(ViewerComponent);
diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json
index 71566f0b3b..17f3c4b871 100644
--- a/ng2-components/ng2-alfresco-viewer/package.json
+++ b/ng2-components/ng2-alfresco-viewer/package.json
@@ -1,90 +1,92 @@
 {
-  "keywords": [
-    "viewer",
-    "pdf",
-    "alfresco-component"
-  ],
-  "name": "ng2-alfresco-viewer",
-  "description": "Alfresco documents viewer",
-  "version": "0.1.3",
-  "author": "Eugenio Romano",
-  "scripts": {
-    "typings": "typings install",
-    "start": "npm run build && http-server -c-1 -o -p 8875 .",
-    "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
-    "tslint": "npm run tslint-src && npm run tslint-root",
-    "tslint-src": "tslint -c tslint.json src/**/*.ts",
-    "tslint-root": "tslint -c tslint.json *.ts",
-    "copytemplates": "npm run copy-html && npm run copy-css && npm run copy-i18n",
-    "copy-html": "copyfiles './src/**/*.html' dist",
-    "copy-css": "copyfiles './src/**/*.css' dist",
-    "copy-i18n": "copyfiles './i18n/**/*.json' dist",
-    "licensecheck": "license-check",
-    "tsc": "tsc",
-    "pretest": "npm run build",
-    "test": "karma start karma.conf.js",
-    "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
-    "coverage": "http-server -c-1 -o -p 9875 ./coverage",
-    "prepublish": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/alfresco/ng2-alfresco-viewer.git"
-  },
-  "bugs": {
-    "url": "https://github.com/alfresco/ng2-alfresco-viewer/issues"
-  },
-  "dependencies": {
-    "angular2": "2.0.0-beta.15",
-    "systemjs": "0.19.26",
-    "es6-shim": "^0.35.0",
-    "es6-module-loader": "^0.17.8",
-    "pdfjs-dist": "^1.5.258",
-    "reflect-metadata": "0.1.2",
-    "rxjs": "5.0.0-beta.2",
-    "zone.js": "^0.6.12"
-  },
-  "peerDependencies": {
-    "angular2": "2.0.0-beta.15"
-  },
-  "devDependencies": {
-    "codelyzer": "0.0.19",
-    "copyfiles": "^0.2.1",
-    "coveralls": "^2.11.9",
-    "http-server": "0.8.5",
-    "jasmine-core": "2.4.1",
-    "karma": "~0.12.0",
-    "karma-chrome-launcher": "~1.0.1",
-    "karma-coverage": "^1.0.0",
-    "karma-jasmine": "~1.0.2",
-    "karma-jasmine-ajax": "0.1.12",
-    "karma-mocha-reporter": "^2.0.3",
-    "license-check": "^1.0.4",
-    "remap-istanbul": "^0.6.3",
-    "traceur": "^0.0.91",
-    "tslint": "^3.8.1",
-    "typescript": "^1.8.10",
-    "typings": "^0.7.12",
-    "xo": "^0.14.0",
-    "yargs": "^4.7.0"
-  },
-  "license-check-config": {
-    "src": [
-      "**/*.js",
-      "**/*.ts",
-      "!/**/coverage/**/*",
-      "!/**/demo/**/*",
-      "!/**/node_modules/**/*",
-      "!/**/typings/**/*",
-      "!*.js"
+    "name": "ng2-alfresco-viewer",
+    "description": "Alfresco documents viewer",
+    "version": "0.1.5",
+    "author": "Eugenio Romano",
+    "scripts": {
+        "typings": "typings install",
+        "start": "npm run build && http-server -c-1 -o -p 8875 .",
+        "build": "npm run tslint && typings install && rm -rf dist && tsc && npm run copytemplates && license-check",
+        "tslint": "npm run tslint-src && npm run tslint-root",
+        "tslint-src": "tslint -c tslint.json src/**/*.ts",
+        "tslint-root": "tslint -c tslint.json *.ts",
+        "copytemplates": "npm run copy-html && npm run copy-css && npm run copy-i18n",
+        "copy-html": "copyfiles './src/**/*.html' dist",
+        "copy-css": "copyfiles './src/**/*.css' dist",
+        "copy-i18n": "copyfiles './i18n/**/*.json' dist",
+        "licensecheck": "license-check",
+        "tsc": "tsc",
+        "pretest": "npm run build",
+        "test": "karma start karma.conf.js",
+        "posttest": "node_modules/.bin/remap-istanbul -i coverage/coverage-final.json -o coverage -t html",
+        "coverage": "http-server -c-1 -o -p 9875 ./coverage",
+        "prepublish": "npm run build"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/alfresco/ng2-alfresco-viewer.git"
+    },
+    "bugs": {
+        "url": "https://github.com/alfresco/ng2-alfresco-viewer/issues"
+    },
+    "keywords": [
+        "ng2",
+        "angular",
+        "angular2",
+        "viewer",
+        "pdf",
+        "alfresco-component",
+        "alfresco"
     ],
-    "path": "assets/license_header.txt",
-    "blocking": false,
-    "logInfo": false,
-    "logError": true
-  },
-  "license": "Apache-2.0",
-  "publishConfig": {
-    "registry": "http://devproducts.alfresco.me:4873/"
-  }
+    "dependencies": {
+        "angular2": "2.0.0-beta.15",
+        "es6-module-loader": "^0.17.8",
+        "es6-shim": "^0.35.0",
+        "pdfjs-dist": "^1.5.258",
+        "reflect-metadata": "0.1.2",
+        "rxjs": "5.0.0-beta.2",
+        "systemjs": "0.19.26",
+        "zone.js": "^0.6.12"
+    },
+    "peerDependencies": {
+        "angular2": "2.0.0-beta.15"
+    },
+    "devDependencies": {
+        "copyfiles": "^0.2.1",
+        "coveralls": "^2.11.9",
+        "http-server": "0.8.5",
+        "jasmine-ajax": "^3.2.0",
+        "jasmine-core": "2.4.1",
+        "karma": "~0.13.22",
+        "karma-chrome-launcher": "~1.0.1",
+        "karma-coverage": "^1.0.0",
+        "karma-jasmine": "~1.0.2",
+        "karma-jasmine-ajax": "^0.1.13",
+        "karma-mocha-reporter": "^2.0.3",
+        "license-check": "^1.0.4",
+        "remap-istanbul": "^0.6.3",
+        "traceur": "^0.0.91",
+        "tslint": "^3.8.1",
+        "typescript": "^1.8.10",
+        "typings": "^0.7.12"
+    },
+    "license-check-config": {
+        "src": [
+            "**/*.js",
+            "**/*.ts",
+            "!/**/coverage/**/*",
+            "!/**/demo/**/*",
+            "!/**/node_modules/**/*",
+            "!/**/typings/**/*",
+            "!*.js"
+        ],
+        "path": "assets/license_header.txt",
+        "blocking": false,
+        "logInfo": false,
+        "logError": true
+    },
+    "license": "Apache-2.0",
+    "publishConfig": {
+        "registry": "http://devproducts.alfresco.me:4873/"
+    }
 }
diff --git a/ng2-components/ng2-alfresco-viewer/src/viewer.component.html b/ng2-components/ng2-alfresco-viewer/src/viewer.component.html
index eff57776b3..902d8f80dd 100644
--- a/ng2-components/ng2-alfresco-viewer/src/viewer.component.html
+++ b/ng2-components/ng2-alfresco-viewer/src/viewer.component.html
@@ -6,7 +6,7 @@
             <div class="mdl-layout__header-row">
 
                 <!-- File Title -->
-                <span class="mdl-layout-title">{{nameFile}}</span>
+                <span class="mdl-layout-title">{{urlFile}}</span>
 
                 <!-- pagination toolbar start -->
                 <div id="viewer-toolbar-pagination">
diff --git a/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts b/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts
index 3df07a4114..1f54f4b4bb 100644
--- a/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts
+++ b/ng2-components/ng2-alfresco-viewer/src/viewer.component.ts
@@ -39,10 +39,9 @@ export class ViewerComponent {
     totalPages: number;
 
     ngOnInit() {
-        console.log('A.urlFile ' + this.urlFile);
+        console.log('urlFile ' + this.urlFile);
 
-        this.urlFile = this.urlFile ? this.urlFile : 'localTestFile.pdf';
-        this.nameFile = PDFJS.getFilenameFromUrl(this.loadFile);
+        this.nameFile = PDFJS.getFilenameFromUrl(this.urlFile);
 
         PDFJS.getDocument(this.urlFile).then((pdf) => {
             this.currentPdf = pdf;