diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json
index dc9db510fc..9c4f130165 100644
--- a/demo-shell-ng2/package.json
+++ b/demo-shell-ng2/package.json
@@ -6,7 +6,8 @@
   "scripts": {
     "postinstall": "typings install",
     "clean": "rimraf node_modules typings",
-    "start": "npm run tslint && concurrently \"npm run tsc:w\" \"license-check\"  \"npm run serve\" ",
+    "build": "npm run tslint && npm run tsc && npm run licensecheck",
+    "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run serve\" ",
     "aws": "node app.js",
     "tsc": "tsc",
     "tsc:w": "tsc -w",
diff --git a/ng2-components/ng2-activiti-processlist/demo/browser-sync-config.js b/ng2-components/ng2-activiti-processlist/demo/browser-sync-config.js
deleted file mode 100644
index 2fb5e7fd5d..0000000000
--- a/ng2-components/ng2-activiti-processlist/demo/browser-sync-config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var browserSync = require("browser-sync").create();
-var historyApiFallback = require('connect-history-api-fallback');
-
-browserSync.init({
-
-  server: {
-    baseDir: './',
-    middleware: [ historyApiFallback() ]
-  },
-
-  files: [
-    'index.html',
-    'dist/**/*.{html,htm,css,js}',
-    'node_modules/ng2-alfresco-core/dist/**/*.{html,htm,css,js}',
-    'node_modules/ng2-alfresco-datatable/dist/**/*.{html,htm,css,js}',
-    'node_modules/ng2-alfresco-documentlist/dist/**/*.{html,htm,css,js}',
-    'node_modules/ng2-alfresco-login/dist/**/*.{html,htm,css,js}',
-    'node_modules/ng2-alfresco-search/dist/**/*.{html,htm,css,js}',
-    'node_modules/ng2-alfresco-upload/dist/**/*.{html,htm,css,js}',
-    'node_modules/ng2-alfresco-viewer/dist/**/*.{html,htm,css,js}'],
-
-  reloadDelay: 1000
-});
diff --git a/ng2-components/ng2-activiti-processlist/demo/package.json b/ng2-components/ng2-activiti-processlist/demo/package.json
index e68aadab99..537f57f7fc 100644
--- a/ng2-components/ng2-activiti-processlist/demo/package.json
+++ b/ng2-components/ng2-activiti-processlist/demo/package.json
@@ -8,13 +8,13 @@
     "clean": "rimraf dist node_modules typings",
     "typings": "typings install",
     "postinstall": "npm run typings && npm run build",
-    "start": "npm install && npm run typings && concurrently \"npm run build:w\" \"npm run server\" ",
-    "server": "node browser-sync-config.js",
-    "build": "npm run tslint && rimraf dist && tsc",
-    "build:w": "npm run tslint && rimraf dist && tsc -w",
-    "tslint": "npm run tslint-src && npm run tslint-root",
-    "tslint-src": "tslint -c tslint.json src/**/*.ts",
-    "tslint-root": "tslint -c tslint.json *.ts"
+    "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ",
+    "server": "wsrv -o -s -l",
+    "build": "npm run tslint && rimraf dist && npm run tsc",
+    "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
+    "tsc": "tsc",
+    "tsc:w": "tsc -w",
+    "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts"
   },
   "keywords": [
     "ng2",
@@ -44,13 +44,12 @@
     "material-design-lite": "^1.1.3"
   },
   "devDependencies": {
-    "browser-sync": "^2.10.0",
-    "connect-history-api-fallback": "^1.2.0",
     "concurrently": "^2.0.0",
     "rimraf": "2.5.2",
     "tslint": "^3.8.1",
     "typescript": "^1.8.10",
-    "typings": "^1.0.4"
+    "typings": "^1.0.4",
+    "wsrv": "0.1.3"
   },
   "publishConfig": {
     "registry": "http://devproducts.alfresco.me:4873/"
diff --git a/ng2-components/ng2-activiti-tasklist/demo/package.json b/ng2-components/ng2-activiti-tasklist/demo/package.json
index ad89d4a646..1936ffdd55 100644
--- a/ng2-components/ng2-activiti-tasklist/demo/package.json
+++ b/ng2-components/ng2-activiti-tasklist/demo/package.json
@@ -14,12 +14,12 @@
     "clean": "rimraf dist node_modules typings",
     "postinstall": "npm run typings && npm run build",
     "typings": "typings install",
-    "start": "rimraf dist && npm install && npm run server",
-    "server": "wsrv -o",
-    "build": "npm run tslint && rimraf dist && tsc",
-    "tslint": "npm run tslint-src && npm run tslint-root",
-    "tslint-src": "tslint -c tslint.json src/{,**/}**.ts",
-    "tslint-root": "tslint -c tslint.json *.ts"
+    "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ",
+    "server": "wsrv -o -s -l",
+    "build": "npm run tslint && rimraf dist && npm run tsc",
+    "tsc": "tsc",
+    "tsc:w": "tsc -w",
+    "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts"
   },
   "license": "Apache-2.0",
   "dependencies": {
diff --git a/ng2-components/ng2-alfresco-datatable/demo/package.json b/ng2-components/ng2-alfresco-datatable/demo/package.json
index 00bbf0a050..34516e71b7 100644
--- a/ng2-components/ng2-alfresco-datatable/demo/package.json
+++ b/ng2-components/ng2-alfresco-datatable/demo/package.json
@@ -14,12 +14,12 @@
     "clean": "rimraf dist node_modules typings",
     "postinstall": "npm run typings && npm run build",
     "typings": "typings install",
-    "start": "rimraf dist && npm install && npm run server",
-    "server": "wsrv -o",
-    "build": "npm run tslint && rimraf dist && tsc",
-    "tslint": "npm run tslint-src && npm run tslint-root",
-    "tslint-src": "tslint -c tslint.json src/{,**/}**.ts",
-    "tslint-root": "tslint -c tslint.json *.ts"
+    "build": "npm run tslint && rimraf dist && npm run tsc",
+    "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ",
+    "server": "wsrv -o -l -s",
+    "tsc": "tsc",
+    "tsc:w": "tsc -w",
+    "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts"
   },
   "license": "Apache-2.0",
   "dependencies": {
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json
index 6acd083fe8..019fe149f3 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json
@@ -8,13 +8,13 @@
     "clean": "rimraf dist node_modules typings",
     "typings": "typings install",
     "postinstall": "npm run typings && npm run build",
-    "start": "concurrently \"npm run build:w\" \"npm run server\" ",
+    "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ",
     "server": "wsrv -o -s -l",
-    "build": "npm run tslint && rimraf dist && tsc",
-    "build:w": "npm run tslint && rimraf dist && tsc -w",
-    "tslint": "npm run tslint-src && npm run tslint-root",
-    "tslint-src": "tslint -c tslint.json src/{,**/}**.ts",
-    "tslint-root": "tslint -c tslint.json *.ts"
+    "build": "npm run tslint && rimraf dist && npm run tsc",
+    "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
+    "tsc": "tsc",
+    "tsc:w": "tsc -w",
+    "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts"
   },
   "license": "Apache-2.0",
   "dependencies": {
diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json
index 60c504759f..7a1298cd44 100644
--- a/ng2-components/ng2-alfresco-login/demo/package.json
+++ b/ng2-components/ng2-alfresco-login/demo/package.json
@@ -8,13 +8,13 @@
       "clean": "rimraf dist node_modules typings",
       "typings": "typings install",
       "postinstall": "npm run typings && npm run build",
-      "start": "concurrently \"npm run build:w\" \"npm run server\" ",
+      "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ",
       "server": "wsrv -o -s -l",
       "build": "npm run tslint && rimraf dist && tsc",
       "build:w": "npm run tslint && rimraf dist && tsc -w",
-      "tslint": "npm run tslint-src && npm run tslint-root",
-      "tslint-src": "tslint -c tslint.json src/{,**/}**.ts",
-      "tslint-root": "tslint -c tslint.json *.ts"
+      "tsc": "tsc",
+      "tsc:w": "tsc -w",
+      "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts"
     },
     "license": "Apache-2.0",
     "contributors": [
diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json
index da42286090..8050d2c17e 100644
--- a/ng2-components/ng2-alfresco-search/demo/package.json
+++ b/ng2-components/ng2-alfresco-search/demo/package.json
@@ -8,13 +8,13 @@
     "clean": "rimraf dist node_modules typings",
     "typings": "typings install",
     "postinstall": "npm run typings && npm run build",
-    "start": "concurrently \"npm run build:w\" \"npm run server\" ",
+    "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ",
     "server": "wsrv -o -s -l",
-    "build": "npm run tslint && rimraf dist && tsc",
-    "build:w": "npm run tslint && rimraf dist && tsc -w",
-    "tslint": "npm run tslint-src && npm run tslint-root",
-    "tslint-src": "tslint -c tslint.json src/{,**/}**.ts",
-    "tslint-root": "tslint -c tslint.json *.ts"
+    "build": "npm run tslint && rimraf dist && npm run tsc",
+    "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
+    "tsc": "tsc",
+    "tsc:w": "tsc -w",
+    "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts"
   },
   "license": "Apache-2.0",
   "contributors": [
diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json
index 00c8a2f189..12080cca71 100644
--- a/ng2-components/ng2-alfresco-upload/demo/package.json
+++ b/ng2-components/ng2-alfresco-upload/demo/package.json
@@ -8,13 +8,13 @@
     "clean": "rimraf dist node_modules typings",
     "typings": "typings install",
     "postinstall": "npm run typings && npm run build",
-    "start": "concurrently \"npm run build:w\" \"npm run server\" ",
+    "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ",
     "server": "wsrv -o -l -s",
-    "build": "npm run tslint && rimraf dist && tsc",
-    "build:w": "npm run tslint && rimraf dist && tsc -w",
-    "tslint": "npm run tslint-src && npm run tslint-root",
-    "tslint-src": "tslint -c tslint.json src/{,**/}**.ts",
-    "tslint-root": "tslint -c tslint.json *.ts"
+    "build": "npm run tslint && rimraf dist && npm run tsc",
+    "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
+    "tsc": "tsc",
+    "tsc:w": "tsc -w",
+    "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts"
   },
   "license": "Apache-2.0",
   "contributors": [
diff --git a/ng2-components/ng2-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json
index 70cbdddc35..a5f07f4844 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/package.json
+++ b/ng2-components/ng2-alfresco-viewer/demo/package.json
@@ -8,13 +8,13 @@
     "clean": "rimraf dist node_modules typings",
     "typings": "typings install",
     "postinstall": "npm run typings && npm run build",
-    "start": "concurrently \"npm run build:w\" \"npm run server\" ",
+    "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ",
     "server": "wsrv -o -s -l",
-    "build": "npm run tslint && rimraf dist && tsc",
-    "build:w": "npm run tslint && rimraf dist && tsc -w",
-    "tslint": "npm run tslint-src && npm run tslint-root",
-    "tslint-src": "tslint -c tslint.json src/{,**/}**.ts",
-    "tslint-root": "tslint -c tslint.json *.ts"
+    "build": "npm run tslint && rimraf dist && npm run tsc",
+    "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
+    "tsc": "tsc",
+    "tsc:w": "tsc -w",
+    "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts"
   },
   "license": "Apache-2.0",
   "dependencies": {
diff --git a/ng2-components/ng2-alfresco-webscript/demo/package.json b/ng2-components/ng2-alfresco-webscript/demo/package.json
index b6f2d299c1..fc638bf45a 100644
--- a/ng2-components/ng2-alfresco-webscript/demo/package.json
+++ b/ng2-components/ng2-alfresco-webscript/demo/package.json
@@ -8,13 +8,13 @@
     "clean": "rimraf dist node_modules typings",
     "typings": "typings install",
     "postinstall": "npm run typings && npm run build",
-    "start": "concurrently \"npm run build:w\" \"npm run server\" ",
+    "start": "npm run build && concurrently \"npm run tsc:w\" \"npm run server\" ",
     "server": "wsrv -o -s -l",
-    "build": "npm run tslint && rimraf dist && tsc",
-    "build:w": "npm run tslint && rimraf dist && tsc -w",
-    "tslint": "npm run tslint-src && npm run tslint-root",
-    "tslint-src": "tslint -c tslint.json src/{,**/}**.ts",
-    "tslint-root": "tslint -c tslint.json *.ts"
+    "build": "npm run tslint && rimraf dist && npm run tsc",
+    "build:w": "npm run tslint && rimraf dist && npm run tsc:w",
+    "tsc": "tsc",
+    "tsc:w": "tsc -w",
+    "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json src/{,**/}**.ts"
   },
   "license": "Apache-2.0",
   "dependencies": {