Merge branch 'chandan/src-directory' into 'master'

Move source from 'buildstream' to 'src/buildstream'

Closes #1009

See merge request BuildStream/buildstream!1322

250 files changed, 52 insertions, 51 deletions

diff --git a/.coveragerc b/.coveragerc
index ca47c8a90..457c439a6 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,7 +1,5 @@
 [run]
 concurrency = multiprocessing
-include =
-  */buildstream/*
 
 omit =
   # Omit some internals
@@ -20,6 +18,6 @@ precision = 2
 
 [paths]
 source =
+    src/buildstream/
     buildstream/
     */site-packages/buildstream/
-    */buildstream/buildstream/
diff --git a/.gitattributes b/.gitattributes
index d4ff16f59..3a64094bc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-buildstream/_version.py export-subst
+src/buildstream/_version.py export-subst
diff --git a/.gitignore b/.gitignore
index 5c258fad4..3bc4e29af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # Compiled python modules.
-buildstream/**/*.pyc
+src/buildstream/**/*.pyc
 tests/**/*.pyc
 
 # Build output directory
@@ -9,7 +9,7 @@ build
 /dist/
 
 # Python egg metadata, regenerated from source files by setuptools.
-/*.egg-info
+/src/*.egg-info
 .eggs
 
 # Some testing related things
@@ -28,7 +28,7 @@ tmp
 __pycache__/
 
 # Generated version file
-buildstream/__version__.py
+src/buildstream/__version__.py
 
 # Autogenerated doc
 doc/source/badges/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3434c0f27..336cc4cef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -297,18 +297,18 @@ analysis:
 
   - |
     echo "Calculating Maintainability Index"
-    radon mi -s -j buildstream > analysis/mi.json
-    radon mi -s buildstream
+    radon mi -s -j src/buildstream > analysis/mi.json
+    radon mi -s src/buildstream
 
   - |
     echo "Calculating Cyclomatic Complexity"
-    radon cc -a -s -j buildstream > analysis/cc.json
-    radon cc -a -s buildstream
+    radon cc -a -s -j src/buildstream > analysis/cc.json
+    radon cc -a -s src/buildstream
 
   - |
     echo "Calculating Raw Metrics"
-    radon raw -s -j buildstream > analysis/raw.json
-    radon raw -s buildstream
+    radon raw -s -j src/buildstream > analysis/raw.json
+    radon raw -s src/buildstream
 
   except:
   - schedules
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index fdc500435..921cee909 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1158,7 +1158,7 @@ Protocol buffers
 BuildStream uses protobuf and gRPC for serialization and communication with
 artifact cache servers.  This requires ``.proto`` files and Python code
 generated from the ``.proto`` files using protoc.  All these files live in the
-``buildstream/_protos`` directory.  The generated files are included in the
+``src/buildstream/_protos`` directory.  The generated files are included in the
 git repository to avoid depending on grpcio-tools for user installations.
 
 
@@ -1744,7 +1744,7 @@ using BST_PROFILE.
 
 BST_PROFILE can be set to a section name, or a list of section names separated
 by ":". You can also use "all" for getting all profiles at the same time.
-There is a list of topics in `buildstream/_profile.py`. For example, running::
+There is a list of topics in `src/buildstream/_profile.py`. For example, running::
 
     BST_PROFILE=load-pipeline bst build bootstrap-system-x86.bst
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 729a3e957..d0de0e593 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,7 +7,7 @@ include NEWS
 include README.rst
 
 # Data files required by BuildStream's generic source tests
-recursive-include buildstream/testing/_sourcetests/project *
+recursive-include src/buildstream/testing/_sourcetests/project *
 
 # Documentation package includes
 include doc/Makefile
@@ -31,7 +31,7 @@ include .coveragerc
 include .pylintrc
 
 # Protocol Buffers
-recursive-include buildstream/_protos *.proto
+recursive-include src/buildstream/_protos *.proto
 
 # Requirements files
 include requirements/requirements.in
diff --git a/doc/Makefile b/doc/Makefile
index 6597cf81b..f4e8b20b9 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -32,7 +32,7 @@ BST2HTMLOPTS = --force
 endif
 
 # Help Python find buildstream and its plugins
-PYTHONPATH=$(CURDIR)/..:$(CURDIR)/../buildstream/plugins
+PYTHONPATH=$(CURDIR)/..:$(CURDIR)/../src/buildstream/plugins
 
 
 .PHONY: all clean templates templates-clean sessions sessions-prep sessions-clean badges badges-clean html devhelp
@@ -82,9 +82,9 @@ clean: templates-clean sessions-clean badges-clean
 templates:
 	mkdir -p source/elements
 	mkdir -p source/sources
-	$(SPHINXAPIDOC) --force --separate --module-first --no-headings --no-toc -o source $(CURDIR)/../buildstream *_pb2*.py
-	$(call plugin-doc-skeleton,$(CURDIR)/../buildstream/plugins/elements,elements)
-	$(call plugin-doc-skeleton,$(CURDIR)/../buildstream/plugins/sources,sources)
+	$(SPHINXAPIDOC) --force --separate --module-first --no-headings --no-toc -o source $(CURDIR)/../src/buildstream *_pb2*.py
+	$(call plugin-doc-skeleton,$(CURDIR)/../src/buildstream/plugins/elements,elements)
+	$(call plugin-doc-skeleton,$(CURDIR)/../src/buildstream/plugins/sources,sources)
 
 templates-clean:
 	rm -rf source/elements
diff --git a/doc/source/format_project.rst b/doc/source/format_project.rst
index f9d999a19..f5758657d 100644
--- a/doc/source/format_project.rst
+++ b/doc/source/format_project.rst
@@ -1017,5 +1017,5 @@ Builtin defaults
 BuildStream defines some default values for convenience, the default
 values overridden by your project's ``project.conf`` are presented here:
 
-  .. literalinclude:: ../../buildstream/data/projectconfig.yaml
+  .. literalinclude:: ../../src/buildstream/data/projectconfig.yaml
      :language: yaml
diff --git a/doc/source/using_config.rst b/doc/source/using_config.rst
index 58ef160c1..2b74b2de5 100644
--- a/doc/source/using_config.rst
+++ b/doc/source/using_config.rst
@@ -282,5 +282,5 @@ Default configuration
 ---------------------
 The default BuildStream configuration is specified here for reference:
 
-  .. literalinclude:: ../../buildstream/data/userconfig.yaml
+  .. literalinclude:: ../../src/buildstream/data/userconfig.yaml
      :language: yaml
diff --git a/setup.cfg b/setup.cfg
index efdca7091..cd798bc03 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [versioneer]
 VCS = git
 style = pep440
-versionfile_source = buildstream/_version.py
+versionfile_source = src/buildstream/_version.py
 versionfile_build = buildstream/_version.py
 tag_prefix =
 tag_regex = *.*.*
@@ -23,4 +23,4 @@ env =
 [pycodestyle]
 max-line-length = 119
 ignore = E129,E125,W504,W605
-exclude = .git/**,.tox/**,.eggs/**,build/**,doc/source/conf.py,buildstream/_fuse/fuse.py,buildstream/_protos/**/*py,tmp/**
+exclude = .git/**,.tox/**,.eggs/**,build/**,doc/source/conf.py,src/buildstream/_fuse/fuse.py,src/buildstream/_protos/**/*py,tmp/**
diff --git a/setup.py b/setup.py
index c550fdd0b..267ca6fb4 100755
--- a/setup.py
+++ b/setup.py
@@ -128,7 +128,7 @@ def list_man_pages():
 #
 def list_testing_datafiles():
     bst_dir = Path(os.path.dirname(os.path.abspath(__file__)))
-    data_dir = bst_dir.joinpath('buildstream', 'testing', '_sourcetests', 'project')
+    data_dir = bst_dir.joinpath('src', 'buildstream', 'testing', '_sourcetests', 'project')
     return [str(f) for f in data_dir.rglob('*')]
 
 
@@ -215,7 +215,7 @@ class BuildGRPC(Command):
                   "Install it via pip (pip3 install grpcio-tools).")
             exit(1)
 
-        protos_root = 'buildstream/_protos'
+        protos_root = 'src/buildstream/_protos'
 
         grpc_tools.command.build_package_protos(protos_root)
 
@@ -335,7 +335,8 @@ setup(name='BuildStream',
           'Mailing List': 'https://mail.gnome.org/mailman/listinfo/buildstream-list'
       },
       python_requires='~={}.{}'.format(REQUIRED_PYTHON_MAJOR, REQUIRED_PYTHON_MINOR),
-      packages=find_packages(exclude=('tests', 'tests.*')),
+      package_dir={'': 'src'},
+      packages=find_packages(where='src', exclude=('tests', 'tests.*')),
       package_data={'buildstream': ['plugins/*/*.py', 'plugins/*/*.yaml',
                                     'data/*.yaml', 'data/*.sh.in',
                                     *list_testing_datafiles()]},
@@ -353,7 +354,7 @@ setup(name='BuildStream',
           #
           ('share/man/man1', list_man_pages()),
           ('share/bash-completion/completions', [
-              os.path.join('buildstream', 'data', 'bst')
+              os.path.join('src', 'buildstream', 'data', 'bst')
           ])
       ],
       install_requires=install_requires,
diff --git a/buildstream/__init__.py b/src/buildstream/__init__.py
index 62890a62f..62890a62f 100644
--- a/buildstream/__init__.py
+++ b/src/buildstream/__init__.py
diff --git a/buildstream/__main__.py b/src/buildstream/__main__.py
index 4b0fdabfe..4b0fdabfe 100644
--- a/buildstream/__main__.py
+++ b/src/buildstream/__main__.py
diff --git a/buildstream/_artifact.py b/src/buildstream/_artifact.py
index c353a5151..c353a5151 100644
--- a/buildstream/_artifact.py
+++ b/src/buildstream/_artifact.py
diff --git a/buildstream/_artifactcache.py b/src/buildstream/_artifactcache.py
index 091b44dda..091b44dda 100644
--- a/buildstream/_artifactcache.py
+++ b/src/buildstream/_artifactcache.py
diff --git a/buildstream/_artifactelement.py b/src/buildstream/_artifactelement.py
index d65d46173..d65d46173 100644
--- a/buildstream/_artifactelement.py
+++ b/src/buildstream/_artifactelement.py
diff --git a/buildstream/_basecache.py b/src/buildstream/_basecache.py
index 68654b2a0..68654b2a0 100644
--- a/buildstream/_basecache.py
+++ b/src/buildstream/_basecache.py
diff --git a/buildstream/_cachekey.py b/src/buildstream/_cachekey.py
index e56b582fa..e56b582fa 100644
--- a/buildstream/_cachekey.py
+++ b/src/buildstream/_cachekey.py
diff --git a/buildstream/_cas/__init__.py b/src/buildstream/_cas/__init__.py
index 46bd9567f..46bd9567f 100644
--- a/buildstream/_cas/__init__.py
+++ b/src/buildstream/_cas/__init__.py
diff --git a/buildstream/_cas/cascache.py b/src/buildstream/_cas/cascache.py
index ad8013d18..ad8013d18 100644
--- a/buildstream/_cas/cascache.py
+++ b/src/buildstream/_cas/cascache.py
diff --git a/buildstream/_cas/casremote.py b/src/buildstream/_cas/casremote.py
index aac0d2802..aac0d2802 100644
--- a/buildstream/_cas/casremote.py
+++ b/src/buildstream/_cas/casremote.py
diff --git a/buildstream/_cas/casserver.py b/src/buildstream/_cas/casserver.py
index c08a4d577..c08a4d577 100644
--- a/buildstream/_cas/casserver.py
+++ b/src/buildstream/_cas/casserver.py
diff --git a/buildstream/_context.py b/src/buildstream/_context.py
index 151ea636a..151ea636a 100644
--- a/buildstream/_context.py
+++ b/src/buildstream/_context.py
diff --git a/buildstream/_elementfactory.py b/src/buildstream/_elementfactory.py
index d6591bf4c..d6591bf4c 100644
--- a/buildstream/_elementfactory.py
+++ b/src/buildstream/_elementfactory.py
diff --git a/buildstream/_exceptions.py b/src/buildstream/_exceptions.py
index f2d34bcba..f2d34bcba 100644
--- a/buildstream/_exceptions.py
+++ b/src/buildstream/_exceptions.py
diff --git a/buildstream/_frontend/__init__.py b/src/buildstream/_frontend/__init__.py
index febd4979d..febd4979d 100644
--- a/buildstream/_frontend/__init__.py
+++ b/src/buildstream/_frontend/__init__.py
diff --git a/buildstream/_frontend/app.py b/src/buildstream/_frontend/app.py
index d4ea83871..d4ea83871 100644
--- a/buildstream/_frontend/app.py
+++ b/src/buildstream/_frontend/app.py
diff --git a/buildstream/_frontend/cli.py b/src/buildstream/_frontend/cli.py
index cc8cd5e54..cc8cd5e54 100644
--- a/buildstream/_frontend/cli.py
+++ b/src/buildstream/_frontend/cli.py
diff --git a/buildstream/_frontend/complete.py b/src/buildstream/_frontend/complete.py
index bf9324812..bf9324812 100644
--- a/buildstream/_frontend/complete.py
+++ b/src/buildstream/_frontend/complete.py
diff --git a/buildstream/_frontend/linuxapp.py b/src/buildstream/_frontend/linuxapp.py
index 0444dc7b4..0444dc7b4 100644
--- a/buildstream/_frontend/linuxapp.py
+++ b/src/buildstream/_frontend/linuxapp.py
diff --git a/buildstream/_frontend/profile.py b/src/buildstream/_frontend/profile.py
index dda0f7ffe..dda0f7ffe 100644
--- a/buildstream/_frontend/profile.py
+++ b/src/buildstream/_frontend/profile.py
diff --git a/buildstream/_frontend/status.py b/src/buildstream/_frontend/status.py
index 91f47221a..91f47221a 100644
--- a/buildstream/_frontend/status.py
+++ b/src/buildstream/_frontend/status.py
diff --git a/buildstream/_frontend/widget.py b/src/buildstream/_frontend/widget.py
index cfe3a06e9..cfe3a06e9 100644
--- a/buildstream/_frontend/widget.py
+++ b/src/buildstream/_frontend/widget.py
diff --git a/buildstream/_fuse/__init__.py b/src/buildstream/_fuse/__init__.py
index a5e882634..a5e882634 100644
--- a/buildstream/_fuse/__init__.py
+++ b/src/buildstream/_fuse/__init__.py
diff --git a/buildstream/_fuse/fuse.py b/src/buildstream/_fuse/fuse.py
index 4ff6b9903..4ff6b9903 100644
--- a/buildstream/_fuse/fuse.py
+++ b/src/buildstream/_fuse/fuse.py
diff --git a/buildstream/_fuse/hardlinks.py b/src/buildstream/_fuse/hardlinks.py
index ff2e81eea..ff2e81eea 100644
--- a/buildstream/_fuse/hardlinks.py
+++ b/src/buildstream/_fuse/hardlinks.py
diff --git a/buildstream/_fuse/mount.py b/src/buildstream/_fuse/mount.py
index e31684100..e31684100 100644
--- a/buildstream/_fuse/mount.py
+++ b/src/buildstream/_fuse/mount.py
diff --git a/buildstream/_gitsourcebase.py b/src/buildstream/_gitsourcebase.py
index 7d07c56cb..7d07c56cb 100644
--- a/buildstream/_gitsourcebase.py
+++ b/src/buildstream/_gitsourcebase.py
diff --git a/buildstream/_includes.py b/src/buildstream/_includes.py
index f792b7716..f792b7716 100644
--- a/buildstream/_includes.py
+++ b/src/buildstream/_includes.py
diff --git a/buildstream/_loader/__init__.py b/src/buildstream/_loader/__init__.py
index a2c31796e..a2c31796e 100644
--- a/buildstream/_loader/__init__.py
+++ b/src/buildstream/_loader/__init__.py
diff --git a/buildstream/_loader/loadelement.py b/src/buildstream/_loader/loadelement.py
index 684c32554..684c32554 100644
--- a/buildstream/_loader/loadelement.py
+++ b/src/buildstream/_loader/loadelement.py
diff --git a/buildstream/_loader/loader.py b/src/buildstream/_loader/loader.py
index 261ec40e4..261ec40e4 100644
--- a/buildstream/_loader/loader.py
+++ b/src/buildstream/_loader/loader.py
diff --git a/buildstream/_loader/metaelement.py b/src/buildstream/_loader/metaelement.py
index 45eb6f4d0..45eb6f4d0 100644
--- a/buildstream/_loader/metaelement.py
+++ b/src/buildstream/_loader/metaelement.py
diff --git a/buildstream/_loader/metasource.py b/src/buildstream/_loader/metasource.py
index da2c0e292..da2c0e292 100644
--- a/buildstream/_loader/metasource.py
+++ b/src/buildstream/_loader/metasource.py
diff --git a/buildstream/_loader/types.py b/src/buildstream/_loader/types.py
index f9dd38ca0..f9dd38ca0 100644
--- a/buildstream/_loader/types.py
+++ b/src/buildstream/_loader/types.py
diff --git a/buildstream/_message.py b/src/buildstream/_message.py
index c2cdb8277..c2cdb8277 100644
--- a/buildstream/_message.py
+++ b/src/buildstream/_message.py
diff --git a/buildstream/_options/__init__.py b/src/buildstream/_options/__init__.py
index 70bbe35aa..70bbe35aa 100644
--- a/buildstream/_options/__init__.py
+++ b/src/buildstream/_options/__init__.py
diff --git a/buildstream/_options/option.py b/src/buildstream/_options/option.py
index ffdb4d272..ffdb4d272 100644
--- a/buildstream/_options/option.py
+++ b/src/buildstream/_options/option.py
diff --git a/buildstream/_options/optionarch.py b/src/buildstream/_options/optionarch.py
index 0e2963c84..0e2963c84 100644
--- a/buildstream/_options/optionarch.py
+++ b/src/buildstream/_options/optionarch.py
diff --git a/buildstream/_options/optionbool.py b/src/buildstream/_options/optionbool.py
index 867de22df..867de22df 100644
--- a/buildstream/_options/optionbool.py
+++ b/src/buildstream/_options/optionbool.py
diff --git a/buildstream/_options/optioneltmask.py b/src/buildstream/_options/optioneltmask.py
index 09c2ce8c2..09c2ce8c2 100644
--- a/buildstream/_options/optioneltmask.py
+++ b/src/buildstream/_options/optioneltmask.py
diff --git a/buildstream/_options/optionenum.py b/src/buildstream/_options/optionenum.py
index 095b9c356..095b9c356 100644
--- a/buildstream/_options/optionenum.py
+++ b/src/buildstream/_options/optionenum.py
diff --git a/buildstream/_options/optionflags.py b/src/buildstream/_options/optionflags.py
index 0271208d9..0271208d9 100644
--- a/buildstream/_options/optionflags.py
+++ b/src/buildstream/_options/optionflags.py
diff --git a/buildstream/_options/optionos.py b/src/buildstream/_options/optionos.py
index 2d46b70ba..2d46b70ba 100644
--- a/buildstream/_options/optionos.py
+++ b/src/buildstream/_options/optionos.py
diff --git a/buildstream/_options/optionpool.py b/src/buildstream/_options/optionpool.py
index de3af3e15..de3af3e15 100644
--- a/buildstream/_options/optionpool.py
+++ b/src/buildstream/_options/optionpool.py
diff --git a/buildstream/_pipeline.py b/src/buildstream/_pipeline.py
index c176b82f6..c176b82f6 100644
--- a/buildstream/_pipeline.py
+++ b/src/buildstream/_pipeline.py
diff --git a/buildstream/_platform/__init__.py b/src/buildstream/_platform/__init__.py
index 29a29894b..29a29894b 100644
--- a/buildstream/_platform/__init__.py
+++ b/src/buildstream/_platform/__init__.py
diff --git a/buildstream/_platform/darwin.py b/src/buildstream/_platform/darwin.py
index 8e08685ec..8e08685ec 100644
--- a/buildstream/_platform/darwin.py
+++ b/src/buildstream/_platform/darwin.py
diff --git a/buildstream/_platform/linux.py b/src/buildstream/_platform/linux.py
index e4ce02572..e4ce02572 100644
--- a/buildstream/_platform/linux.py
+++ b/src/buildstream/_platform/linux.py
diff --git a/buildstream/_platform/platform.py b/src/buildstream/_platform/platform.py
index dba60ddca..dba60ddca 100644
--- a/buildstream/_platform/platform.py
+++ b/src/buildstream/_platform/platform.py
diff --git a/buildstream/_platform/unix.py b/src/buildstream/_platform/unix.py
index d04b0712c..d04b0712c 100644
--- a/buildstream/_platform/unix.py
+++ b/src/buildstream/_platform/unix.py
diff --git a/buildstream/_plugincontext.py b/src/buildstream/_plugincontext.py
index 7a5407cf6..7a5407cf6 100644
--- a/buildstream/_plugincontext.py
+++ b/src/buildstream/_plugincontext.py
diff --git a/buildstream/_profile.py b/src/buildstream/_profile.py
index b17215d0e..b17215d0e 100644
--- a/buildstream/_profile.py
+++ b/src/buildstream/_profile.py
diff --git a/buildstream/_project.py b/src/buildstream/_project.py
index c40321c66..c40321c66 100644
--- a/buildstream/_project.py
+++ b/src/buildstream/_project.py
diff --git a/buildstream/_projectrefs.py b/src/buildstream/_projectrefs.py
index 09205a7c3..09205a7c3 100644
--- a/buildstream/_projectrefs.py
+++ b/src/buildstream/_projectrefs.py
diff --git a/buildstream/_protos/__init__.py b/src/buildstream/_protos/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/__init__.py
+++ b/src/buildstream/_protos/__init__.py
diff --git a/buildstream/_protos/build/__init__.py b/src/buildstream/_protos/build/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/build/__init__.py
+++ b/src/buildstream/_protos/build/__init__.py
diff --git a/buildstream/_protos/build/bazel/__init__.py b/src/buildstream/_protos/build/bazel/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/build/bazel/__init__.py
+++ b/src/buildstream/_protos/build/bazel/__init__.py
diff --git a/buildstream/_protos/build/bazel/remote/__init__.py b/src/buildstream/_protos/build/bazel/remote/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/build/bazel/remote/__init__.py
+++ b/src/buildstream/_protos/build/bazel/remote/__init__.py
diff --git a/buildstream/_protos/build/bazel/remote/execution/__init__.py b/src/buildstream/_protos/build/bazel/remote/execution/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/build/bazel/remote/execution/__init__.py
+++ b/src/buildstream/_protos/build/bazel/remote/execution/__init__.py
diff --git a/buildstream/_protos/build/bazel/remote/execution/v2/__init__.py b/src/buildstream/_protos/build/bazel/remote/execution/v2/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/build/bazel/remote/execution/v2/__init__.py
+++ b/src/buildstream/_protos/build/bazel/remote/execution/v2/__init__.py
diff --git a/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution.proto b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution.proto
index 7edbce3bc..7edbce3bc 100644
--- a/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution.proto
+++ b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution.proto
diff --git a/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py
index 46d59b184..46d59b184 100644
--- a/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py
+++ b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2.py
diff --git a/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2_grpc.py b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2_grpc.py
index 3769a680d..3769a680d 100644
--- a/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2_grpc.py
+++ b/src/buildstream/_protos/build/bazel/remote/execution/v2/remote_execution_pb2_grpc.py
diff --git a/buildstream/_protos/build/bazel/semver/__init__.py b/src/buildstream/_protos/build/bazel/semver/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/build/bazel/semver/__init__.py
+++ b/src/buildstream/_protos/build/bazel/semver/__init__.py
diff --git a/buildstream/_protos/build/bazel/semver/semver.proto b/src/buildstream/_protos/build/bazel/semver/semver.proto
index 2caf76bcc..2caf76bcc 100644
--- a/buildstream/_protos/build/bazel/semver/semver.proto
+++ b/src/buildstream/_protos/build/bazel/semver/semver.proto
diff --git a/buildstream/_protos/build/bazel/semver/semver_pb2.py b/src/buildstream/_protos/build/bazel/semver/semver_pb2.py
index a36cf722a..a36cf722a 100644
--- a/buildstream/_protos/build/bazel/semver/semver_pb2.py
+++ b/src/buildstream/_protos/build/bazel/semver/semver_pb2.py
diff --git a/buildstream/_protos/build/bazel/semver/semver_pb2_grpc.py b/src/buildstream/_protos/build/bazel/semver/semver_pb2_grpc.py
index a89435267..a89435267 100644
--- a/buildstream/_protos/build/bazel/semver/semver_pb2_grpc.py
+++ b/src/buildstream/_protos/build/bazel/semver/semver_pb2_grpc.py
diff --git a/buildstream/_protos/buildstream/__init__.py b/src/buildstream/_protos/buildstream/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/buildstream/__init__.py
+++ b/src/buildstream/_protos/buildstream/__init__.py
diff --git a/buildstream/_protos/buildstream/v2/__init__.py b/src/buildstream/_protos/buildstream/v2/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/buildstream/v2/__init__.py
+++ b/src/buildstream/_protos/buildstream/v2/__init__.py
diff --git a/buildstream/_protos/buildstream/v2/artifact.proto b/src/buildstream/_protos/buildstream/v2/artifact.proto
index 56ddbca6b..56ddbca6b 100644
--- a/buildstream/_protos/buildstream/v2/artifact.proto
+++ b/src/buildstream/_protos/buildstream/v2/artifact.proto
diff --git a/buildstream/_protos/buildstream/v2/artifact_pb2.py b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py
index c56d1ae8a..c56d1ae8a 100644
--- a/buildstream/_protos/buildstream/v2/artifact_pb2.py
+++ b/src/buildstream/_protos/buildstream/v2/artifact_pb2.py
diff --git a/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py b/src/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py
index d355146af..d355146af 100644
--- a/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py
+++ b/src/buildstream/_protos/buildstream/v2/artifact_pb2_grpc.py
diff --git a/buildstream/_protos/buildstream/v2/buildstream.proto b/src/buildstream/_protos/buildstream/v2/buildstream.proto
index f283d6f3f..f283d6f3f 100644
--- a/buildstream/_protos/buildstream/v2/buildstream.proto
+++ b/src/buildstream/_protos/buildstream/v2/buildstream.proto
diff --git a/buildstream/_protos/buildstream/v2/buildstream_pb2.py b/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py
index 57fdae49d..57fdae49d 100644
--- a/buildstream/_protos/buildstream/v2/buildstream_pb2.py
+++ b/src/buildstream/_protos/buildstream/v2/buildstream_pb2.py
diff --git a/buildstream/_protos/buildstream/v2/buildstream_pb2_grpc.py b/src/buildstream/_protos/buildstream/v2/buildstream_pb2_grpc.py
index b3e653493..b3e653493 100644
--- a/buildstream/_protos/buildstream/v2/buildstream_pb2_grpc.py
+++ b/src/buildstream/_protos/buildstream/v2/buildstream_pb2_grpc.py
diff --git a/buildstream/_protos/google/__init__.py b/src/buildstream/_protos/google/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/google/__init__.py
+++ b/src/buildstream/_protos/google/__init__.py
diff --git a/buildstream/_protos/google/api/__init__.py b/src/buildstream/_protos/google/api/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/google/api/__init__.py
+++ b/src/buildstream/_protos/google/api/__init__.py
diff --git a/buildstream/_protos/google/api/annotations.proto b/src/buildstream/_protos/google/api/annotations.proto
index 85c361b47..85c361b47 100644
--- a/buildstream/_protos/google/api/annotations.proto
+++ b/src/buildstream/_protos/google/api/annotations.proto
diff --git a/buildstream/_protos/google/api/annotations_pb2.py b/src/buildstream/_protos/google/api/annotations_pb2.py
index 092c46de7..092c46de7 100644
--- a/buildstream/_protos/google/api/annotations_pb2.py
+++ b/src/buildstream/_protos/google/api/annotations_pb2.py
diff --git a/buildstream/_protos/google/api/annotations_pb2_grpc.py b/src/buildstream/_protos/google/api/annotations_pb2_grpc.py
index a89435267..a89435267 100644
--- a/buildstream/_protos/google/api/annotations_pb2_grpc.py
+++ b/src/buildstream/_protos/google/api/annotations_pb2_grpc.py
diff --git a/buildstream/_protos/google/api/http.proto b/src/buildstream/_protos/google/api/http.proto
index 78d515d4b..78d515d4b 100644
--- a/buildstream/_protos/google/api/http.proto
+++ b/src/buildstream/_protos/google/api/http.proto
diff --git a/buildstream/_protos/google/api/http_pb2.py b/src/buildstream/_protos/google/api/http_pb2.py
index aad9ddb97..aad9ddb97 100644
--- a/buildstream/_protos/google/api/http_pb2.py
+++ b/src/buildstream/_protos/google/api/http_pb2.py
diff --git a/buildstream/_protos/google/api/http_pb2_grpc.py b/src/buildstream/_protos/google/api/http_pb2_grpc.py
index a89435267..a89435267 100644
--- a/buildstream/_protos/google/api/http_pb2_grpc.py
+++ b/src/buildstream/_protos/google/api/http_pb2_grpc.py
diff --git a/buildstream/_protos/google/bytestream/__init__.py b/src/buildstream/_protos/google/bytestream/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/google/bytestream/__init__.py
+++ b/src/buildstream/_protos/google/bytestream/__init__.py
diff --git a/buildstream/_protos/google/bytestream/bytestream.proto b/src/buildstream/_protos/google/bytestream/bytestream.proto
index 85e386fc2..85e386fc2 100644
--- a/buildstream/_protos/google/bytestream/bytestream.proto
+++ b/src/buildstream/_protos/google/bytestream/bytestream.proto
diff --git a/buildstream/_protos/google/bytestream/bytestream_pb2.py b/src/buildstream/_protos/google/bytestream/bytestream_pb2.py
index c8487d6a0..c8487d6a0 100644
--- a/buildstream/_protos/google/bytestream/bytestream_pb2.py
+++ b/src/buildstream/_protos/google/bytestream/bytestream_pb2.py
diff --git a/buildstream/_protos/google/bytestream/bytestream_pb2_grpc.py b/src/buildstream/_protos/google/bytestream/bytestream_pb2_grpc.py
index ef993e040..ef993e040 100644
--- a/buildstream/_protos/google/bytestream/bytestream_pb2_grpc.py
+++ b/src/buildstream/_protos/google/bytestream/bytestream_pb2_grpc.py
diff --git a/buildstream/_protos/google/longrunning/__init__.py b/src/buildstream/_protos/google/longrunning/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/google/longrunning/__init__.py
+++ b/src/buildstream/_protos/google/longrunning/__init__.py
diff --git a/buildstream/_protos/google/longrunning/operations.proto b/src/buildstream/_protos/google/longrunning/operations.proto
index 76fef29c3..76fef29c3 100644
--- a/buildstream/_protos/google/longrunning/operations.proto
+++ b/src/buildstream/_protos/google/longrunning/operations.proto
diff --git a/buildstream/_protos/google/longrunning/operations_pb2.py b/src/buildstream/_protos/google/longrunning/operations_pb2.py
index 9fd89937f..9fd89937f 100644
--- a/buildstream/_protos/google/longrunning/operations_pb2.py
+++ b/src/buildstream/_protos/google/longrunning/operations_pb2.py
diff --git a/buildstream/_protos/google/longrunning/operations_pb2_grpc.py b/src/buildstream/_protos/google/longrunning/operations_pb2_grpc.py
index 8f89862e7..8f89862e7 100644
--- a/buildstream/_protos/google/longrunning/operations_pb2_grpc.py
+++ b/src/buildstream/_protos/google/longrunning/operations_pb2_grpc.py
diff --git a/buildstream/_protos/google/rpc/__init__.py b/src/buildstream/_protos/google/rpc/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/_protos/google/rpc/__init__.py
+++ b/src/buildstream/_protos/google/rpc/__init__.py
diff --git a/buildstream/_protos/google/rpc/code.proto b/src/buildstream/_protos/google/rpc/code.proto
index 74e2c5c9a..74e2c5c9a 100644
--- a/buildstream/_protos/google/rpc/code.proto
+++ b/src/buildstream/_protos/google/rpc/code.proto
diff --git a/buildstream/_protos/google/rpc/code_pb2.py b/src/buildstream/_protos/google/rpc/code_pb2.py
index e06dea194..e06dea194 100644
--- a/buildstream/_protos/google/rpc/code_pb2.py
+++ b/src/buildstream/_protos/google/rpc/code_pb2.py
diff --git a/buildstream/_protos/google/rpc/code_pb2_grpc.py b/src/buildstream/_protos/google/rpc/code_pb2_grpc.py
index a89435267..a89435267 100644
--- a/buildstream/_protos/google/rpc/code_pb2_grpc.py
+++ b/src/buildstream/_protos/google/rpc/code_pb2_grpc.py
diff --git a/buildstream/_protos/google/rpc/status.proto b/src/buildstream/_protos/google/rpc/status.proto
index 0839ee966..0839ee966 100644
--- a/buildstream/_protos/google/rpc/status.proto
+++ b/src/buildstream/_protos/google/rpc/status.proto
diff --git a/buildstream/_protos/google/rpc/status_pb2.py b/src/buildstream/_protos/google/rpc/status_pb2.py
index 6c4772311..6c4772311 100644
--- a/buildstream/_protos/google/rpc/status_pb2.py
+++ b/src/buildstream/_protos/google/rpc/status_pb2.py
diff --git a/buildstream/_protos/google/rpc/status_pb2_grpc.py b/src/buildstream/_protos/google/rpc/status_pb2_grpc.py
index a89435267..a89435267 100644
--- a/buildstream/_protos/google/rpc/status_pb2_grpc.py
+++ b/src/buildstream/_protos/google/rpc/status_pb2_grpc.py
diff --git a/buildstream/_scheduler/__init__.py b/src/buildstream/_scheduler/__init__.py
index d2f458fa5..d2f458fa5 100644
--- a/buildstream/_scheduler/__init__.py
+++ b/src/buildstream/_scheduler/__init__.py
diff --git a/buildstream/_scheduler/jobs/__init__.py b/src/buildstream/_scheduler/jobs/__init__.py
index 3e213171a..3e213171a 100644
--- a/buildstream/_scheduler/jobs/__init__.py
+++ b/src/buildstream/_scheduler/jobs/__init__.py
diff --git a/buildstream/_scheduler/jobs/cachesizejob.py b/src/buildstream/_scheduler/jobs/cachesizejob.py
index 5f27b7fc1..5f27b7fc1 100644
--- a/buildstream/_scheduler/jobs/cachesizejob.py
+++ b/src/buildstream/_scheduler/jobs/cachesizejob.py
diff --git a/buildstream/_scheduler/jobs/cleanupjob.py b/src/buildstream/_scheduler/jobs/cleanupjob.py
index 4764b30b3..4764b30b3 100644
--- a/buildstream/_scheduler/jobs/cleanupjob.py
+++ b/src/buildstream/_scheduler/jobs/cleanupjob.py
diff --git a/buildstream/_scheduler/jobs/elementjob.py b/src/buildstream/_scheduler/jobs/elementjob.py
index fb5d38e11..fb5d38e11 100644
--- a/buildstream/_scheduler/jobs/elementjob.py
+++ b/src/buildstream/_scheduler/jobs/elementjob.py
diff --git a/buildstream/_scheduler/jobs/job.py b/src/buildstream/_scheduler/jobs/job.py
index dd91d1634..dd91d1634 100644
--- a/buildstream/_scheduler/jobs/job.py
+++ b/src/buildstream/_scheduler/jobs/job.py
diff --git a/buildstream/_scheduler/queues/__init__.py b/src/buildstream/_scheduler/queues/__init__.py
index 3b2293919..3b2293919 100644
--- a/buildstream/_scheduler/queues/__init__.py
+++ b/src/buildstream/_scheduler/queues/__init__.py
diff --git a/buildstream/_scheduler/queues/artifactpushqueue.py b/src/buildstream/_scheduler/queues/artifactpushqueue.py
index b861d4fc7..b861d4fc7 100644
--- a/buildstream/_scheduler/queues/artifactpushqueue.py
+++ b/src/buildstream/_scheduler/queues/artifactpushqueue.py
diff --git a/buildstream/_scheduler/queues/buildqueue.py b/src/buildstream/_scheduler/queues/buildqueue.py
index aa489f381..aa489f381 100644
--- a/buildstream/_scheduler/queues/buildqueue.py
+++ b/src/buildstream/_scheduler/queues/buildqueue.py
diff --git a/buildstream/_scheduler/queues/fetchqueue.py b/src/buildstream/_scheduler/queues/fetchqueue.py
index 9edeebb1d..9edeebb1d 100644
--- a/buildstream/_scheduler/queues/fetchqueue.py
+++ b/src/buildstream/_scheduler/queues/fetchqueue.py
diff --git a/buildstream/_scheduler/queues/pullqueue.py b/src/buildstream/_scheduler/queues/pullqueue.py
index 013ee6489..013ee6489 100644
--- a/buildstream/_scheduler/queues/pullqueue.py
+++ b/src/buildstream/_scheduler/queues/pullqueue.py
diff --git a/buildstream/_scheduler/queues/queue.py b/src/buildstream/_scheduler/queues/queue.py
index 1efcffc16..1efcffc16 100644
--- a/buildstream/_scheduler/queues/queue.py
+++ b/src/buildstream/_scheduler/queues/queue.py
diff --git a/buildstream/_scheduler/queues/sourcepushqueue.py b/src/buildstream/_scheduler/queues/sourcepushqueue.py
index c38460e6a..c38460e6a 100644
--- a/buildstream/_scheduler/queues/sourcepushqueue.py
+++ b/src/buildstream/_scheduler/queues/sourcepushqueue.py
diff --git a/buildstream/_scheduler/queues/trackqueue.py b/src/buildstream/_scheduler/queues/trackqueue.py
index 72a79a532..72a79a532 100644
--- a/buildstream/_scheduler/queues/trackqueue.py
+++ b/src/buildstream/_scheduler/queues/trackqueue.py
diff --git a/buildstream/_scheduler/resources.py b/src/buildstream/_scheduler/resources.py
index 73bf66b4a..73bf66b4a 100644
--- a/buildstream/_scheduler/resources.py
+++ b/src/buildstream/_scheduler/resources.py
diff --git a/buildstream/_scheduler/scheduler.py b/src/buildstream/_scheduler/scheduler.py
index 50ad7f07a..50ad7f07a 100644
--- a/buildstream/_scheduler/scheduler.py
+++ b/src/buildstream/_scheduler/scheduler.py
diff --git a/buildstream/_signals.py b/src/buildstream/_signals.py
index 41b100f93..41b100f93 100644
--- a/buildstream/_signals.py
+++ b/src/buildstream/_signals.py
diff --git a/buildstream/_site.py b/src/buildstream/_site.py
index 8940fa34a..8940fa34a 100644
--- a/buildstream/_site.py
+++ b/src/buildstream/_site.py
diff --git a/buildstream/_sourcecache.py b/src/buildstream/_sourcecache.py
index 1d3342a75..1d3342a75 100644
--- a/buildstream/_sourcecache.py
+++ b/src/buildstream/_sourcecache.py
diff --git a/buildstream/_sourcefactory.py b/src/buildstream/_sourcefactory.py
index 1d959a140..1d959a140 100644
--- a/buildstream/_sourcefactory.py
+++ b/src/buildstream/_sourcefactory.py
diff --git a/buildstream/_stream.py b/src/buildstream/_stream.py
index 2343c553c..2343c553c 100644
--- a/buildstream/_stream.py
+++ b/src/buildstream/_stream.py
diff --git a/buildstream/_variables.py b/src/buildstream/_variables.py
index 74314cf1f..74314cf1f 100644
--- a/buildstream/_variables.py
+++ b/src/buildstream/_variables.py
diff --git a/buildstream/_version.py b/src/buildstream/_version.py
index 03f946cb8..03f946cb8 100644
--- a/buildstream/_version.py
+++ b/src/buildstream/_version.py
diff --git a/buildstream/_versions.py b/src/buildstream/_versions.py
index c439f59fb..c439f59fb 100644
--- a/buildstream/_versions.py
+++ b/src/buildstream/_versions.py
diff --git a/buildstream/_workspaces.py b/src/buildstream/_workspaces.py
index 9fbfb7e63..9fbfb7e63 100644
--- a/buildstream/_workspaces.py
+++ b/src/buildstream/_workspaces.py
diff --git a/buildstream/_yaml.py b/src/buildstream/_yaml.py
index cdab4269e..cdab4269e 100644
--- a/buildstream/_yaml.py
+++ b/src/buildstream/_yaml.py
diff --git a/buildstream/buildelement.py b/src/buildstream/buildelement.py
index 158f5fc11..158f5fc11 100644
--- a/buildstream/buildelement.py
+++ b/src/buildstream/buildelement.py
diff --git a/buildstream/data/bst b/src/buildstream/data/bst
index e38720f77..e38720f77 100644
--- a/buildstream/data/bst
+++ b/src/buildstream/data/bst
diff --git a/buildstream/data/build-all.sh.in b/src/buildstream/data/build-all.sh.in
index bf5c9f880..bf5c9f880 100644
--- a/buildstream/data/build-all.sh.in
+++ b/src/buildstream/data/build-all.sh.in
diff --git a/buildstream/data/build-module.sh.in b/src/buildstream/data/build-module.sh.in
index 6e9ea4552..6e9ea4552 100644
--- a/buildstream/data/build-module.sh.in
+++ b/src/buildstream/data/build-module.sh.in
diff --git a/buildstream/data/projectconfig.yaml b/src/buildstream/data/projectconfig.yaml
index ee4055cf5..ee4055cf5 100644
--- a/buildstream/data/projectconfig.yaml
+++ b/src/buildstream/data/projectconfig.yaml
diff --git a/buildstream/data/userconfig.yaml b/src/buildstream/data/userconfig.yaml
index 34fd300d1..34fd300d1 100644
--- a/buildstream/data/userconfig.yaml
+++ b/src/buildstream/data/userconfig.yaml
diff --git a/buildstream/element.py b/src/buildstream/element.py
index 70158f778..70158f778 100644
--- a/buildstream/element.py
+++ b/src/buildstream/element.py
diff --git a/buildstream/plugin.py b/src/buildstream/plugin.py
index d8b6a7359..d8b6a7359 100644
--- a/buildstream/plugin.py
+++ b/src/buildstream/plugin.py
diff --git a/buildstream/plugins/elements/__init__.py b/src/buildstream/plugins/elements/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/plugins/elements/__init__.py
+++ b/src/buildstream/plugins/elements/__init__.py
diff --git a/buildstream/plugins/elements/autotools.py b/src/buildstream/plugins/elements/autotools.py
index 2243a73f9..7a05336b7 100644
--- a/buildstream/plugins/elements/autotools.py
+++ b/src/buildstream/plugins/elements/autotools.py
@@ -48,7 +48,7 @@ an example of that:
 
 Here is the default configuration for the ``autotools`` element in full:
 
-  .. literalinclude:: ../../../buildstream/plugins/elements/autotools.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/autotools.yaml
      :language: yaml
 
 See :ref:`built-in functionality documentation <core_buildelement_builtins>` for
diff --git a/buildstream/plugins/elements/autotools.yaml b/src/buildstream/plugins/elements/autotools.yaml
index 85f7393e7..85f7393e7 100644
--- a/buildstream/plugins/elements/autotools.yaml
+++ b/src/buildstream/plugins/elements/autotools.yaml
diff --git a/buildstream/plugins/elements/cmake.py b/src/buildstream/plugins/elements/cmake.py
index a1bea0cd6..74da04899 100644
--- a/buildstream/plugins/elements/cmake.py
+++ b/src/buildstream/plugins/elements/cmake.py
@@ -47,7 +47,7 @@ an example of that:
 
 Here is the default configuration for the ``cmake`` element in full:
 
-  .. literalinclude:: ../../../buildstream/plugins/elements/cmake.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/cmake.yaml
      :language: yaml
 
 See :ref:`built-in functionality documentation <core_buildelement_builtins>` for
diff --git a/buildstream/plugins/elements/cmake.yaml b/src/buildstream/plugins/elements/cmake.yaml
index ba20d7ce6..ba20d7ce6 100644
--- a/buildstream/plugins/elements/cmake.yaml
+++ b/src/buildstream/plugins/elements/cmake.yaml
diff --git a/buildstream/plugins/elements/compose.py b/src/buildstream/plugins/elements/compose.py
index f45ffd76a..b672cde0c 100644
--- a/buildstream/plugins/elements/compose.py
+++ b/src/buildstream/plugins/elements/compose.py
@@ -29,7 +29,7 @@ Since this element's output includes its dependencies, it may only
 depend on elements as `build` type dependencies.
 
 The default configuration and possible options are as such:
-  .. literalinclude:: ../../../buildstream/plugins/elements/compose.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/compose.yaml
      :language: yaml
 """
 
diff --git a/buildstream/plugins/elements/compose.yaml b/src/buildstream/plugins/elements/compose.yaml
index fd2eb9358..fd2eb9358 100644
--- a/buildstream/plugins/elements/compose.yaml
+++ b/src/buildstream/plugins/elements/compose.yaml
diff --git a/buildstream/plugins/elements/distutils.py b/src/buildstream/plugins/elements/distutils.py
index 94d7a9705..4b2c1e2f4 100644
--- a/buildstream/plugins/elements/distutils.py
+++ b/src/buildstream/plugins/elements/distutils.py
@@ -24,7 +24,7 @@ A :mod:`BuildElement <buildstream.buildelement>` implementation for using
 python distutils
 
 The distutils default configuration:
-  .. literalinclude:: ../../../buildstream/plugins/elements/distutils.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/distutils.yaml
      :language: yaml
 
 See :ref:`built-in functionality documentation <core_buildelement_builtins>` for
diff --git a/buildstream/plugins/elements/distutils.yaml b/src/buildstream/plugins/elements/distutils.yaml
index cec7da6e9..cec7da6e9 100644
--- a/buildstream/plugins/elements/distutils.yaml
+++ b/src/buildstream/plugins/elements/distutils.yaml
diff --git a/buildstream/plugins/elements/filter.py b/src/buildstream/plugins/elements/filter.py
index 940e820a0..45847e685 100644
--- a/buildstream/plugins/elements/filter.py
+++ b/src/buildstream/plugins/elements/filter.py
@@ -139,7 +139,7 @@ The artifact of ``filter-misc.bst`` will only contain the file 'baz'.
 Below is more information regarding the the default configurations and possible options
 of the filter element:
 
-.. literalinclude:: ../../../buildstream/plugins/elements/filter.yaml
+.. literalinclude:: ../../../src/buildstream/plugins/elements/filter.yaml
    :language: yaml
 """
 
diff --git a/buildstream/plugins/elements/filter.yaml b/src/buildstream/plugins/elements/filter.yaml
index 9c2bf69f4..9c2bf69f4 100644
--- a/buildstream/plugins/elements/filter.yaml
+++ b/src/buildstream/plugins/elements/filter.yaml
diff --git a/buildstream/plugins/elements/import.py b/src/buildstream/plugins/elements/import.py
index 73884214f..61e353dbc 100644
--- a/buildstream/plugins/elements/import.py
+++ b/src/buildstream/plugins/elements/import.py
@@ -26,7 +26,7 @@ import an SDK to build on top of or to overlay your build with
 some configuration data.
 
 The empty configuration is as such:
-  .. literalinclude:: ../../../buildstream/plugins/elements/import.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/import.yaml
      :language: yaml
 """
 
diff --git a/buildstream/plugins/elements/import.yaml b/src/buildstream/plugins/elements/import.yaml
index 698111b55..698111b55 100644
--- a/buildstream/plugins/elements/import.yaml
+++ b/src/buildstream/plugins/elements/import.yaml
diff --git a/buildstream/plugins/elements/junction.py b/src/buildstream/plugins/elements/junction.py
index 15ef115d9..15ef115d9 100644
--- a/buildstream/plugins/elements/junction.py
+++ b/src/buildstream/plugins/elements/junction.py
diff --git a/buildstream/plugins/elements/make.py b/src/buildstream/plugins/elements/make.py
index 262dc2b3f..67a261100 100644
--- a/buildstream/plugins/elements/make.py
+++ b/src/buildstream/plugins/elements/make.py
@@ -29,7 +29,7 @@ using GNU make based build.
 
 Here is the default configuration for the ``make`` element in full:
 
-  .. literalinclude:: ../../../buildstream/plugins/elements/make.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/make.yaml
      :language: yaml
 
 See :ref:`built-in functionality documentation <core_buildelement_builtins>` for
diff --git a/buildstream/plugins/elements/make.yaml b/src/buildstream/plugins/elements/make.yaml
index 83e5c658f..83e5c658f 100644
--- a/buildstream/plugins/elements/make.yaml
+++ b/src/buildstream/plugins/elements/make.yaml
diff --git a/buildstream/plugins/elements/makemaker.py b/src/buildstream/plugins/elements/makemaker.py
index c3161581a..7da051592 100644
--- a/buildstream/plugins/elements/makemaker.py
+++ b/src/buildstream/plugins/elements/makemaker.py
@@ -24,7 +24,7 @@ A :mod:`BuildElement <buildstream.buildelement>` implementation for using
 the Perl ExtUtil::MakeMaker build system
 
 The MakeMaker default configuration:
-  .. literalinclude:: ../../../buildstream/plugins/elements/makemaker.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/makemaker.yaml
      :language: yaml
 
 See :ref:`built-in functionality documentation <core_buildelement_builtins>` for
diff --git a/buildstream/plugins/elements/makemaker.yaml b/src/buildstream/plugins/elements/makemaker.yaml
index c9c4622cb..c9c4622cb 100644
--- a/buildstream/plugins/elements/makemaker.yaml
+++ b/src/buildstream/plugins/elements/makemaker.yaml
diff --git a/buildstream/plugins/elements/manual.py b/src/buildstream/plugins/elements/manual.py
index 7ca761428..bbda65312 100644
--- a/buildstream/plugins/elements/manual.py
+++ b/src/buildstream/plugins/elements/manual.py
@@ -24,7 +24,7 @@ The most basic build element does nothing but allows users to
 add custom build commands to the array understood by the :mod:`BuildElement <buildstream.buildelement>`
 
 The empty configuration is as such:
-  .. literalinclude:: ../../../buildstream/plugins/elements/manual.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/manual.yaml
      :language: yaml
 
 See :ref:`built-in functionality documentation <core_buildelement_builtins>` for
diff --git a/buildstream/plugins/elements/manual.yaml b/src/buildstream/plugins/elements/manual.yaml
index 38fe7d163..38fe7d163 100644
--- a/buildstream/plugins/elements/manual.yaml
+++ b/src/buildstream/plugins/elements/manual.yaml
diff --git a/buildstream/plugins/elements/meson.py b/src/buildstream/plugins/elements/meson.py
index b16f025a0..d80f77977 100644
--- a/buildstream/plugins/elements/meson.py
+++ b/src/buildstream/plugins/elements/meson.py
@@ -44,7 +44,7 @@ an example of that:
 
 Here is the default configuration for the ``meson`` element in full:
 
-  .. literalinclude:: ../../../buildstream/plugins/elements/meson.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/meson.yaml
      :language: yaml
 
 See :ref:`built-in functionality documentation <core_buildelement_builtins>` for
diff --git a/buildstream/plugins/elements/meson.yaml b/src/buildstream/plugins/elements/meson.yaml
index 2172cb34c..2172cb34c 100644
--- a/buildstream/plugins/elements/meson.yaml
+++ b/src/buildstream/plugins/elements/meson.yaml
diff --git a/buildstream/plugins/elements/modulebuild.py b/src/buildstream/plugins/elements/modulebuild.py
index a83d2705d..63e3840dc 100644
--- a/buildstream/plugins/elements/modulebuild.py
+++ b/src/buildstream/plugins/elements/modulebuild.py
@@ -24,7 +24,7 @@ A :mod:`BuildElement <buildstream.buildelement>` implementation for using
 the Perl Module::Build build system
 
 The modulebuild default configuration:
-  .. literalinclude:: ../../../buildstream/plugins/elements/modulebuild.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/modulebuild.yaml
      :language: yaml
 
 See :ref:`built-in functionality documentation <core_buildelement_builtins>` for
diff --git a/buildstream/plugins/elements/modulebuild.yaml b/src/buildstream/plugins/elements/modulebuild.yaml
index 18f034bab..18f034bab 100644
--- a/buildstream/plugins/elements/modulebuild.yaml
+++ b/src/buildstream/plugins/elements/modulebuild.yaml
diff --git a/buildstream/plugins/elements/pip.py b/src/buildstream/plugins/elements/pip.py
index 31e1071f0..4a9eefde1 100644
--- a/buildstream/plugins/elements/pip.py
+++ b/src/buildstream/plugins/elements/pip.py
@@ -24,7 +24,7 @@ A :mod:`BuildElement <buildstream.buildelement>` implementation for installing
 Python modules with pip
 
 The pip default configuration:
-  .. literalinclude:: ../../../buildstream/plugins/elements/pip.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/pip.yaml
      :language: yaml
 
 See :ref:`built-in functionality documentation <core_buildelement_builtins>` for
diff --git a/buildstream/plugins/elements/pip.yaml b/src/buildstream/plugins/elements/pip.yaml
index 294d4ad9a..294d4ad9a 100644
--- a/buildstream/plugins/elements/pip.yaml
+++ b/src/buildstream/plugins/elements/pip.yaml
diff --git a/buildstream/plugins/elements/qmake.py b/src/buildstream/plugins/elements/qmake.py
index 1bb5fd74a..56a0e641e 100644
--- a/buildstream/plugins/elements/qmake.py
+++ b/src/buildstream/plugins/elements/qmake.py
@@ -24,7 +24,7 @@ A :mod:`BuildElement <buildstream.buildelement>` implementation for using
 the qmake build system
 
 The qmake default configuration:
-  .. literalinclude:: ../../../buildstream/plugins/elements/qmake.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/qmake.yaml
      :language: yaml
 
 See :ref:`built-in functionality documentation <core_buildelement_builtins>` for
diff --git a/buildstream/plugins/elements/qmake.yaml b/src/buildstream/plugins/elements/qmake.yaml
index 4ac31932e..4ac31932e 100644
--- a/buildstream/plugins/elements/qmake.yaml
+++ b/src/buildstream/plugins/elements/qmake.yaml
diff --git a/buildstream/plugins/elements/script.py b/src/buildstream/plugins/elements/script.py
index 6c33ecf95..0d194dcc1 100644
--- a/buildstream/plugins/elements/script.py
+++ b/src/buildstream/plugins/elements/script.py
@@ -31,7 +31,7 @@ input and create some output.
    detail on specifying dependencies.
 
 The default configuration and possible options are as such:
-  .. literalinclude:: ../../../buildstream/plugins/elements/script.yaml
+  .. literalinclude:: ../../../src/buildstream/plugins/elements/script.yaml
      :language: yaml
 """
 
diff --git a/buildstream/plugins/elements/script.yaml b/src/buildstream/plugins/elements/script.yaml
index b388378da..b388378da 100644
--- a/buildstream/plugins/elements/script.yaml
+++ b/src/buildstream/plugins/elements/script.yaml
diff --git a/buildstream/plugins/elements/stack.py b/src/buildstream/plugins/elements/stack.py
index 97517ca48..97517ca48 100644
--- a/buildstream/plugins/elements/stack.py
+++ b/src/buildstream/plugins/elements/stack.py
diff --git a/buildstream/plugins/sources/__init__.py b/src/buildstream/plugins/sources/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/plugins/sources/__init__.py
+++ b/src/buildstream/plugins/sources/__init__.py
diff --git a/buildstream/plugins/sources/_downloadablefilesource.py b/src/buildstream/plugins/sources/_downloadablefilesource.py
index b9b15e268..b9b15e268 100644
--- a/buildstream/plugins/sources/_downloadablefilesource.py
+++ b/src/buildstream/plugins/sources/_downloadablefilesource.py
diff --git a/buildstream/plugins/sources/bzr.py b/src/buildstream/plugins/sources/bzr.py
index e59986da6..e59986da6 100644
--- a/buildstream/plugins/sources/bzr.py
+++ b/src/buildstream/plugins/sources/bzr.py
diff --git a/buildstream/plugins/sources/deb.py b/src/buildstream/plugins/sources/deb.py
index e45994951..e45994951 100644
--- a/buildstream/plugins/sources/deb.py
+++ b/src/buildstream/plugins/sources/deb.py
diff --git a/buildstream/plugins/sources/git.py b/src/buildstream/plugins/sources/git.py
index 5e6834979..5e6834979 100644
--- a/buildstream/plugins/sources/git.py
+++ b/src/buildstream/plugins/sources/git.py
diff --git a/buildstream/plugins/sources/local.py b/src/buildstream/plugins/sources/local.py
index 50df85427..50df85427 100644
--- a/buildstream/plugins/sources/local.py
+++ b/src/buildstream/plugins/sources/local.py
diff --git a/buildstream/plugins/sources/patch.py b/src/buildstream/plugins/sources/patch.py
index e42868264..e42868264 100644
--- a/buildstream/plugins/sources/patch.py
+++ b/src/buildstream/plugins/sources/patch.py
diff --git a/buildstream/plugins/sources/pip.py b/src/buildstream/plugins/sources/pip.py
index 9d6c40d74..9d6c40d74 100644
--- a/buildstream/plugins/sources/pip.py
+++ b/src/buildstream/plugins/sources/pip.py
diff --git a/buildstream/plugins/sources/remote.py b/src/buildstream/plugins/sources/remote.py
index 562a8f226..562a8f226 100644
--- a/buildstream/plugins/sources/remote.py
+++ b/src/buildstream/plugins/sources/remote.py
diff --git a/buildstream/plugins/sources/tar.py b/src/buildstream/plugins/sources/tar.py
index 31dc17497..31dc17497 100644
--- a/buildstream/plugins/sources/tar.py
+++ b/src/buildstream/plugins/sources/tar.py
diff --git a/buildstream/plugins/sources/zip.py b/src/buildstream/plugins/sources/zip.py
index 03efcef79..03efcef79 100644
--- a/buildstream/plugins/sources/zip.py
+++ b/src/buildstream/plugins/sources/zip.py
diff --git a/buildstream/sandbox/__init__.py b/src/buildstream/sandbox/__init__.py
index 5966d194f..5966d194f 100644
--- a/buildstream/sandbox/__init__.py
+++ b/src/buildstream/sandbox/__init__.py
diff --git a/buildstream/sandbox/_config.py b/src/buildstream/sandbox/_config.py
index 457f92b3c..457f92b3c 100644
--- a/buildstream/sandbox/_config.py
+++ b/src/buildstream/sandbox/_config.py
diff --git a/buildstream/sandbox/_mount.py b/src/buildstream/sandbox/_mount.py
index c0f26c8d7..c0f26c8d7 100644
--- a/buildstream/sandbox/_mount.py
+++ b/src/buildstream/sandbox/_mount.py
diff --git a/buildstream/sandbox/_mounter.py b/src/buildstream/sandbox/_mounter.py
index e6054c20d..e6054c20d 100644
--- a/buildstream/sandbox/_mounter.py
+++ b/src/buildstream/sandbox/_mounter.py
diff --git a/buildstream/sandbox/_sandboxbwrap.py b/src/buildstream/sandbox/_sandboxbwrap.py
index d2abc33d0..d2abc33d0 100644
--- a/buildstream/sandbox/_sandboxbwrap.py
+++ b/src/buildstream/sandbox/_sandboxbwrap.py
diff --git a/buildstream/sandbox/_sandboxchroot.py b/src/buildstream/sandbox/_sandboxchroot.py
index 7266a00e3..7266a00e3 100644
--- a/buildstream/sandbox/_sandboxchroot.py
+++ b/src/buildstream/sandbox/_sandboxchroot.py
diff --git a/buildstream/sandbox/_sandboxdummy.py b/src/buildstream/sandbox/_sandboxdummy.py
index 750ddb05d..750ddb05d 100644
--- a/buildstream/sandbox/_sandboxdummy.py
+++ b/src/buildstream/sandbox/_sandboxdummy.py
diff --git a/buildstream/sandbox/_sandboxremote.py b/src/buildstream/sandbox/_sandboxremote.py
index 2cb7e2538..2cb7e2538 100644
--- a/buildstream/sandbox/_sandboxremote.py
+++ b/src/buildstream/sandbox/_sandboxremote.py
diff --git a/buildstream/sandbox/sandbox.py b/src/buildstream/sandbox/sandbox.py
index c96ccb57b..c96ccb57b 100644
--- a/buildstream/sandbox/sandbox.py
+++ b/src/buildstream/sandbox/sandbox.py
diff --git a/buildstream/scriptelement.py b/src/buildstream/scriptelement.py
index dfdbb45c0..dfdbb45c0 100644
--- a/buildstream/scriptelement.py
+++ b/src/buildstream/scriptelement.py
diff --git a/buildstream/source.py b/src/buildstream/source.py
index fe94a15d7..fe94a15d7 100644
--- a/buildstream/source.py
+++ b/src/buildstream/source.py
diff --git a/buildstream/storage/__init__.py b/src/buildstream/storage/__init__.py
index 33424ac8d..33424ac8d 100644
--- a/buildstream/storage/__init__.py
+++ b/src/buildstream/storage/__init__.py
diff --git a/buildstream/storage/_casbaseddirectory.py b/src/buildstream/storage/_casbaseddirectory.py
index 2aff29b98..2aff29b98 100644
--- a/buildstream/storage/_casbaseddirectory.py
+++ b/src/buildstream/storage/_casbaseddirectory.py
diff --git a/buildstream/storage/_filebaseddirectory.py b/src/buildstream/storage/_filebaseddirectory.py
index 9a746f731..9a746f731 100644
--- a/buildstream/storage/_filebaseddirectory.py
+++ b/src/buildstream/storage/_filebaseddirectory.py
diff --git a/buildstream/storage/directory.py b/src/buildstream/storage/directory.py
index bad818fef..bad818fef 100644
--- a/buildstream/storage/directory.py
+++ b/src/buildstream/storage/directory.py
diff --git a/buildstream/testing/__init__.py b/src/buildstream/testing/__init__.py
index 0b1c1fd73..0b1c1fd73 100644
--- a/buildstream/testing/__init__.py
+++ b/src/buildstream/testing/__init__.py
diff --git a/buildstream/testing/_sourcetests/__init__.py b/src/buildstream/testing/_sourcetests/__init__.py
index e69de29bb..e69de29bb 100644
--- a/buildstream/testing/_sourcetests/__init__.py
+++ b/src/buildstream/testing/_sourcetests/__init__.py
diff --git a/buildstream/testing/_sourcetests/build_checkout.py b/src/buildstream/testing/_sourcetests/build_checkout.py
index 3619d2b7e..3619d2b7e 100644
--- a/buildstream/testing/_sourcetests/build_checkout.py
+++ b/src/buildstream/testing/_sourcetests/build_checkout.py
diff --git a/buildstream/testing/_sourcetests/fetch.py b/src/buildstream/testing/_sourcetests/fetch.py
index aaf92a14d..aaf92a14d 100644
--- a/buildstream/testing/_sourcetests/fetch.py
+++ b/src/buildstream/testing/_sourcetests/fetch.py
diff --git a/buildstream/testing/_sourcetests/mirror.py b/src/buildstream/testing/_sourcetests/mirror.py
index d682bb2ef..d682bb2ef 100644
--- a/buildstream/testing/_sourcetests/mirror.py
+++ b/src/buildstream/testing/_sourcetests/mirror.py
diff --git a/buildstream/testing/_sourcetests/project/elements/base.bst b/src/buildstream/testing/_sourcetests/project/elements/base.bst
index 428afa736..428afa736 100644
--- a/buildstream/testing/_sourcetests/project/elements/base.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/base.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst b/src/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst
index c5833095d..c5833095d 100644
--- a/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/base/base-alpine.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/import-bin.bst b/src/buildstream/testing/_sourcetests/project/elements/import-bin.bst
index a847c0c23..a847c0c23 100644
--- a/buildstream/testing/_sourcetests/project/elements/import-bin.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/import-bin.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/import-dev.bst b/src/buildstream/testing/_sourcetests/project/elements/import-dev.bst
index 152a54667..152a54667 100644
--- a/buildstream/testing/_sourcetests/project/elements/import-dev.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/import-dev.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst
index bd1ffae9c..bd1ffae9c 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/horsey.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/pony.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/pony.bst
index 3c29b4ea1..3c29b4ea1 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/pony.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/pony.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst
index 98447ab52..98447ab52 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/dependency/zebry.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/0.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/0.bst
index a99be06a0..a99be06a0 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/0.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/0.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/1.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/1.bst
index 82b507a62..82b507a62 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/1.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/1.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/2.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/2.bst
index ee1afae20..ee1afae20 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/2.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/2.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/3.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/3.bst
index 4c3a23dab..4c3a23dab 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/3.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/3.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/4.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/4.bst
index b663a0b52..b663a0b52 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/4.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/4.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/5.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/5.bst
index b9efcf71b..b9efcf71b 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/5.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/5.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/6.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/6.bst
index 6c19d04e3..6c19d04e3 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/6.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/6.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/7.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/7.bst
index 6805b3e6d..6805b3e6d 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/7.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/7.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/8.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/8.bst
index b8d8964a0..b8d8964a0 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/8.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/8.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/9.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/9.bst
index cc13bf3f0..cc13bf3f0 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/9.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/9.bst
diff --git a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/run.bst b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/run.bst
index 9b3d2446c..9b3d2446c 100644
--- a/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/run.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/multiple_targets/order/run.bst
diff --git a/buildstream/testing/_sourcetests/project/files/bar b/src/buildstream/testing/_sourcetests/project/files/bar
index e69de29bb..e69de29bb 100644
--- a/buildstream/testing/_sourcetests/project/files/bar
+++ b/src/buildstream/testing/_sourcetests/project/files/bar
diff --git a/buildstream/testing/_sourcetests/project/files/bin-files/usr/bin/hello b/src/buildstream/testing/_sourcetests/project/files/bin-files/usr/bin/hello
index f534a4083..f534a4083 100755
--- a/buildstream/testing/_sourcetests/project/files/bin-files/usr/bin/hello
+++ b/src/buildstream/testing/_sourcetests/project/files/bin-files/usr/bin/hello
diff --git a/buildstream/testing/_sourcetests/project/files/dev-files/usr/include/pony.h b/src/buildstream/testing/_sourcetests/project/files/dev-files/usr/include/pony.h
index 40bd0c2e7..40bd0c2e7 100644
--- a/buildstream/testing/_sourcetests/project/files/dev-files/usr/include/pony.h
+++ b/src/buildstream/testing/_sourcetests/project/files/dev-files/usr/include/pony.h
diff --git a/buildstream/testing/_sourcetests/project/files/etc-files/etc/buildstream/config b/src/buildstream/testing/_sourcetests/project/files/etc-files/etc/buildstream/config
index 04204c7c9..04204c7c9 100644
--- a/buildstream/testing/_sourcetests/project/files/etc-files/etc/buildstream/config
+++ b/src/buildstream/testing/_sourcetests/project/files/etc-files/etc/buildstream/config
diff --git a/buildstream/testing/_sourcetests/project/files/foo b/src/buildstream/testing/_sourcetests/project/files/foo
index e69de29bb..e69de29bb 100644
--- a/buildstream/testing/_sourcetests/project/files/foo
+++ b/src/buildstream/testing/_sourcetests/project/files/foo
diff --git a/buildstream/testing/_sourcetests/project/files/source-bundle/llamas.txt b/src/buildstream/testing/_sourcetests/project/files/source-bundle/llamas.txt
index f98b24871..f98b24871 100644
--- a/buildstream/testing/_sourcetests/project/files/source-bundle/llamas.txt
+++ b/src/buildstream/testing/_sourcetests/project/files/source-bundle/llamas.txt
diff --git a/buildstream/testing/_sourcetests/project/files/sub-project/elements/import-etc.bst b/src/buildstream/testing/_sourcetests/project/files/sub-project/elements/import-etc.bst
index f0171990e..f0171990e 100644
--- a/buildstream/testing/_sourcetests/project/files/sub-project/elements/import-etc.bst
+++ b/src/buildstream/testing/_sourcetests/project/files/sub-project/elements/import-etc.bst
diff --git a/buildstream/testing/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf b/src/buildstream/testing/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf
index db8c36cba..db8c36cba 100644
--- a/buildstream/testing/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf
+++ b/src/buildstream/testing/_sourcetests/project/files/sub-project/files/etc-files/etc/animal.conf
diff --git a/buildstream/testing/_sourcetests/project/files/sub-project/project.conf b/src/buildstream/testing/_sourcetests/project/files/sub-project/project.conf
index bbb8414a3..bbb8414a3 100644
--- a/buildstream/testing/_sourcetests/project/files/sub-project/project.conf
+++ b/src/buildstream/testing/_sourcetests/project/files/sub-project/project.conf
diff --git a/buildstream/testing/_sourcetests/project/project.conf b/src/buildstream/testing/_sourcetests/project/project.conf
index 05b68bfeb..05b68bfeb 100644
--- a/buildstream/testing/_sourcetests/project/project.conf
+++ b/src/buildstream/testing/_sourcetests/project/project.conf
diff --git a/buildstream/testing/_sourcetests/source_determinism.py b/src/buildstream/testing/_sourcetests/source_determinism.py
index 3a5c264d9..3a5c264d9 100644
--- a/buildstream/testing/_sourcetests/source_determinism.py
+++ b/src/buildstream/testing/_sourcetests/source_determinism.py
diff --git a/buildstream/testing/_sourcetests/track.py b/src/buildstream/testing/_sourcetests/track.py
index 668ea29e5..668ea29e5 100644
--- a/buildstream/testing/_sourcetests/track.py
+++ b/src/buildstream/testing/_sourcetests/track.py
diff --git a/buildstream/testing/_sourcetests/track_cross_junction.py b/src/buildstream/testing/_sourcetests/track_cross_junction.py
index ece3e0b8f..ece3e0b8f 100644
--- a/buildstream/testing/_sourcetests/track_cross_junction.py
+++ b/src/buildstream/testing/_sourcetests/track_cross_junction.py
diff --git a/buildstream/testing/_sourcetests/workspace.py b/src/buildstream/testing/_sourcetests/workspace.py
index 5218f8f1e..5218f8f1e 100644
--- a/buildstream/testing/_sourcetests/workspace.py
+++ b/src/buildstream/testing/_sourcetests/workspace.py
diff --git a/buildstream/testing/_utils/__init__.py b/src/buildstream/testing/_utils/__init__.py
index b419d72b7..b419d72b7 100644
--- a/buildstream/testing/_utils/__init__.py
+++ b/src/buildstream/testing/_utils/__init__.py
diff --git a/buildstream/testing/_utils/junction.py b/src/buildstream/testing/_utils/junction.py
index ca059eb8b..ca059eb8b 100644
--- a/buildstream/testing/_utils/junction.py
+++ b/src/buildstream/testing/_utils/junction.py
diff --git a/buildstream/testing/_utils/site.py b/src/buildstream/testing/_utils/site.py
index 54c5b467b..54c5b467b 100644
--- a/buildstream/testing/_utils/site.py
+++ b/src/buildstream/testing/_utils/site.py
diff --git a/buildstream/testing/integration.py b/src/buildstream/testing/integration.py
index 01635de74..01635de74 100644
--- a/buildstream/testing/integration.py
+++ b/src/buildstream/testing/integration.py
diff --git a/buildstream/testing/repo.py b/src/buildstream/testing/repo.py
index c1538685d..c1538685d 100644
--- a/buildstream/testing/repo.py
+++ b/src/buildstream/testing/repo.py
diff --git a/buildstream/testing/runcli.py b/src/buildstream/testing/runcli.py
index 8b3185143..8b3185143 100644
--- a/buildstream/testing/runcli.py
+++ b/src/buildstream/testing/runcli.py
diff --git a/buildstream/types.py b/src/buildstream/types.py
index d54bf0b6e..d54bf0b6e 100644
--- a/buildstream/types.py
+++ b/src/buildstream/types.py
diff --git a/buildstream/utils.py b/src/buildstream/utils.py
index ade593750..ade593750 100644
--- a/buildstream/utils.py
+++ b/src/buildstream/utils.py
diff --git a/tests/frontend/buildcheckout.py b/tests/frontend/buildcheckout.py
index b181e29bb..835f084cf 100644
--- a/tests/frontend/buildcheckout.py
+++ b/tests/frontend/buildcheckout.py
@@ -8,13 +8,13 @@ import subprocess
 
 import pytest
 
-from tests.testutils.site import IS_WINDOWS
-from tests.testutils import generate_junction, yaml_file_get_provenance
-
 from buildstream.testing import cli  # pylint: disable=unused-import
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
 
+from tests.testutils.site import IS_WINDOWS
+from tests.testutils import generate_junction, yaml_file_get_provenance
+
 from . import configure_project
 
 # Project directory
diff --git a/tests/frontend/fetch.py b/tests/frontend/fetch.py
index 9e7a55ad9..f470ce2b7 100644
--- a/tests/frontend/fetch.py
+++ b/tests/frontend/fetch.py
@@ -4,12 +4,13 @@
 import os
 import pytest
 
-from tests.testutils import generate_junction, yaml_file_get_provenance
 from buildstream.testing import create_repo
 from buildstream.testing import cli  # pylint: disable=unused-import
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
 
+from tests.testutils import generate_junction, yaml_file_get_provenance
+
 from . import configure_project
 
 # Project directory
diff --git a/tests/frontend/show.py b/tests/frontend/show.py
index 5acb99392..ef321fd79 100644
--- a/tests/frontend/show.py
+++ b/tests/frontend/show.py
@@ -6,11 +6,12 @@ import sys
 import shutil
 import itertools
 import pytest
-from tests.testutils import generate_junction, yaml_file_get_provenance
 from buildstream.testing import cli  # pylint: disable=unused-import
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
 
+from tests.testutils import generate_junction, yaml_file_get_provenance
+
 from . import configure_project
 
 # Project directory
diff --git a/tests/frontend/workspace.py b/tests/frontend/workspace.py
index 0f5d73db8..82c24b7ad 100644
--- a/tests/frontend/workspace.py
+++ b/tests/frontend/workspace.py
@@ -34,14 +34,14 @@ import subprocess
 
 import pytest
 
-from tests.testutils import create_artifact_share, create_element_size, wait_for_cache_granularity
-
 from buildstream.testing import create_repo, ALL_REPO_KINDS
 from buildstream.testing import cli  # pylint: disable=unused-import
 from buildstream import _yaml
 from buildstream._exceptions import ErrorDomain, LoadErrorReason
 from buildstream._workspaces import BST_WORKSPACE_FORMAT_VERSION
 
+from tests.testutils import create_artifact_share, create_element_size, wait_for_cache_granularity
+
 repo_kinds = [(kind) for kind in ALL_REPO_KINDS]
 
 # Project directory
diff --git a/tox.ini b/tox.ini
index 6d5a7c575..a7a4874c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -77,7 +77,7 @@ setenv =
 [testenv:lint]
 commands =
     pycodestyle
-    pylint buildstream tests
+    pylint src/buildstream tests
 deps =
     -rrequirements/requirements.txt
     -rrequirements/dev-requirements.txt