diff --git a/mbed6/.gitignore b/mbed-cli/.gitignore
similarity index 100%
rename from mbed6/.gitignore
rename to mbed-cli/.gitignore
diff --git a/mbed6/Makefile b/mbed-cli/Makefile
similarity index 100%
rename from mbed6/Makefile
rename to mbed-cli/Makefile
diff --git a/mbed6/manual-XmpX.install b/mbed-cli/manual-XmpX.install
similarity index 100%
rename from mbed6/manual-XmpX.install
rename to mbed-cli/manual-XmpX.install
diff --git a/mbed6/manual-XmpX.json b/mbed-cli/manual-XmpX.json
similarity index 100%
rename from mbed6/manual-XmpX.json
rename to mbed-cli/manual-XmpX.json
diff --git a/mbed6/manual-arm-none-eabi-binutils.install b/mbed-cli/manual-arm-none-eabi-binutils.install
similarity index 100%
rename from mbed6/manual-arm-none-eabi-binutils.install
rename to mbed-cli/manual-arm-none-eabi-binutils.install
diff --git a/mbed6/manual-arm-none-eabi-binutils.json b/mbed-cli/manual-arm-none-eabi-binutils.json
similarity index 100%
rename from mbed6/manual-arm-none-eabi-binutils.json
rename to mbed-cli/manual-arm-none-eabi-binutils.json
diff --git a/mbed6/manual-arm-none-eabi-bootstrap-gcc.install b/mbed-cli/manual-arm-none-eabi-bootstrap-gcc.install
similarity index 100%
rename from mbed6/manual-arm-none-eabi-bootstrap-gcc.install
rename to mbed-cli/manual-arm-none-eabi-bootstrap-gcc.install
diff --git a/mbed6/manual-arm-none-eabi-bootstrap-gcc.json b/mbed-cli/manual-arm-none-eabi-bootstrap-gcc.json
similarity index 100%
rename from mbed6/manual-arm-none-eabi-bootstrap-gcc.json
rename to mbed-cli/manual-arm-none-eabi-bootstrap-gcc.json
diff --git a/mbed6/manual-arm-none-eabi-gcc.install b/mbed-cli/manual-arm-none-eabi-gcc.install
similarity index 100%
rename from mbed6/manual-arm-none-eabi-gcc.install
rename to mbed-cli/manual-arm-none-eabi-gcc.install
diff --git a/mbed6/manual-arm-none-eabi-gcc.json b/mbed-cli/manual-arm-none-eabi-gcc.json
similarity index 100%
rename from mbed6/manual-arm-none-eabi-gcc.json
rename to mbed-cli/manual-arm-none-eabi-gcc.json
diff --git a/mbed6/manual-arm-none-eabi-newlib.install b/mbed-cli/manual-arm-none-eabi-newlib.install
similarity index 100%
rename from mbed6/manual-arm-none-eabi-newlib.install
rename to mbed-cli/manual-arm-none-eabi-newlib.install
diff --git a/mbed6/manual-arm-none-eabi-newlib.json b/mbed-cli/manual-arm-none-eabi-newlib.json
similarity index 100%
rename from mbed6/manual-arm-none-eabi-newlib.json
rename to mbed-cli/manual-arm-none-eabi-newlib.json
diff --git a/mbed6/manual-build-files.install b/mbed-cli/manual-build-files.install
similarity index 100%
rename from mbed6/manual-build-files.install
rename to mbed-cli/manual-build-files.install
diff --git a/mbed6/manual-build-files.json b/mbed-cli/manual-build-files.json
similarity index 100%
rename from mbed6/manual-build-files.json
rename to mbed-cli/manual-build-files.json
diff --git a/mbed6/manual-git.install b/mbed-cli/manual-git.install
similarity index 100%
rename from mbed6/manual-git.install
rename to mbed-cli/manual-git.install
diff --git a/mbed6/manual-git.json b/mbed-cli/manual-git.json
similarity index 100%
rename from mbed6/manual-git.json
rename to mbed-cli/manual-git.json
diff --git a/mbed6/manual-mbed-cli-wrap.install b/mbed-cli/manual-mbed-cli-wrap.install
similarity index 100%
rename from mbed6/manual-mbed-cli-wrap.install
rename to mbed-cli/manual-mbed-cli-wrap.install
diff --git a/mbed6/manual-mbed-cli-wrap.json b/mbed-cli/manual-mbed-cli-wrap.json
similarity index 100%
rename from mbed6/manual-mbed-cli-wrap.json
rename to mbed-cli/manual-mbed-cli-wrap.json
diff --git a/mbed6/manual-util-linux.install b/mbed-cli/manual-util-linux.install
similarity index 100%
rename from mbed6/manual-util-linux.install
rename to mbed-cli/manual-util-linux.install
diff --git a/mbed6/manual-util-linux.json b/mbed-cli/manual-util-linux.json
similarity index 100%
rename from mbed6/manual-util-linux.json
rename to mbed-cli/manual-util-linux.json
diff --git a/mbed6/mbed-cli b/mbed-cli/mbed-cli
similarity index 100%
rename from mbed6/mbed-cli
rename to mbed-cli/mbed-cli
diff --git a/mbed6/pip-ignore-installed.txt b/mbed-cli/pip-ignore-installed.txt
similarity index 100%
rename from mbed6/pip-ignore-installed.txt
rename to mbed-cli/pip-ignore-installed.txt
diff --git a/mbed6/pip-simple.txt b/mbed-cli/pip-simple.txt
similarity index 100%
rename from mbed6/pip-simple.txt
rename to mbed-cli/pip-simple.txt
diff --git a/mbed6/se.lth.control.mbed-cli.json b/mbed-cli/se.lth.control.mbed-cli.json
similarity index 100%
rename from mbed6/se.lth.control.mbed-cli.json
rename to mbed-cli/se.lth.control.mbed-cli.json