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 c8451a599b..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": "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
 ]);