diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json
index a6605db063..c607bc2b6d 100644
--- a/ng2-components/ng2-alfresco-core/package.json
+++ b/ng2-components/ng2-alfresco-core/package.json
@@ -70,8 +70,7 @@
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
-    "ng2-translate": "2.2.2",
-    "rimraf": "2.5.2"
+    "ng2-translate": "2.2.2"
   },
   "peerDependencies": {
     "material-design-icons": "^2.2.3",
@@ -91,6 +90,7 @@
     "karma-mocha-reporter": "2.0.3",
     "license-check": "1.1.5",
     "remap-istanbul": "0.6.3",
+    "rimraf": "2.5.2",
     "traceur": "0.0.91",
     "tslint": "3.8.1",
     "typescript": "1.8.10",
diff --git a/ng2-components/ng2-alfresco-datatable/demo/package.json b/ng2-components/ng2-alfresco-datatable/demo/package.json
index f54af6007b..5396ef02ef 100644
--- a/ng2-components/ng2-alfresco-datatable/demo/package.json
+++ b/ng2-components/ng2-alfresco-datatable/demo/package.json
@@ -40,7 +40,6 @@
     "zone.js": "0.6.12",
     "license-check": "1.1.5",
 
-    "rimraf": "2.5.2",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.1.3",
     "ng2-translate": "2.2.2",
@@ -51,6 +50,7 @@
   "devDependencies": {
     "browser-sync": "2.10.0",
     "concurrently": "2.0.0",
+    "rimraf": "2.5.2",
     "tslint": "3.8.1",
     "typescript": "1.8.10",
     "typings": "1.0.4",
diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json
index 745a109906..efdbb26b6c 100644
--- a/ng2-components/ng2-alfresco-datatable/package.json
+++ b/ng2-components/ng2-alfresco-datatable/package.json
@@ -67,7 +67,6 @@
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
-    "rimraf": "2.5.2",
     "ng2-translate": "2.2.2",
     "ng2-alfresco-core": "0.2.0"
   },
@@ -89,6 +88,7 @@
     "karma-mocha-reporter": "2.0.3",
     "license-check": "1.1.5",
     "remap-istanbul": "0.6.3",
+    "rimraf": "2.5.2",
     "traceur": "0.0.91",
     "tslint": "3.8.1",
     "typescript": "1.8.10",
diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json
index 16770e03fc..5d3947d2ad 100644
--- a/ng2-components/ng2-alfresco-documentlist/demo/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json
@@ -1,51 +1,51 @@
 {
-    "name": "ng2-alfresco-documentlist-demo",
-    "description": "Alfresco Angular2 Documentlist Component - Demo",
-    "version": "0.1.0",
-    "author": "Alfresco Software, Ltd.",
-    "main": "index.js",
-    "scripts": {
-      "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\" ",
-      "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"
-    },
-    "license": "Apache-2.0",
-    "dependencies": {
-      "@angular/common": "2.0.0-rc.3",
-      "@angular/compiler": "2.0.0-rc.3",
-      "@angular/core": "2.0.0-rc.3",
-      "@angular/forms": "0.1.1",
-      "@angular/http": "2.0.0-rc.3",
-      "@angular/platform-browser": "2.0.0-rc.3",
-      "@angular/platform-browser-dynamic": "2.0.0-rc.3",
-      "@angular/router": "3.0.0-alpha.7",
-      "@angular/router-deprecated": "2.0.0-rc.2",
-      "@angular/upgrade": "2.0.0-rc.3",
-      "systemjs": "0.19.27",
-      "core-js": "2.4.0",
-      "reflect-metadata": "0.1.3",
-      "rxjs": "5.0.0-beta.6",
-      "zone.js": "0.6.12",
+  "name": "ng2-alfresco-documentlist-demo",
+  "description": "Alfresco Angular2 Documentlist Component - Demo",
+  "version": "0.1.0",
+  "author": "Alfresco Software, Ltd.",
+  "main": "index.js",
+  "scripts": {
+    "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\" ",
+    "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"
+  },
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@angular/common": "2.0.0-rc.3",
+    "@angular/compiler": "2.0.0-rc.3",
+    "@angular/core": "2.0.0-rc.3",
+    "@angular/forms": "0.1.1",
+    "@angular/http": "2.0.0-rc.3",
+    "@angular/platform-browser": "2.0.0-rc.3",
+    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
+    "@angular/router": "3.0.0-alpha.7",
+    "@angular/router-deprecated": "2.0.0-rc.2",
+    "@angular/upgrade": "2.0.0-rc.3",
+    "systemjs": "0.19.27",
+    "core-js": "2.4.0",
+    "reflect-metadata": "0.1.3",
+    "rxjs": "5.0.0-beta.6",
+    "zone.js": "0.6.12",
 
-      "rimraf": "2.5.2",
-      "material-design-icons": "2.2.3",
-      "material-design-lite": "1.1.3",
-      "ng2-translate": "2.2.2",
+    "material-design-icons": "2.2.3",
+    "material-design-lite": "1.1.3",
+    "ng2-translate": "2.2.2",
 
-      "alfresco-js-api": "0.1.0",
-      "ng2-alfresco-core": "0.1.36",
-      "ng2-alfresco-documentlist": "0.1.34",
-      "ng2-alfresco-datatable": "0.1.17"
+     "alfresco-js-api": "0.1.0",
+     "ng2-alfresco-core": "0.1.36",
+     "ng2-alfresco-documentlist": "0.1.34",
+     "ng2-alfresco-datatable": "0.1.17"
     },
     "devDependencies": {
       "concurrently": "2.0.0",
+      "rimraf": "2.5.2",
       "tslint": "3.8.1",
       "typescript": "1.8.10",
       "typings": "1.0.4",
diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json
index 10ca4f881d..992ab6920d 100644
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -76,7 +76,6 @@
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
-    "rimraf": "2.5.2",
     "ng2-translate": "2.2.2",
     "ng2-alfresco-core": "0.2.0",
 	"ng2-alfresco-datatable": "0.2.0",
@@ -100,6 +99,7 @@
     "karma-jasmine-html-reporter": "0.2.0",
     "license-check": "1.1.5",
     "remap-istanbul": "0.6.3",
+    "rimraf": "2.5.2",
     "traceur": "0.0.91",
     "tslint": "3.8.1",
     "typescript": "1.8.10",
diff --git a/ng2-components/ng2-alfresco-login/demo/package.json b/ng2-components/ng2-alfresco-login/demo/package.json
index fe9bef8c9b..1a560baa48 100644
--- a/ng2-components/ng2-alfresco-login/demo/package.json
+++ b/ng2-components/ng2-alfresco-login/demo/package.json
@@ -62,7 +62,6 @@
       "rxjs": "5.0.0-beta.6",
       "zone.js": "0.6.12",
 
-      "rimraf": "2.5.2",
       "material-design-icons": "2.2.3",
       "material-design-lite": "1.1.3",
       "ng2-translate": "2.2.2",
@@ -73,6 +72,7 @@
     },
     "devDependencies": {
       "concurrently": "^2.0.0",
+      "rimraf": "2.5.2",
       "tslint": "^3.8.1",
       "typescript": "^1.8.10",
       "typings": "^1.0.4",
diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json
index bb98419089..9d892fa2d4 100644
--- a/ng2-components/ng2-alfresco-login/package.json
+++ b/ng2-components/ng2-alfresco-login/package.json
@@ -80,7 +80,6 @@
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
-    "rimraf": "2.5.2",
     "ng2-translate": "2.2.2",
     "ng2-alfresco-core": "0.2.0",
     "alfresco-js-api": "^0.1.0",
@@ -100,6 +99,7 @@
     "karma-jasmine-html-reporter": "0.2.0",
     "license-check": "1.1.5",
     "remap-istanbul": "0.6.3",
+    "rimraf": "2.5.2",
     "traceur": "0.0.91",
     "tslint": "3.8.1",
     "typescript": "1.8.10",
diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json
index 31fea78d7f..b546dee5e5 100644
--- a/ng2-components/ng2-alfresco-search/demo/package.json
+++ b/ng2-components/ng2-alfresco-search/demo/package.json
@@ -6,8 +6,8 @@
   "main": "index.js",
   "scripts": {
     "clean": "rimraf dist node_modules typings",
-    "postinstall": "npm run typings && npm run build",
     "typings": "typings install",
+    "postinstall": "npm run typings && npm run build",
     "start": "concurrently \"npm run build:w\" \"npm run server\" ",
     "server": "wsrv -o -s -l",
     "build": "npm run tslint && rimraf dist && tsc",
@@ -62,7 +62,6 @@
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
 
-    "rimraf": "2.5.2",
     "ng2-translate": "2.2.2",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.1.3",
@@ -73,6 +72,7 @@
   },
   "devDependencies": {
     "concurrently": "2.0.0",
+    "rimraf": "2.5.2",
     "tslint": "3.8.1",
     "typescript": "1.8.10",
     "typings": "1.0.4",
diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json
index 75292f2645..e9d1340175 100644
--- a/ng2-components/ng2-alfresco-search/package.json
+++ b/ng2-components/ng2-alfresco-search/package.json
@@ -48,6 +48,10 @@
     {
       "name": "Denys Vuika",
       "email": "denys.vuika@alfresco.com"
+    },
+    {
+      "name": "Eugenio Romano",
+      "email": "eugenio.romano@alfresco.com"
     }
   ],
   "keywords": [
@@ -72,7 +76,6 @@
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
-    "rimraf": "2.5.2",
     "ng2-translate": "2.2.2",
     "material-design-lite": "1.1.3",
     "alfresco-js-api": "^0.1.0",
@@ -95,6 +98,7 @@
     "karma-mocha-reporter": "2.0.3",
     "karma-jasmine-html-reporter": "0.2.0",
     "license-check": "1.1.5",
+    "rimraf": "2.5.2",
     "remap-istanbul": "0.6.3",
     "traceur": "0.0.91",
     "tslint": "3.8.1",
diff --git a/ng2-components/ng2-alfresco-upload/demo/package.json b/ng2-components/ng2-alfresco-upload/demo/package.json
index eeb06d4178..5287fd1960 100644
--- a/ng2-components/ng2-alfresco-upload/demo/package.json
+++ b/ng2-components/ng2-alfresco-upload/demo/package.json
@@ -62,7 +62,6 @@
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
 
-    "rimraf": "2.5.2",
     "ng2-translate": "2.2.2",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.1.3",
@@ -73,6 +72,7 @@
   },
   "devDependencies": {
     "concurrently": "2.0.0",
+    "rimraf": "2.5.2",
     "tslint": "3.8.1",
     "typescript": "1.8.10",
     "typings": "1.0.4",
diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json
index acf24a2719..cb38e6e16e 100644
--- a/ng2-components/ng2-alfresco-upload/package.json
+++ b/ng2-components/ng2-alfresco-upload/package.json
@@ -75,7 +75,6 @@
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
-    "rimraf": "2.5.2",
     "ng2-translate": "2.2.2",
     "alfresco-js-api": "^0.1.0",
     "ng2-alfresco-core": "0.2.0"
@@ -100,6 +99,7 @@
     "karma-mocha-reporter": "2.0.3",
     "license-check": "1.1.5",
     "remap-istanbul": "0.6.3",
+    "rimraf": "2.5.2",
     "traceur": "0.0.91",
     "tslint": "3.8.1",
     "typescript": "1.8.10",
diff --git a/ng2-components/ng2-alfresco-viewer/demo/package.json b/ng2-components/ng2-alfresco-viewer/demo/package.json
index 0d61719895..d5976d2cd2 100644
--- a/ng2-components/ng2-alfresco-viewer/demo/package.json
+++ b/ng2-components/ng2-alfresco-viewer/demo/package.json
@@ -34,7 +34,6 @@
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
 
-    "rimraf": "2.5.2",
     "material-design-icons": "2.2.3",
     "material-design-lite": "1.1.3",
     "pdfjs-dist": "1.5.258",
@@ -43,6 +42,7 @@
   },
   "devDependencies": {
     "concurrently": "2.0.0",
+    "rimraf": "2.5.2",
     "tslint": "3.8.1",
     "typescript": "1.8.10",
     "typings": "1.0.4",
diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json
index 03f9015c47..716745232b 100644
--- a/ng2-components/ng2-alfresco-viewer/package.json
+++ b/ng2-components/ng2-alfresco-viewer/package.json
@@ -68,7 +68,6 @@
     "reflect-metadata": "0.1.3",
     "rxjs": "5.0.0-beta.6",
     "zone.js": "0.6.12",
-    "rimraf": "2.5.2",
     "pdfjs-dist": "1.5.258"
   },
   "peerDependencies": {
@@ -92,6 +91,7 @@
     "karma-mocha-reporter": "2.0.3",
     "license-check": "1.1.5",
     "remap-istanbul": "0.6.3",
+    "rimraf": "2.5.2",
     "traceur": "0.0.91",
     "tslint": "3.8.1",
     "typescript": "1.8.10",