diff --git a/BUILD.md b/BUILD.md
index 2a8dce4bb4..f39dbc7ebc 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -36,7 +36,7 @@ npm install && cd Tools && npm install
 # Building the Electron application
 
 ```
-rsync --delete -a ReactNativeClient/lib/ ElectronClient/app/lib/
+npm run copyLib
 npm run tsc
 cd ElectronClient/app
 npm install
diff --git a/Tools/build-all.sh b/Tools/build-all.sh
index bc748edbf7..3d1962fdf3 100755
--- a/Tools/build-all.sh
+++ b/Tools/build-all.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+# TODO: When the apidoc command fails, it copy the failure in api.md, but shouldn't be doing that
 "$ROOT_DIR/../CliClient/run.sh" apidoc > "$ROOT_DIR/../readme/api.md" && node "$ROOT_DIR/update-readme-download.js" && node "$ROOT_DIR/build-release-stats.js" && node "$ROOT_DIR/build-welcome.js" && node "$ROOT_DIR/build-website.js" && git add -A && git commit -m "Update website" && git pull && git push
\ No newline at end of file
diff --git a/package.json b/package.json
index deaf43c48b..523ec23279 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,8 @@
     "linter": "./node_modules/.bin/eslint --fix --ext .js --ext .jsx --ext .ts --ext .tsx",
     "linter-ci": "./node_modules/.bin/eslint --ext .js --ext .jsx --ext .ts --ext .tsx",
     "tsc": "tsc",
-    "tsc-watch": "tsc --watch"
+    "tsc-watch": "tsc --watch",
+    "copyLib": "rsync --delete -a ReactNativeClient/lib/ ElectronClient/app/lib/"
   },
   "husky": {
     "hooks": {
diff --git a/tsconfig.json b/tsconfig.json
index 209e96160d..675ec4631f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,12 +16,9 @@
 		"jsx": "react",
 	},
     "include": [
-        "ReactNativeClient/**/*.ts",
-        "ReactNativeClient/**/*.tsx",
-        "ElectronClient/**/*.ts",
-        "ElectronClient/**/*.tsx",
-        "CliClient/**/*.ts",
-        "CliClient/**/*.tsx",
+        "ReactNativeClient/**/*",
+        "ElectronClient/**/*",
+        "CliClient/**/*",
 	],
 	"exclude": [
 		"**/node_modules",