diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index b4c2b516d8..4f0c2b3251 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -5,7 +5,8 @@
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "typings": "typings install",
-    "start": "npm run test && http-server -c-1 -o -p 8875 .",
+    "start": "npm run build && npm run server",
+    "server": "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",
diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json
index 9bf0f308cc..97a8b21712 100644
--- a/ng2-components/ng2-alfresco-datatable/package.json
+++ b/ng2-components/ng2-alfresco-datatable/package.json
@@ -5,7 +5,8 @@
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "typings": "typings install",
-    "start": "npm run test && http-server -c-1 -o -p 8875 .",
+    "start": "npm run build && npm run server",
+    "server": "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",
diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json
index a370cfdcae..0487a79c54 100644
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -5,7 +5,8 @@
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "typings": "typings install",
-    "start": "npm run test && http-server -c-1 -o -p 8875 .",
+    "start": "npm run build && npm run server",
+    "server": "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",
diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json
index f2b769f038..001cd889a6 100644
--- a/ng2-components/ng2-alfresco-login/package.json
+++ b/ng2-components/ng2-alfresco-login/package.json
@@ -5,7 +5,8 @@
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "typings": "typings install",
-    "start": "npm run test && http-server -c-1 -o -p 8875 .",
+    "start": "npm run build && npm run server",
+    "server": "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 && npm run tslint-demo",
     "tslint-src": "tslint -c tslint.json src/**/*.ts",
diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json
index 9351e5f9d2..0b7ba8a145 100644
--- a/ng2-components/ng2-alfresco-search/package.json
+++ b/ng2-components/ng2-alfresco-search/package.json
@@ -5,7 +5,8 @@
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "typings": "typings install",
-    "start": "http-server -c-1 -o -p 8875 .",
+    "start": "npm run build && npm run server",
+    "server": "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",
diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json
index e7a6a50b52..d3b9fda0ae 100644
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -5,7 +5,8 @@
   "author": "Alfresco Software, Ltd.",
   "scripts": {
     "typings": "typings install",
-    "start": "npm run test && http-server -c-1 -o -p 8875 .",
+    "start": "npm run build && npm run server",
+    "server": "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",
diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json
index 58494e3b6d..5f09a0d092 100644
--- a/ng2-components/ng2-alfresco-viewer/package.json
+++ b/ng2-components/ng2-alfresco-viewer/package.json
@@ -1,98 +1,100 @@
 {
-    "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"
-    },
-    "contributors": [
-        {
-            "name": "Eugenio Romano",
-            "email": "eugenio.romano@alfresco.com"
-        }
-    ],
-    "keywords": [
-        "ng2",
-        "angular",
-        "angular2",
-        "viewer",
-        "pdf",
-        "alfresco-component",
-        "alfresco"
-    ],
-    "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/"
+  "name": "ng2-alfresco-viewer",
+  "description": "Alfresco documents viewer",
+  "version": "0.1.5",
+  "author": "Eugenio Romano",
+  "scripts": {
+    "typings": "typings install",
+    "start": "npm run build && npm run server",
+    "server": "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"
+  },
+  "contributors": [
+    {
+      "name": "Eugenio Romano",
+      "email": "eugenio.romano@alfresco.com"
     }
+  ],
+  "keywords": [
+    "ng2",
+    "angular",
+    "angular2",
+    "viewer",
+    "pdf",
+    "alfresco-component",
+    "alfresco"
+  ],
+  "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-jasmine-html-reporter": "^0.2.0",
+    "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/"
+  }
 }