diff --git a/ng2-components/ng2-alfresco-documentlist/demo/.gitignore b/ng2-components/ng2-alfresco-documentlist/demo/.gitignore
index 25beca4c27..e6c43e75af 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/.gitignore
+++ b/ng2-components/ng2-alfresco-documentlist/demo/.gitignore
@@ -4,3 +4,4 @@ coverage
 dist
 typings
 !systemjs.config.js
+!browser-sync-config.js
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/browser-sync-config.js b/ng2-components/ng2-alfresco-documentlist/demo/browser-sync-config.js
new file mode 100644
index 0000000000..8b74c90e8b
--- /dev/null
+++ b/ng2-components/ng2-alfresco-documentlist/demo/browser-sync-config.js
@@ -0,0 +1,22 @@
+var browserSync = require("browser-sync").create();
+var historyApiFallback = require('connect-history-api-fallback');
+
+browserSync.init({
+
+    server: {
+        baseDir: './',
+        middleware: [ historyApiFallback() ]
+    },
+
+    files: [
+        '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-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json
index 1636d77f36..b14243f523 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json
@@ -5,14 +5,14 @@
     "author": "Alfresco Software, Ltd.",
     "main": "index.js",
     "scripts": {
-        "postinstall": "npm run typings && npm run build",
-        "typings": "typings install",
-        "start": "rm -rf dist && npm install && npm run server",
-        "server": "lite-server",
-        "build": "npm run tslint &&  rm -rf 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"
+      "typings": "typings install",
+      "start": "npm install && npm run typings && concurrently \"npm run build:w\" \"npm run server\" ",
+      "server": "node browser-sync-config.js",
+      "build": "npm run tslint &&  rm -rf dist && tsc",
+      "build:w": "npm run tslint &&  rm -rf 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"
     },
     "license": "Apache-2.0",
     "dependencies": {
@@ -29,7 +29,6 @@
     "devDependencies": {
         "browser-sync": "^2.10.0",
         "concurrently": "^2.0.0",
-        "lite-server": "^2.2.0",
         "tslint": "^3.8.1",
         "typescript": "^1.8.10",
         "typings": "^0.7.12"
diff --git a/ng2-components/ng2-alfresco-login/demo/.gitignore b/ng2-components/ng2-alfresco-login/demo/.gitignore
index 25beca4c27..e6c43e75af 100644
--- a/ng2-components/ng2-alfresco-login/demo/.gitignore
+++ b/ng2-components/ng2-alfresco-login/demo/.gitignore
@@ -4,3 +4,4 @@ coverage
 dist
 typings
 !systemjs.config.js
+!browser-sync-config.js
diff --git a/ng2-components/ng2-alfresco-login/demo/browser-sync-config.js b/ng2-components/ng2-alfresco-login/demo/browser-sync-config.js
new file mode 100644
index 0000000000..8b74c90e8b
--- /dev/null
+++ b/ng2-components/ng2-alfresco-login/demo/browser-sync-config.js
@@ -0,0 +1,22 @@
+var browserSync = require("browser-sync").create();
+var historyApiFallback = require('connect-history-api-fallback');
+
+browserSync.init({
+
+    server: {
+        baseDir: './',
+        middleware: [ historyApiFallback() ]
+    },
+
+    files: [
+        '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-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json
index 284f796a42..30c123a8e3 100644
--- a/ng2-components/ng2-alfresco-login/demo/package.json
+++ b/ng2-components/ng2-alfresco-login/demo/package.json
@@ -5,14 +5,14 @@
     "author": "Alfresco Software, Ltd.",
     "main": "index.js",
     "scripts": {
-        "postinstall": "npm run typings && npm run build",
-        "typings": "typings install",
-        "start": "rm -rf dist && npm install && npm run server",
-        "server": "lite-server",
-        "build": "npm run tslint &&  rm -rf 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"
+      "typings": "typings install",
+      "start": "npm install && npm run typings && concurrently \"npm run build:w\" \"npm run server\" ",
+      "server": "node browser-sync-config.js",
+      "build": "npm run tslint &&  rm -rf dist && tsc",
+      "build:w": "npm run tslint &&  rm -rf 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"
     },
     "license": "Apache-2.0",
     "contributors": [
@@ -57,7 +57,6 @@
     "devDependencies": {
         "browser-sync": "^2.10.0",
         "concurrently": "^2.0.0",
-        "lite-server": "^2.2.0",
         "tslint": "^3.8.1",
         "typescript": "^1.8.10",
         "typings": "^0.7.12"
diff --git a/ng2-components/ng2-alfresco-search/demo/.gitignore b/ng2-components/ng2-alfresco-search/demo/.gitignore
new file mode 100644
index 0000000000..e6c43e75af
--- /dev/null
+++ b/ng2-components/ng2-alfresco-search/demo/.gitignore
@@ -0,0 +1,7 @@
+node_modules
+.idea
+coverage
+dist
+typings
+!systemjs.config.js
+!browser-sync-config.js
diff --git a/ng2-components/ng2-alfresco-search/demo/browser-sync-config.js b/ng2-components/ng2-alfresco-search/demo/browser-sync-config.js
new file mode 100644
index 0000000000..8b74c90e8b
--- /dev/null
+++ b/ng2-components/ng2-alfresco-search/demo/browser-sync-config.js
@@ -0,0 +1,22 @@
+var browserSync = require("browser-sync").create();
+var historyApiFallback = require('connect-history-api-fallback');
+
+browserSync.init({
+
+    server: {
+        baseDir: './',
+        middleware: [ historyApiFallback() ]
+    },
+
+    files: [
+        '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-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json
index 6a9c5a5d88..c48f6a9052 100644
--- a/ng2-components/ng2-alfresco-search/demo/package.json
+++ b/ng2-components/ng2-alfresco-search/demo/package.json
@@ -5,11 +5,11 @@
   "author": "Alfresco Software, Ltd.",
   "main": "index.js",
   "scripts": {
-    "postinstall": "npm run typings && npm run build",
     "typings": "typings install",
-    "start": "rm -rf dist && npm install && npm run server",
-    "server": "lite-server",
+    "start": "npm install && npm run typings && concurrently \"npm run build:w\" \"npm run server\" ",
+    "server": "node browser-sync-config.js",
     "build": "npm run tslint &&  rm -rf dist && tsc",
+    "build:w": "npm run tslint &&  rm -rf 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"
@@ -57,7 +57,6 @@
   "devDependencies": {
     "browser-sync": "^2.10.0",
     "concurrently": "^2.0.0",
-    "lite-server": "^2.2.0",
     "tslint": "^3.8.1",
     "typescript": "^1.8.10",
     "typings": "^0.7.12"
diff --git a/ng2-components/ng2-alfresco-upload/demo/.gitignore b/ng2-components/ng2-alfresco-upload/demo/.gitignore
index 9dbe0808ae..c43a12314d 100644
--- a/ng2-components/ng2-alfresco-upload/demo/.gitignore
+++ b/ng2-components/ng2-alfresco-upload/demo/.gitignore
@@ -3,3 +3,4 @@ node_modules/
 .idea
 dist/\
 !systemjs.config.js
+!browser-sync-config.js
diff --git a/ng2-components/ng2-alfresco-upload/demo/browser-sync-config.js b/ng2-components/ng2-alfresco-upload/demo/browser-sync-config.js
new file mode 100644
index 0000000000..8b74c90e8b
--- /dev/null
+++ b/ng2-components/ng2-alfresco-upload/demo/browser-sync-config.js
@@ -0,0 +1,22 @@
+var browserSync = require("browser-sync").create();
+var historyApiFallback = require('connect-history-api-fallback');
+
+browserSync.init({
+
+    server: {
+        baseDir: './',
+        middleware: [ historyApiFallback() ]
+    },
+
+    files: [
+        '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-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json
index b11e4f1f1e..999eef24bd 100644
--- a/ng2-components/ng2-alfresco-upload/demo/package.json
+++ b/ng2-components/ng2-alfresco-upload/demo/package.json
@@ -5,11 +5,11 @@
   "author": "Alfresco Software, Ltd.",
   "main": "index.js",
   "scripts": {
-    "postinstall": "npm run typings && npm run build",
     "typings": "typings install",
-    "start": "rm -rf dist && npm install && npm run server",
-    "server": "lite-server",
+    "start": "npm install && npm run typings && concurrently \"npm run build:w\" \"npm run server\" ",
+    "server": "node browser-sync-config.js",
     "build": "npm run tslint &&  rm -rf dist && tsc",
+    "build:w": "npm run tslint &&  rm -rf 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"
@@ -57,7 +57,6 @@
   "devDependencies": {
     "browser-sync": "^2.10.0",
     "concurrently": "^2.0.0",
-    "lite-server": "^2.2.0",
     "tslint": "^3.8.1",
     "typescript": "^1.8.10",
     "typings": "^0.7.12"
diff --git a/ng2-components/ng2-alfresco-viewer/demo/.gitignore b/ng2-components/ng2-alfresco-viewer/demo/.gitignore
index 25beca4c27..e6c43e75af 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/.gitignore
+++ b/ng2-components/ng2-alfresco-viewer/demo/.gitignore
@@ -4,3 +4,4 @@ coverage
 dist
 typings
 !systemjs.config.js
+!browser-sync-config.js
diff --git a/ng2-components/ng2-alfresco-viewer/demo/browser-sync-config.js b/ng2-components/ng2-alfresco-viewer/demo/browser-sync-config.js
new file mode 100644
index 0000000000..8b74c90e8b
--- /dev/null
+++ b/ng2-components/ng2-alfresco-viewer/demo/browser-sync-config.js
@@ -0,0 +1,22 @@
+var browserSync = require("browser-sync").create();
+var historyApiFallback = require('connect-history-api-fallback');
+
+browserSync.init({
+
+    server: {
+        baseDir: './',
+        middleware: [ historyApiFallback() ]
+    },
+
+    files: [
+        '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-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json
index 3679d8791e..19ba832bff 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/package.json
+++ b/ng2-components/ng2-alfresco-viewer/demo/package.json
@@ -5,11 +5,11 @@
     "author": "Alfresco Software, Ltd.",
     "main": "index.js",
     "scripts": {
-        "postinstall": "npm run typings && npm run build",
         "typings": "typings install",
-        "start": "rm -rf dist && npm install && npm run server",
-        "server": "lite-server",
+        "start": "npm install && npm run typings && concurrently \"npm run build:w\" \"npm run server\" ",
+        "server": "node browser-sync-config.js",
         "build": "npm run tslint &&  rm -rf dist && tsc",
+        "build:w": "npm run tslint &&  rm -rf 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"
@@ -29,7 +29,6 @@
     "devDependencies": {
         "browser-sync": "^2.10.0",
         "concurrently": "^2.0.0",
-        "lite-server": "^2.2.0",
         "tslint": "^3.8.1",
         "typescript": "^1.8.10",
         "typings": "^0.7.12"