diff --git a/lib/README.md b/lib/README.md
index 0d16c4ce24..811e737f93 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -1,40 +1,5 @@
 # Alfresco Angular Components
 
-<!-- markdown-toc start - Don't edit this section.  npm run toc to generate it-->
-
-<!-- toc -->
-
-- [Documentation](#documentation)
-- [Build from sources](#build-from-sources)
-- [NPM scripts](#npm-scripts)
-
-<!-- tocstop -->
-
-<!-- markdown-toc end -->
-
-## Documentation
-
 The [docs index](../docs/README.md) lists all available documentation for components and
 also includes a user guide that explains techniques in greater detail.
 
-
-## Build from sources
-
-You can build component from sources with the following commands:
-
-```sh
-npm install
-npm run build
-```
-
-> The `build` task rebuilds all the code, runs tslint, license checks 
-> and other quality check tools before performing unit testing.
-
-## NPM scripts
-
-| Command | Description |
-| --- | --- |
-| npm run build | Build component |
-| npm run test | Run unit tests in the console |
-| npm run test-browser | Run unit tests in the browser
-| npm run coverage | Run unit tests and display code coverage report |
diff --git a/lib/package.json b/lib/package.json
deleted file mode 100644
index b2374a09dc..0000000000
--- a/lib/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "alfresco-components",
-  "description": "Alfresco Angular components",
-  "version": "2.4.0-beta2",
-  "author": "Alfresco Software, Ltd.",
-  "main": "./index.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Alfresco/alfresco-ng2-components.git"
-  },
-  "bugs": {
-    "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
-  },
-  "keywords": [
-    "alfresco-components",
-    "angular",
-    "typescript",
-    "alfresco",
-    "activiti",
-    "content services",
-    "process services"
-  ],
-  "license": "Apache-2.0",
-  "engines": {
-    "node": ">=6.0.0"
-  },
-  "module": "./index.js",
-  "typings": "./index.d.ts"
-}
diff --git a/scripts/update-version.sh b/scripts/update-version.sh
index 082ea873e8..fa9c75bfe3 100755
--- a/scripts/update-version.sh
+++ b/scripts/update-version.sh
@@ -99,12 +99,24 @@ version_js_change() {
     DIFFERENT_JS_API=true
 }
 
+only_demoshell() {
+    echo "====== UPDATE Only the demo shell versions ====="
+    EXEC_COMPONENT=false
+}
+
+
 update_component_version() {
    echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======"
-   DESTDIR="$DIR/../lib/${1}"
+   DESTDIR="$DIR/../${1}"
    sed "${sedi[@]}" "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g"  ${DESTDIR}/package.json
 }
 
+clean_lock() {
+   echo "====== clean lock file ${1} ======"
+   DESTDIR="$DIR/../lib/${1}"
+   rm ${DESTDIR}/package-lock.json
+}
+
 update_component_dependency_version(){
    DESTDIR="$DIR/../lib/${1}"
 
@@ -119,31 +131,20 @@ update_component_dependency_version(){
     done
 }
 
+update_total_build_dependency_version(){
+   DESTDIR="$DIR/../"
+
+   for (( j=0; j<${projectslength}; j++ ));
+    do
+       echo "====== UPDATE TOTAL BUILD DEPENDENCY VERSION of .* to ~${VERSION} in ${1}======"
+       sed "${sedi[@]}" "s/\"${prefix}${projects[$j]}\": \".*\"/\"${prefix}${projects[$j]}\": \"${VERSION}\"/g"  ${DESTDIR}/package.json
+       sed "${sedi[@]}" "s/\"${prefix}${projects[$j]}\": \"~.*\"/\"${prefix}${projects[$j]}\": \"~${VERSION}\"/g"  ${DESTDIR}/package.json
+       sed "${sedi[@]}" "s/\"${prefix}${projects[$j]}\": \"^.*\"/\"${prefix}${projects[$j]}\": \"^${VERSION}\"/g"  ${DESTDIR}/package.json
+     done
+}
+
 update_total_build_dependency_js_version(){
     echo "====== UPDATE DEPENDENCY VERSION alfresco-js-api total build to ~${1} in ${DESTDIR}======"
-    DESTDIR="$DIR/../lib/"
-    PACKAGETOCHANGE="alfresco-js-api"
-
-    sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \".*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g"  ${DESTDIR}/package.json
-    sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~.*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g"  ${DESTDIR}/package.json
-    sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"^.*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g"  ${DESTDIR}/package.json
-}
-
-update_dependency_version(){
-
-   for (( k=0; k<${projectslength}; k++ ));
-   do
-    echo "====== UPDATE  ${projects[$k]} version ${VERSION} ======"
-    DESTDIR="$DIR/.."
-
-       sed "${sedi[@]}" "s/\"${prefix}${projects[$k]}\": \".*\"/\"${prefix}${projects[$k]}\": \"${VERSION}\"/g"  ${DESTDIR}/package.json
-       sed "${sedi[@]}" "s/\"${prefix}${projects[$k]}\": \"~.*\"/\"${prefix}${projects[$k]}\": \"~${VERSION}\"/g"  ${DESTDIR}/package.json
-       sed "${sedi[@]}" "s/\"${prefix}${projects[$k]}\": \"^.*\"/\"${prefix}${projects[$k]}\": \"^${VERSION}\"/g"  ${DESTDIR}/package.json
-   done
-}
-
-update_js_version(){
-    echo "====== UPDATE VERSION alfresco-js-api version ${1} ======"
     DESTDIR="$DIR/../"
     PACKAGETOCHANGE="alfresco-js-api"
 
@@ -152,9 +153,44 @@ update_js_version(){
     sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"^.*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g"  ${DESTDIR}/package.json
 }
 
-clean_lock(){
-   echo "====== clean lock file  ======"
-    DESTDIR="$DIR/.."
+update_component_js_version(){
+   echo "====== UPDATE DEPENDENCY VERSION of alfresco-js-api in ${1} to ${2} ======"
+   DESTDIR="$DIR/../lib/${1}"
+
+   PACKAGETOCHANGE="alfresco-js-api"
+
+   sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \".*\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g"  ${DESTDIR}/package.json
+   sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~.*\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g"  ${DESTDIR}/package.json
+   sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"^.*\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g"  ${DESTDIR}/package.json
+
+}
+
+update_demo_shell_dependency_version(){
+
+   for (( k=0; k<${projectslength}; k++ ));
+   do
+    echo "====== UPDATE VERSION OF DEMO-SHELL to ${projects[$k]} version ${VERSION} ======"
+    DESTDIR="$DIR/../demo-shell/"
+
+       sed "${sedi[@]}" "s/\"${prefix}${projects[$k]}\": \".*\"/\"${prefix}${projects[$k]}\": \"${VERSION}\"/g"  ${DESTDIR}/package.json
+       sed "${sedi[@]}" "s/\"${prefix}${projects[$k]}\": \"~.*\"/\"${prefix}${projects[$k]}\": \"~${VERSION}\"/g"  ${DESTDIR}/package.json
+       sed "${sedi[@]}" "s/\"${prefix}${projects[$k]}\": \"^.*\"/\"${prefix}${projects[$k]}\": \"^${VERSION}\"/g"  ${DESTDIR}/package.json
+   done
+}
+
+update_demo_shell_js_version(){
+    echo "====== UPDATE VERSION OF DEMO-SHELL to  alfresco-js-api version ${1} ======"
+    DESTDIR="$DIR/../demo-shell/"
+    PACKAGETOCHANGE="alfresco-js-api"
+
+    sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \".*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g"  ${DESTDIR}/package.json
+    sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~.*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g"  ${DESTDIR}/package.json
+    sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"^.*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g"  ${DESTDIR}/package.json
+}
+
+clean_lock_demo_shell(){
+   echo "====== clean lock file demo-shell ======"
+    DESTDIR="$DIR/../demo-shell/"
     rm ${DESTDIR}/package-lock.json
 }
 
@@ -196,30 +232,46 @@ if $EXEC_COMPONENT == true; then
     # use for loop to read all values and indexes
     for (( i=0; i<${projectslength}; i++ ));
     do
+       clean_lock ${projects[$i]}
        echo "====== UPDATE COMPONENT ${projects[$i]} ======"
        update_component_version ${projects[$i]}
        update_component_dependency_version ${projects[$i]}
 
+       if $JS_API == true; then
+
+        if $DIFFERENT_JS_API == true; then
+            update_component_js_version ${projects[$i]} ${VERSION_JS_API}
+        else
+            update_component_js_version ${projects[$i]} ${VERSION}
+        fi
+
+       fi
     done
+
+    echo "====== UPDATE TOTAL BUILD======"
+
+    update_total_build_dependency_version
+
+    if $JS_API == true; then
+        if $DIFFERENT_JS_API == true; then
+            update_total_build_dependency_js_version ${VERSION_JS_API}
+        else
+            update_total_build_dependency_js_version ${VERSION}
+        fi
+    fi
 fi
 
 echo "====== UPDATE DEMO SHELL ======"
 
-DESTDIR="$DIR/../demo-shell/"
-sed "${sedi[@]}" "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g"  ${DIR}/../demo-shell/package.json
+clean_lock_demo_shell
 
-
-echo "====== UPDATE GLOBAL======"
-
-clean_lock
-
-update_dependency_version
+update_demo_shell_dependency_version
 
 if $JS_API == true; then
     if $DIFFERENT_JS_API == true; then
-        update_js_version ${VERSION_JS_API}
+        update_demo_shell_js_version ${VERSION_JS_API}
     else
-        update_js_version ${VERSION}
+        update_demo_shell_js_version ${VERSION}
     fi
 fi
 
@@ -227,5 +279,5 @@ DESTDIR="$DIR/../demo-shell/"
 sed "${sedi[@]}" "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g"  ${DIR}/../demo-shell/package.json
 
 if $EXEC_COMPONENT == true; then
-    sed "${sedi[@]}" "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g"  ${DIR}/../lib/package.json
+    sed "${sedi[@]}" "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g"  ${DIR}/../package.json
 fi