diff --git a/build-requirements.txt b/workstation-bootstrap/build-requirements.txt
similarity index 100%
rename from build-requirements.txt
rename to workstation-bootstrap/build-requirements.txt
diff --git a/requirements.in b/workstation-bootstrap/requirements.in
similarity index 83%
rename from requirements.in
rename to workstation-bootstrap/requirements.in
index ec2a5e35..5c6e9ef3 100644
--- a/requirements.in
+++ b/workstation-bootstrap/requirements.in
@@ -2,7 +2,7 @@ build==0.3.0
 wheel==0.36.2
 pip==21.3.1
 
-# For the build dependency of the our packages
+# Build dependencies of workstation packages
 
 # For python-dateutil
 setuptools-scm>=5.0.2
diff --git a/requirements.txt b/workstation-bootstrap/requirements.txt
similarity index 100%
rename from requirements.txt
rename to workstation-bootstrap/requirements.txt
diff --git a/bootstrap-sha256sums.txt b/workstation-bootstrap/sha256sums.txt
similarity index 100%
rename from bootstrap-sha256sums.txt
rename to workstation-bootstrap/sha256sums.txt
diff --git a/bootstrap-sha256sums.txt.asc b/workstation-bootstrap/sha256sums.txt.asc
similarity index 100%
rename from bootstrap-sha256sums.txt.asc
rename to workstation-bootstrap/sha256sums.txt.asc
diff --git a/bootstrap/Cython-0.29.22-cp310-cp310-linux_x86_64.whl b/workstation-bootstrap/wheels/Cython-0.29.22-cp310-cp310-linux_x86_64.whl
similarity index 100%
rename from bootstrap/Cython-0.29.22-cp310-cp310-linux_x86_64.whl
rename to workstation-bootstrap/wheels/Cython-0.29.22-cp310-cp310-linux_x86_64.whl
diff --git a/bootstrap/Cython-0.29.22-cp37-cp37m-linux_x86_64.whl b/workstation-bootstrap/wheels/Cython-0.29.22-cp37-cp37m-linux_x86_64.whl
similarity index 100%
rename from bootstrap/Cython-0.29.22-cp37-cp37m-linux_x86_64.whl
rename to workstation-bootstrap/wheels/Cython-0.29.22-cp37-cp37m-linux_x86_64.whl
diff --git a/bootstrap/Cython-0.29.22-cp39-cp39-linux_x86_64.whl b/workstation-bootstrap/wheels/Cython-0.29.22-cp39-cp39-linux_x86_64.whl
similarity index 100%
rename from bootstrap/Cython-0.29.22-cp39-cp39-linux_x86_64.whl
rename to workstation-bootstrap/wheels/Cython-0.29.22-cp39-cp39-linux_x86_64.whl
diff --git a/bootstrap/Cython-0.29.22.tar.gz b/workstation-bootstrap/wheels/Cython-0.29.22.tar.gz
similarity index 100%
rename from bootstrap/Cython-0.29.22.tar.gz
rename to workstation-bootstrap/wheels/Cython-0.29.22.tar.gz
diff --git a/bootstrap/build-0.3.0-py2.py3-none-any.whl b/workstation-bootstrap/wheels/build-0.3.0-py2.py3-none-any.whl
similarity index 100%
rename from bootstrap/build-0.3.0-py2.py3-none-any.whl
rename to workstation-bootstrap/wheels/build-0.3.0-py2.py3-none-any.whl
diff --git a/bootstrap/build-0.3.0.tar.gz b/workstation-bootstrap/wheels/build-0.3.0.tar.gz
similarity index 100%
rename from bootstrap/build-0.3.0.tar.gz
rename to workstation-bootstrap/wheels/build-0.3.0.tar.gz
diff --git a/bootstrap/click-7.1.2-py2.py3-none-any.whl b/workstation-bootstrap/wheels/click-7.1.2-py2.py3-none-any.whl
similarity index 100%
rename from bootstrap/click-7.1.2-py2.py3-none-any.whl
rename to workstation-bootstrap/wheels/click-7.1.2-py2.py3-none-any.whl
diff --git a/bootstrap/click-7.1.2.tar.gz b/workstation-bootstrap/wheels/click-7.1.2.tar.gz
similarity index 100%
rename from bootstrap/click-7.1.2.tar.gz
rename to workstation-bootstrap/wheels/click-7.1.2.tar.gz
diff --git a/bootstrap/flit_core-2.3.0-py2.py3-none-any.whl b/workstation-bootstrap/wheels/flit_core-2.3.0-py2.py3-none-any.whl
similarity index 100%
rename from bootstrap/flit_core-2.3.0-py2.py3-none-any.whl
rename to workstation-bootstrap/wheels/flit_core-2.3.0-py2.py3-none-any.whl
diff --git a/bootstrap/flit_core-2.3.0.tar.gz b/workstation-bootstrap/wheels/flit_core-2.3.0.tar.gz
similarity index 100%
rename from bootstrap/flit_core-2.3.0.tar.gz
rename to workstation-bootstrap/wheels/flit_core-2.3.0.tar.gz
diff --git a/bootstrap/importlib_metadata-3.7.0-py3-none-any.whl b/workstation-bootstrap/wheels/importlib_metadata-3.7.0-py3-none-any.whl
similarity index 100%
rename from bootstrap/importlib_metadata-3.7.0-py3-none-any.whl
rename to workstation-bootstrap/wheels/importlib_metadata-3.7.0-py3-none-any.whl
diff --git a/bootstrap/importlib_metadata-3.7.0.tar.gz b/workstation-bootstrap/wheels/importlib_metadata-3.7.0.tar.gz
similarity index 100%
rename from bootstrap/importlib_metadata-3.7.0.tar.gz
rename to workstation-bootstrap/wheels/importlib_metadata-3.7.0.tar.gz
diff --git a/bootstrap/packaging-20.9-py2.py3-none-any.whl b/workstation-bootstrap/wheels/packaging-20.9-py2.py3-none-any.whl
similarity index 100%
rename from bootstrap/packaging-20.9-py2.py3-none-any.whl
rename to workstation-bootstrap/wheels/packaging-20.9-py2.py3-none-any.whl
diff --git a/bootstrap/packaging-20.9.tar.gz b/workstation-bootstrap/wheels/packaging-20.9.tar.gz
similarity index 100%
rename from bootstrap/packaging-20.9.tar.gz
rename to workstation-bootstrap/wheels/packaging-20.9.tar.gz
diff --git a/bootstrap/pep517-0.9.1-py2.py3-none-any.whl b/workstation-bootstrap/wheels/pep517-0.9.1-py2.py3-none-any.whl
similarity index 100%
rename from bootstrap/pep517-0.9.1-py2.py3-none-any.whl
rename to workstation-bootstrap/wheels/pep517-0.9.1-py2.py3-none-any.whl
diff --git a/bootstrap/pep517-0.9.1.tar.gz b/workstation-bootstrap/wheels/pep517-0.9.1.tar.gz
similarity index 100%
rename from bootstrap/pep517-0.9.1.tar.gz
rename to workstation-bootstrap/wheels/pep517-0.9.1.tar.gz
diff --git a/bootstrap/pip-21.0.1-py3-none-any.whl b/workstation-bootstrap/wheels/pip-21.0.1-py3-none-any.whl
similarity index 100%
rename from bootstrap/pip-21.0.1-py3-none-any.whl
rename to workstation-bootstrap/wheels/pip-21.0.1-py3-none-any.whl
diff --git a/bootstrap/pip-21.0.1.tar.gz b/workstation-bootstrap/wheels/pip-21.0.1.tar.gz
similarity index 100%
rename from bootstrap/pip-21.0.1.tar.gz
rename to workstation-bootstrap/wheels/pip-21.0.1.tar.gz
diff --git a/bootstrap/pip-21.3.1-py3-none-any.whl b/workstation-bootstrap/wheels/pip-21.3.1-py3-none-any.whl
similarity index 100%
rename from bootstrap/pip-21.3.1-py3-none-any.whl
rename to workstation-bootstrap/wheels/pip-21.3.1-py3-none-any.whl
diff --git a/bootstrap/pip-21.3.1.tar.gz b/workstation-bootstrap/wheels/pip-21.3.1.tar.gz
similarity index 100%
rename from bootstrap/pip-21.3.1.tar.gz
rename to workstation-bootstrap/wheels/pip-21.3.1.tar.gz
diff --git a/bootstrap/pip-tools-6.0.1.tar.gz b/workstation-bootstrap/wheels/pip-tools-6.0.1.tar.gz
similarity index 100%
rename from bootstrap/pip-tools-6.0.1.tar.gz
rename to workstation-bootstrap/wheels/pip-tools-6.0.1.tar.gz
diff --git a/bootstrap/pip_tools-6.0.1-py3-none-any.whl b/workstation-bootstrap/wheels/pip_tools-6.0.1-py3-none-any.whl
similarity index 100%
rename from bootstrap/pip_tools-6.0.1-py3-none-any.whl
rename to workstation-bootstrap/wheels/pip_tools-6.0.1-py3-none-any.whl
diff --git a/bootstrap/pyparsing-2.4.7-py2.py3-none-any.whl b/workstation-bootstrap/wheels/pyparsing-2.4.7-py2.py3-none-any.whl
similarity index 100%
rename from bootstrap/pyparsing-2.4.7-py2.py3-none-any.whl
rename to workstation-bootstrap/wheels/pyparsing-2.4.7-py2.py3-none-any.whl
diff --git a/bootstrap/pyparsing-2.4.7.tar.gz b/workstation-bootstrap/wheels/pyparsing-2.4.7.tar.gz
similarity index 100%
rename from bootstrap/pyparsing-2.4.7.tar.gz
rename to workstation-bootstrap/wheels/pyparsing-2.4.7.tar.gz
diff --git a/bootstrap/pytest-runner-5.3.0.tar.gz b/workstation-bootstrap/wheels/pytest-runner-5.3.0.tar.gz
similarity index 100%
rename from bootstrap/pytest-runner-5.3.0.tar.gz
rename to workstation-bootstrap/wheels/pytest-runner-5.3.0.tar.gz
diff --git a/bootstrap/pytest_runner-5.3.0-py3-none-any.whl b/workstation-bootstrap/wheels/pytest_runner-5.3.0-py3-none-any.whl
similarity index 100%
rename from bootstrap/pytest_runner-5.3.0-py3-none-any.whl
rename to workstation-bootstrap/wheels/pytest_runner-5.3.0-py3-none-any.whl
diff --git a/bootstrap/pytoml-0.1.21-py2.py3-none-any.whl b/workstation-bootstrap/wheels/pytoml-0.1.21-py2.py3-none-any.whl
similarity index 100%
rename from bootstrap/pytoml-0.1.21-py2.py3-none-any.whl
rename to workstation-bootstrap/wheels/pytoml-0.1.21-py2.py3-none-any.whl
diff --git a/bootstrap/pytoml-0.1.21.tar.gz b/workstation-bootstrap/wheels/pytoml-0.1.21.tar.gz
similarity index 100%
rename from bootstrap/pytoml-0.1.21.tar.gz
rename to workstation-bootstrap/wheels/pytoml-0.1.21.tar.gz
diff --git a/bootstrap/setuptools-54.0.0-py3-none-any.whl b/workstation-bootstrap/wheels/setuptools-54.0.0-py3-none-any.whl
similarity index 100%
rename from bootstrap/setuptools-54.0.0-py3-none-any.whl
rename to workstation-bootstrap/wheels/setuptools-54.0.0-py3-none-any.whl
diff --git a/bootstrap/setuptools-54.0.0.tar.gz b/workstation-bootstrap/wheels/setuptools-54.0.0.tar.gz
similarity index 100%
rename from bootstrap/setuptools-54.0.0.tar.gz
rename to workstation-bootstrap/wheels/setuptools-54.0.0.tar.gz
diff --git a/bootstrap/setuptools_scm-5.0.2-py2.py3-none-any.whl b/workstation-bootstrap/wheels/setuptools_scm-5.0.2-py2.py3-none-any.whl
similarity index 100%
rename from bootstrap/setuptools_scm-5.0.2-py2.py3-none-any.whl
rename to workstation-bootstrap/wheels/setuptools_scm-5.0.2-py2.py3-none-any.whl
diff --git a/bootstrap/setuptools_scm-5.0.2.tar.gz b/workstation-bootstrap/wheels/setuptools_scm-5.0.2.tar.gz
similarity index 100%
rename from bootstrap/setuptools_scm-5.0.2.tar.gz
rename to workstation-bootstrap/wheels/setuptools_scm-5.0.2.tar.gz
diff --git a/bootstrap/toml-0.10.2-py2.py3-none-any.whl b/workstation-bootstrap/wheels/toml-0.10.2-py2.py3-none-any.whl
similarity index 100%
rename from bootstrap/toml-0.10.2-py2.py3-none-any.whl
rename to workstation-bootstrap/wheels/toml-0.10.2-py2.py3-none-any.whl
diff --git a/bootstrap/toml-0.10.2.tar.gz b/workstation-bootstrap/wheels/toml-0.10.2.tar.gz
similarity index 100%
rename from bootstrap/toml-0.10.2.tar.gz
rename to workstation-bootstrap/wheels/toml-0.10.2.tar.gz
diff --git a/bootstrap/typing_extensions-3.7.4.3-py3-none-any.whl b/workstation-bootstrap/wheels/typing_extensions-3.7.4.3-py3-none-any.whl
similarity index 100%
rename from bootstrap/typing_extensions-3.7.4.3-py3-none-any.whl
rename to workstation-bootstrap/wheels/typing_extensions-3.7.4.3-py3-none-any.whl
diff --git a/bootstrap/typing_extensions-3.7.4.3.tar.gz b/workstation-bootstrap/wheels/typing_extensions-3.7.4.3.tar.gz
similarity index 100%
rename from bootstrap/typing_extensions-3.7.4.3.tar.gz
rename to workstation-bootstrap/wheels/typing_extensions-3.7.4.3.tar.gz
diff --git a/bootstrap/wheel-0.36.2-py2.py3-none-any.whl b/workstation-bootstrap/wheels/wheel-0.36.2-py2.py3-none-any.whl
similarity index 100%
rename from bootstrap/wheel-0.36.2-py2.py3-none-any.whl
rename to workstation-bootstrap/wheels/wheel-0.36.2-py2.py3-none-any.whl
diff --git a/bootstrap/wheel-0.36.2.tar.gz b/workstation-bootstrap/wheels/wheel-0.36.2.tar.gz
similarity index 100%
rename from bootstrap/wheel-0.36.2.tar.gz
rename to workstation-bootstrap/wheels/wheel-0.36.2.tar.gz
diff --git a/bootstrap/zipp-3.4.1-py3-none-any.whl b/workstation-bootstrap/wheels/zipp-3.4.1-py3-none-any.whl
similarity index 100%
rename from bootstrap/zipp-3.4.1-py3-none-any.whl
rename to workstation-bootstrap/wheels/zipp-3.4.1-py3-none-any.whl
diff --git a/bootstrap/zipp-3.4.1.tar.gz b/workstation-bootstrap/wheels/zipp-3.4.1.tar.gz
similarity index 100%
rename from bootstrap/zipp-3.4.1.tar.gz
rename to workstation-bootstrap/wheels/zipp-3.4.1.tar.gz