diff --git a/build_all b/build_all
index e8806b99f1f24b85bd7d38ac5c945c40a3633509..cd98f7eab0f615b37c701b65ae8559c9a2296fd4 100755
--- a/build_all
+++ b/build_all
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-chmod o-rwx $0
+chmod o-rwx $(dirname $0)
 make -C src/pip-install-to-json REPO=$(pwd)/repo STATE=$(pwd)/state install
 make -C src/mbed-cli REPO=$(pwd)/repo STATE=$(pwd)/state build
diff --git a/src/mbed-cli/.gitignore b/mbed-cli/.gitignore
similarity index 100%
rename from src/mbed-cli/.gitignore
rename to mbed-cli/.gitignore
diff --git a/src/mbed-cli/Makefile b/mbed-cli/Makefile
similarity index 100%
rename from src/mbed-cli/Makefile
rename to mbed-cli/Makefile
diff --git a/src/mbed-cli/manual-XmpX.install b/mbed-cli/manual-XmpX.install
similarity index 100%
rename from src/mbed-cli/manual-XmpX.install
rename to mbed-cli/manual-XmpX.install
diff --git a/src/mbed-cli/manual-XmpX.json b/mbed-cli/manual-XmpX.json
similarity index 100%
rename from src/mbed-cli/manual-XmpX.json
rename to mbed-cli/manual-XmpX.json
diff --git a/src/mbed-cli/manual-arm-none-eabi-binutils.install b/mbed-cli/manual-arm-none-eabi-binutils.install
similarity index 100%
rename from src/mbed-cli/manual-arm-none-eabi-binutils.install
rename to mbed-cli/manual-arm-none-eabi-binutils.install
diff --git a/src/mbed-cli/manual-arm-none-eabi-binutils.json b/mbed-cli/manual-arm-none-eabi-binutils.json
similarity index 100%
rename from src/mbed-cli/manual-arm-none-eabi-binutils.json
rename to mbed-cli/manual-arm-none-eabi-binutils.json
diff --git a/src/mbed-cli/manual-arm-none-eabi-bootstrap-gcc.install b/mbed-cli/manual-arm-none-eabi-bootstrap-gcc.install
similarity index 100%
rename from src/mbed-cli/manual-arm-none-eabi-bootstrap-gcc.install
rename to mbed-cli/manual-arm-none-eabi-bootstrap-gcc.install
diff --git a/src/mbed-cli/manual-arm-none-eabi-bootstrap-gcc.json b/mbed-cli/manual-arm-none-eabi-bootstrap-gcc.json
similarity index 100%
rename from src/mbed-cli/manual-arm-none-eabi-bootstrap-gcc.json
rename to mbed-cli/manual-arm-none-eabi-bootstrap-gcc.json
diff --git a/src/mbed-cli/manual-arm-none-eabi-gcc.install b/mbed-cli/manual-arm-none-eabi-gcc.install
similarity index 100%
rename from src/mbed-cli/manual-arm-none-eabi-gcc.install
rename to mbed-cli/manual-arm-none-eabi-gcc.install
diff --git a/src/mbed-cli/manual-arm-none-eabi-gcc.json b/mbed-cli/manual-arm-none-eabi-gcc.json
similarity index 100%
rename from src/mbed-cli/manual-arm-none-eabi-gcc.json
rename to mbed-cli/manual-arm-none-eabi-gcc.json
diff --git a/src/mbed-cli/manual-arm-none-eabi-newlib.install b/mbed-cli/manual-arm-none-eabi-newlib.install
similarity index 100%
rename from src/mbed-cli/manual-arm-none-eabi-newlib.install
rename to mbed-cli/manual-arm-none-eabi-newlib.install
diff --git a/src/mbed-cli/manual-arm-none-eabi-newlib.json b/mbed-cli/manual-arm-none-eabi-newlib.json
similarity index 100%
rename from src/mbed-cli/manual-arm-none-eabi-newlib.json
rename to mbed-cli/manual-arm-none-eabi-newlib.json
diff --git a/src/mbed-cli/manual-build-files.install b/mbed-cli/manual-build-files.install
similarity index 100%
rename from src/mbed-cli/manual-build-files.install
rename to mbed-cli/manual-build-files.install
diff --git a/src/mbed-cli/manual-build-files.json b/mbed-cli/manual-build-files.json
similarity index 100%
rename from src/mbed-cli/manual-build-files.json
rename to mbed-cli/manual-build-files.json
diff --git a/src/mbed-cli/manual-git.install b/mbed-cli/manual-git.install
similarity index 100%
rename from src/mbed-cli/manual-git.install
rename to mbed-cli/manual-git.install
diff --git a/src/mbed-cli/manual-git.json b/mbed-cli/manual-git.json
similarity index 100%
rename from src/mbed-cli/manual-git.json
rename to mbed-cli/manual-git.json
diff --git a/src/mbed-cli/manual-mbed-cli-wrap.install b/mbed-cli/manual-mbed-cli-wrap.install
similarity index 100%
rename from src/mbed-cli/manual-mbed-cli-wrap.install
rename to mbed-cli/manual-mbed-cli-wrap.install
diff --git a/src/mbed-cli/manual-mbed-cli-wrap.json b/mbed-cli/manual-mbed-cli-wrap.json
similarity index 100%
rename from src/mbed-cli/manual-mbed-cli-wrap.json
rename to mbed-cli/manual-mbed-cli-wrap.json
diff --git a/src/mbed-cli/manual-util-linux.install b/mbed-cli/manual-util-linux.install
similarity index 100%
rename from src/mbed-cli/manual-util-linux.install
rename to mbed-cli/manual-util-linux.install
diff --git a/src/mbed-cli/manual-util-linux.json b/mbed-cli/manual-util-linux.json
similarity index 100%
rename from src/mbed-cli/manual-util-linux.json
rename to mbed-cli/manual-util-linux.json
diff --git a/src/mbed-cli/mbed-cli b/mbed-cli/mbed-cli
similarity index 100%
rename from src/mbed-cli/mbed-cli
rename to mbed-cli/mbed-cli
diff --git a/src/mbed-cli/pip-ignore-installed.txt b/mbed-cli/pip-ignore-installed.txt
similarity index 100%
rename from src/mbed-cli/pip-ignore-installed.txt
rename to mbed-cli/pip-ignore-installed.txt
diff --git a/src/mbed-cli/pip-simple.txt b/mbed-cli/pip-simple.txt
similarity index 100%
rename from src/mbed-cli/pip-simple.txt
rename to mbed-cli/pip-simple.txt
diff --git a/src/mbed-cli/se.lth.control.mbed-cli.json b/mbed-cli/se.lth.control.mbed-cli.json
similarity index 100%
rename from src/mbed-cli/se.lth.control.mbed-cli.json
rename to mbed-cli/se.lth.control.mbed-cli.json
diff --git a/src/pip-install-to-json/.gitignore b/pip-install-to-json/.gitignore
similarity index 100%
rename from src/pip-install-to-json/.gitignore
rename to pip-install-to-json/.gitignore
diff --git a/src/pip-install-to-json/Makefile b/pip-install-to-json/Makefile
similarity index 100%
rename from src/pip-install-to-json/Makefile
rename to pip-install-to-json/Makefile
diff --git a/src/pip-install-to-json/bootstrap-pip+wheel.json b/pip-install-to-json/bootstrap-pip+wheel.json
similarity index 100%
rename from src/pip-install-to-json/bootstrap-pip+wheel.json
rename to pip-install-to-json/bootstrap-pip+wheel.json
diff --git a/src/pip-install-to-json/pip-install-to-json.py b/pip-install-to-json/pip-install-to-json.py
similarity index 100%
rename from src/pip-install-to-json/pip-install-to-json.py
rename to pip-install-to-json/pip-install-to-json.py
diff --git a/src/pip-install-to-json/se.lth.control.pip-install-to-json.json b/pip-install-to-json/se.lth.control.pip-install-to-json.json
similarity index 100%
rename from src/pip-install-to-json/se.lth.control.pip-install-to-json.json
rename to pip-install-to-json/se.lth.control.pip-install-to-json.json