diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a9ca74c17..b4066b2c9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -11,16 +11,16 @@
 .github/CODEOWNERS @edolstra
 
 # Documentation of built-in functions
-src/libexpr/primops.cc @roberth @fricklerhandwerk
+subprojects/libexpr/primops.cc @roberth @fricklerhandwerk
 
 # Documentation of settings
-src/libexpr/eval-settings.hh @fricklerhandwerk
-src/libstore/globals.hh @fricklerhandwerk
+subprojects/libexpr/eval-settings.hh @fricklerhandwerk
+subprojects/libstore/globals.hh @fricklerhandwerk
 
 # Documentation
 doc/manual @fricklerhandwerk
 maintainers/*.md @fricklerhandwerk
-src/**/*.md @fricklerhandwerk
+subprojects/**/*.md @fricklerhandwerk
 
 # Libstore layer
-/src/libstore @ericson2314
+/subprojects/libstore @ericson2314
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 0e6fd3e26..f9251ee52 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,6 +1,6 @@
 "c api":
   - changed-files:
-    - any-glob-to-any-file: "src/lib*-c/**/*"
+    - any-glob-to-any-file: "subprojects/lib*-c/**/*"
     - any-glob-to-any-file: "test/unit/**/nix_api_*"
     - any-glob-to-any-file: "doc/external-api/**/*"
 
@@ -14,30 +14,30 @@
 "documentation":
   - changed-files:
     - any-glob-to-any-file: "doc/manual/**/*"
-    - any-glob-to-any-file: "src/nix/**/*.md"
+    - any-glob-to-any-file: "subprojects/nix/**/*.md"
 
 "store":
   - changed-files:
-    - any-glob-to-any-file: "src/libstore/store-api.*"
-    - any-glob-to-any-file: "src/libstore/*-store.*"
+    - any-glob-to-any-file: "subprojects/libstore/store-api.*"
+    - any-glob-to-any-file: "subprojects/libstore/*-store.*"
 
 "fetching":
   - changed-files:
-    - any-glob-to-any-file: "src/libfetchers/**/*"
+    - any-glob-to-any-file: "subprojects/libfetchers/**/*"
 
 "repl":
   - changed-files:
-    - any-glob-to-any-file: "src/libcmd/repl.*"
-    - any-glob-to-any-file: "src/nix/repl.*"
+    - any-glob-to-any-file: "subprojects/libcmd/repl.*"
+    - any-glob-to-any-file: "subprojects/nix/repl.*"
 
 "new-cli":
   - changed-files:
-    - any-glob-to-any-file: "src/nix/**/*"
+    - any-glob-to-any-file: "subprojects/nix/**/*"
 
 "with-tests":
   - changed-files:
     # Unit tests
-    - any-glob-to-any-file: "src/*/tests/**/*"
+    - any-glob-to-any-file: "subprojects/*/tests/**/*"
     # Functional and integration tests
     - any-glob-to-any-file: "tests/functional/**/*"
 
diff --git a/.gitignore b/.gitignore
index a17b627f4..88e6cd580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,59 +41,59 @@ perl/Makefile.config
 /scripts/nix-profile.fish
 /scripts/nix-profile-daemon.fish
 
-# /src/libexpr/
-/src/libexpr/lexer-tab.cc
-/src/libexpr/lexer-tab.hh
-/src/libexpr/parser-tab.cc
-/src/libexpr/parser-tab.hh
-/src/libexpr/parser-tab.output
-/src/libexpr/nix.tbl
-/src/libexpr/tests
+# /subprojects/libexpr/
+/subprojects/libexpr/lexer-tab.cc
+/subprojects/libexpr/lexer-tab.hh
+/subprojects/libexpr/parser-tab.cc
+/subprojects/libexpr/parser-tab.hh
+/subprojects/libexpr/parser-tab.output
+/subprojects/libexpr/nix.tbl
+/subprojects/libexpr/tests
 /tests/unit/libexpr/libnixexpr-tests
 
-# /src/libfetchers
+# /subprojects/libfetchers
 /tests/unit/libfetchers/libnixfetchers-tests
 
-# /src/libflake
+# /subprojects/libflake
 /tests/unit/libflake/libnixflake-tests
 
-# /src/libstore/
+# /subprojects/libstore/
 *.gen.*
-/src/libstore/tests
+/subprojects/libstore/tests
 /tests/unit/libstore/libnixstore-tests
 
-# /src/libutil/
-/src/libutil/tests
+# /subprojects/libutil/
+/subprojects/libutil/tests
 /tests/unit/libutil/libnixutil-tests
 
-/src/nix/nix
+/subprojects/nix/nix
 
-/src/nix/generated-doc
+/subprojects/nix/generated-doc
 
-# /src/nix-env/
-/src/nix-env/nix-env
+# /subprojects/nix-env/
+/subprojects/nix-env/nix-env
 
-# /src/nix-instantiate/
-/src/nix-instantiate/nix-instantiate
+# /subprojects/nix-instantiate/
+/subprojects/nix-instantiate/nix-instantiate
 
-# /src/nix-store/
-/src/nix-store/nix-store
+# /subprojects/nix-store/
+/subprojects/nix-store/nix-store
 
-/src/nix-prefetch-url/nix-prefetch-url
+/subprojects/nix-prefetch-url/nix-prefetch-url
 
-/src/nix-collect-garbage/nix-collect-garbage
+/subprojects/nix-collect-garbage/nix-collect-garbage
 
-# /src/nix-channel/
-/src/nix-channel/nix-channel
+# /subprojects/nix-channel/
+/subprojects/nix-channel/nix-channel
 
-# /src/nix-build/
-/src/nix-build/nix-build
+# /subprojects/nix-build/
+/subprojects/nix-build/nix-build
 
-/src/nix-copy-closure/nix-copy-closure
+/subprojects/nix-copy-closure/nix-copy-closure
 
-/src/error-demo/error-demo
+/subprojects/error-demo/error-demo
 
-/src/build-remote/build-remote
+/subprojects/build-remote/build-remote
 
 # /tests/functional/
 /tests/functional/test-tmp
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 56508df34..3acc8f35a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -77,7 +77,7 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy).
    - [ ] Fixes an [idea approved](https://github.com/NixOS/nix/labels/idea%20approved) issue
    - [ ] Tests, as appropriate:
      - Functional tests – [`tests/functional/**.sh`](./tests/functional)
-     - Unit tests – [`src/*/tests`](./src/)
+     - Unit tests – [`tests/unit/*`](./tests/unit)
      - Integration tests – [`tests/nixos/*`](./tests/nixos)
    - [ ] User documentation in the [manual](./doc/manual/src)
    - [ ] API documentation in header files
diff --git a/Makefile b/Makefile
index dbf510a3e..5e204d2b7 100644
--- a/Makefile
+++ b/Makefile
@@ -13,17 +13,17 @@ ifeq ($(ENABLE_BUILD), yes)
 makefiles = \
   mk/precompiled-headers.mk \
   local.mk \
-  src/libutil/local.mk \
-  src/libstore/local.mk \
-  src/libfetchers/local.mk \
-  src/libmain/local.mk \
-  src/libexpr/local.mk \
-  src/libflake/local.mk \
-  src/libcmd/local.mk \
-  src/nix/local.mk \
-  src/libutil-c/local.mk \
-  src/libstore-c/local.mk \
-  src/libexpr-c/local.mk
+  subprojects/libutil/local.mk \
+  subprojects/libstore/local.mk \
+  subprojects/libfetchers/local.mk \
+  subprojects/libmain/local.mk \
+  subprojects/libexpr/local.mk \
+  subprojects/libflake/local.mk \
+  subprojects/libcmd/local.mk \
+  subprojects/nix/local.mk \
+  subprojects/libutil-c/local.mk \
+  subprojects/libstore-c/local.mk \
+  subprojects/libexpr-c/local.mk
 
 ifdef HOST_UNIX
 makefiles += \
@@ -93,7 +93,7 @@ ifdef HOST_WINDOWS
   GLOBAL_LDFLAGS += -Wl,--export-all-symbols
 endif
 
-GLOBAL_CXXFLAGS += -g -Wall -Wdeprecated-copy -Wignored-qualifiers -Wimplicit-fallthrough -Werror=unused-result -Werror=suggest-override -include $(buildprefix)config.h -std=c++2a -I src
+GLOBAL_CXXFLAGS += -g -Wall -Wdeprecated-copy -Wignored-qualifiers -Wimplicit-fallthrough -Werror=unused-result -Werror=suggest-override -include $(buildprefix)config.h -std=c++2a -I subprojects
 
 # Include the main lib, causing rules to be defined
 
@@ -101,7 +101,7 @@ include mk/lib.mk
 
 # Fallback stub rules for better UX when things are disabled
 #
-# These must be defined after `mk/lib.mk`. Otherwise the first rule
+# These must be defined after  Otherwise the first rule
 # incorrectly becomes the default target.
 
 ifneq ($(ENABLE_UNIT_TESTS), yes)
diff --git a/doc/manual/src/development/testing.md b/doc/manual/src/development/testing.md
index 0df72cc38..4b683d2a9 100644
--- a/doc/manual/src/development/testing.md
+++ b/doc/manual/src/development/testing.md
@@ -27,7 +27,7 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks.
 > An example of some files, demonstrating much of what is described below
 >
 > ```
-> src
+> subprojects
 > ├── libexpr
 > │   ├── local.mk
 > │   ├── value/context.hh
@@ -59,12 +59,12 @@ The unit tests are defined using the [googletest] and [rapidcheck] frameworks.
 > …
 > ```
 
-The tests for each Nix library (`libnixexpr`, `libnixstore`, etc..) live inside a directory `src/${library_name_without-nix}-test`.
-Given an interface (header) and implementation pair in the original library, say, `src/libexpr/value/context.{hh,cc}`, we write tests for it in `src/nix-expr-tests/value/context.cc`, and (possibly) declare/define additional interfaces for testing purposes in `src/nix-expr-test-support/tests/value/context.{hh,cc}`.
+The tests for each Nix library (`libnixexpr`, `libnixstore`, etc..) live inside a directory `subprojects/${library_name_without-nix}-test`.
+Given an interface (header) and implementation pair in the original library, say, `subprojects/libexpr/value/context.{hh,cc}`, we write tests for it in `subprojects/nix-expr-tests/value/context.cc`, and (possibly) declare/define additional interfaces for testing purposes in `subprojects/nix-expr-test-support/tests/value/context.{hh,cc}`.
 
 Data for unit tests is stored in a `data` subdir of the directory for each unit test executable.
-For example, `libnixstore` code is in `src/libstore`, and its test data is in `src/nix-store-tests/data`.
-The path to the `src/${library_name_without-nix}-test/data` directory is passed to the unit test executable with the environment variable `_NIX_TEST_UNIT_DATA`.
+For example, `libnixstore` code is in `subprojects/libstore`, and its test data is in `subprojects/nix-store-tests/data`.
+The path to the `subprojects/${library_name_without-nix}-test/data` directory is passed to the unit test executable with the environment variable `_NIX_TEST_UNIT_DATA`.
 Note that each executable only gets the data for its tests.
 
 The unit test libraries are in `src/${library_name_without-nix}-test-support`.
diff --git a/local.mk b/local.mk
index b27c7031e..9e3eb400c 100644
--- a/local.mk
+++ b/local.mk
@@ -2,14 +2,14 @@ GLOBAL_CXXFLAGS += -Wno-deprecated-declarations -Werror=switch
 # Allow switch-enum to be overridden for files that do not support it, usually because of dependency headers.
 ERROR_SWITCH_ENUM = -Werror=switch-enum
 
-$(foreach i, config.h $(wildcard src/lib*/*.hh) $(filter-out %_internal.h, $(wildcard src/lib*c/*.h)), \
+$(foreach i, config.h $(wildcard subprojects/lib*/*.hh) $(filter-out %_internal.h, $(wildcard subprojects/lib*c/*.h)), \
   $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644)))
 
 ifdef HOST_UNIX
-  $(foreach i, $(wildcard src/lib*/unix/*.hh), \
+  $(foreach i, $(wildcard subprojects/lib*/unix/*.hh), \
     $(eval $(call install-file-in, $(i), $(includedir)/nix, 0644)))
 endif
 
-$(GCH): src/libutil/util.hh config.h
+$(GCH): subprojects/libutil/util.hh config.h
 
 GCH_CXXFLAGS = $(INCLUDE_libutil)
diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index fb286208d..af82175dd 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -25,402 +25,402 @@
             ''^doc/manual/redirects\.js$''
             ''^doc/manual/theme/highlight\.js$''
             ''^precompiled-headers\.h$''
-            ''^src/build-remote/build-remote\.cc$''
-            ''^src/libcmd/built-path\.cc$''
-            ''^src/libcmd/built-path\.hh$''
-            ''^src/libcmd/command\.cc$''
-            ''^src/libcmd/command\.hh$''
-            ''^src/libcmd/common-eval-args\.cc$''
-            ''^src/libcmd/common-eval-args\.hh$''
-            ''^src/libcmd/editor-for\.cc$''
-            ''^src/libcmd/installable-attr-path\.cc$''
-            ''^src/libcmd/installable-attr-path\.hh$''
-            ''^src/libcmd/installable-derived-path\.cc$''
-            ''^src/libcmd/installable-derived-path\.hh$''
-            ''^src/libcmd/installable-flake\.cc$''
-            ''^src/libcmd/installable-flake\.hh$''
-            ''^src/libcmd/installable-value\.cc$''
-            ''^src/libcmd/installable-value\.hh$''
-            ''^src/libcmd/installables\.cc$''
-            ''^src/libcmd/installables\.hh$''
-            ''^src/libcmd/legacy\.hh$''
-            ''^src/libcmd/markdown\.cc$''
-            ''^src/libcmd/misc-store-flags\.cc$''
-            ''^src/libcmd/repl-interacter\.cc$''
-            ''^src/libcmd/repl-interacter\.hh$''
-            ''^src/libcmd/repl\.cc$''
-            ''^src/libcmd/repl\.hh$''
-            ''^src/libexpr-c/nix_api_expr\.cc$''
-            ''^src/libexpr-c/nix_api_external\.cc$''
-            ''^src/libexpr/attr-path\.cc$''
-            ''^src/libexpr/attr-path\.hh$''
-            ''^src/libexpr/attr-set\.cc$''
-            ''^src/libexpr/attr-set\.hh$''
-            ''^src/libexpr/eval-cache\.cc$''
-            ''^src/libexpr/eval-cache\.hh$''
-            ''^src/libexpr/eval-error\.cc$''
-            ''^src/libexpr/eval-inline\.hh$''
-            ''^src/libexpr/eval-settings\.cc$''
-            ''^src/libexpr/eval-settings\.hh$''
-            ''^src/libexpr/eval\.cc$''
-            ''^src/libexpr/eval\.hh$''
-            ''^src/libexpr/function-trace\.cc$''
-            ''^src/libexpr/gc-small-vector\.hh$''
-            ''^src/libexpr/get-drvs\.cc$''
-            ''^src/libexpr/get-drvs\.hh$''
-            ''^src/libexpr/json-to-value\.cc$''
-            ''^src/libexpr/nixexpr\.cc$''
-            ''^src/libexpr/nixexpr\.hh$''
-            ''^src/libexpr/parser-state\.hh$''
-            ''^src/libexpr/pos-table\.hh$''
-            ''^src/libexpr/primops\.cc$''
-            ''^src/libexpr/primops\.hh$''
-            ''^src/libexpr/primops/context\.cc$''
-            ''^src/libexpr/primops/fetchClosure\.cc$''
-            ''^src/libexpr/primops/fetchMercurial\.cc$''
-            ''^src/libexpr/primops/fetchTree\.cc$''
-            ''^src/libexpr/primops/fromTOML\.cc$''
-            ''^src/libexpr/print-ambiguous\.cc$''
-            ''^src/libexpr/print-ambiguous\.hh$''
-            ''^src/libexpr/print-options\.hh$''
-            ''^src/libexpr/print\.cc$''
-            ''^src/libexpr/print\.hh$''
-            ''^src/libexpr/search-path\.cc$''
-            ''^src/libexpr/symbol-table\.hh$''
-            ''^src/libexpr/value-to-json\.cc$''
-            ''^src/libexpr/value-to-json\.hh$''
-            ''^src/libexpr/value-to-xml\.cc$''
-            ''^src/libexpr/value-to-xml\.hh$''
-            ''^src/libexpr/value\.hh$''
-            ''^src/libexpr/value/context\.cc$''
-            ''^src/libexpr/value/context\.hh$''
-            ''^src/libfetchers/attrs\.cc$''
-            ''^src/libfetchers/cache\.cc$''
-            ''^src/libfetchers/cache\.hh$''
-            ''^src/libfetchers/fetch-settings\.cc$''
-            ''^src/libfetchers/fetch-settings\.hh$''
-            ''^src/libfetchers/fetch-to-store\.cc$''
-            ''^src/libfetchers/fetchers\.cc$''
-            ''^src/libfetchers/fetchers\.hh$''
-            ''^src/libfetchers/filtering-source-accessor\.cc$''
-            ''^src/libfetchers/filtering-source-accessor\.hh$''
-            ''^src/libfetchers/fs-source-accessor\.cc$''
-            ''^src/libfetchers/fs-source-accessor\.hh$''
-            ''^src/libfetchers/git-utils\.cc$''
-            ''^src/libfetchers/git-utils\.hh$''
-            ''^src/libfetchers/github\.cc$''
-            ''^src/libfetchers/indirect\.cc$''
-            ''^src/libfetchers/memory-source-accessor\.cc$''
-            ''^src/libfetchers/path\.cc$''
-            ''^src/libfetchers/registry\.cc$''
-            ''^src/libfetchers/registry\.hh$''
-            ''^src/libfetchers/tarball\.cc$''
-            ''^src/libfetchers/tarball\.hh$''
-            ''^src/libfetchers/git\.cc$''
-            ''^src/libfetchers/mercurial\.cc$''
-            ''^src/libflake/flake/config\.cc$''
-            ''^src/libflake/flake/flake\.cc$''
-            ''^src/libflake/flake/flake\.hh$''
-            ''^src/libflake/flake/flakeref\.cc$''
-            ''^src/libflake/flake/flakeref\.hh$''
-            ''^src/libflake/flake/lockfile\.cc$''
-            ''^src/libflake/flake/lockfile\.hh$''
-            ''^src/libflake/flake/url-name\.cc$''
-            ''^src/libmain/common-args\.cc$''
-            ''^src/libmain/common-args\.hh$''
-            ''^src/libmain/loggers\.cc$''
-            ''^src/libmain/loggers\.hh$''
-            ''^src/libmain/progress-bar\.cc$''
-            ''^src/libmain/shared\.cc$''
-            ''^src/libmain/shared\.hh$''
-            ''^src/libmain/unix/stack\.cc$''
-            ''^src/libstore/binary-cache-store\.cc$''
-            ''^src/libstore/binary-cache-store\.hh$''
-            ''^src/libstore/build-result\.hh$''
-            ''^src/libstore/builtins\.hh$''
-            ''^src/libstore/builtins/buildenv\.cc$''
-            ''^src/libstore/builtins/buildenv\.hh$''
-            ''^src/libstore/common-protocol-impl\.hh$''
-            ''^src/libstore/common-protocol\.cc$''
-            ''^src/libstore/common-protocol\.hh$''
-            ''^src/libstore/common-ssh-store-config\.hh$''
-            ''^src/libstore/content-address\.cc$''
-            ''^src/libstore/content-address\.hh$''
-            ''^src/libstore/daemon\.cc$''
-            ''^src/libstore/daemon\.hh$''
-            ''^src/libstore/derivations\.cc$''
-            ''^src/libstore/derivations\.hh$''
-            ''^src/libstore/derived-path-map\.cc$''
-            ''^src/libstore/derived-path-map\.hh$''
-            ''^src/libstore/derived-path\.cc$''
-            ''^src/libstore/derived-path\.hh$''
-            ''^src/libstore/downstream-placeholder\.cc$''
-            ''^src/libstore/downstream-placeholder\.hh$''
-            ''^src/libstore/dummy-store\.cc$''
-            ''^src/libstore/export-import\.cc$''
-            ''^src/libstore/filetransfer\.cc$''
-            ''^src/libstore/filetransfer\.hh$''
-            ''^src/libstore/gc-store\.hh$''
-            ''^src/libstore/globals\.cc$''
-            ''^src/libstore/globals\.hh$''
-            ''^src/libstore/http-binary-cache-store\.cc$''
-            ''^src/libstore/legacy-ssh-store\.cc$''
-            ''^src/libstore/legacy-ssh-store\.hh$''
-            ''^src/libstore/length-prefixed-protocol-helper\.hh$''
-            ''^src/libstore/linux/personality\.cc$''
-            ''^src/libstore/linux/personality\.hh$''
-            ''^src/libstore/local-binary-cache-store\.cc$''
-            ''^src/libstore/local-fs-store\.cc$''
-            ''^src/libstore/local-fs-store\.hh$''
-            ''^src/libstore/log-store\.cc$''
-            ''^src/libstore/log-store\.hh$''
-            ''^src/libstore/machines\.cc$''
-            ''^src/libstore/machines\.hh$''
-            ''^src/libstore/make-content-addressed\.cc$''
-            ''^src/libstore/make-content-addressed\.hh$''
-            ''^src/libstore/misc\.cc$''
-            ''^src/libstore/names\.cc$''
-            ''^src/libstore/names\.hh$''
-            ''^src/libstore/nar-accessor\.cc$''
-            ''^src/libstore/nar-accessor\.hh$''
-            ''^src/libstore/nar-info-disk-cache\.cc$''
-            ''^src/libstore/nar-info-disk-cache\.hh$''
-            ''^src/libstore/nar-info\.cc$''
-            ''^src/libstore/nar-info\.hh$''
-            ''^src/libstore/outputs-spec\.cc$''
-            ''^src/libstore/outputs-spec\.hh$''
-            ''^src/libstore/parsed-derivations\.cc$''
-            ''^src/libstore/path-info\.cc$''
-            ''^src/libstore/path-info\.hh$''
-            ''^src/libstore/path-references\.cc$''
-            ''^src/libstore/path-regex\.hh$''
-            ''^src/libstore/path-with-outputs\.cc$''
-            ''^src/libstore/path\.cc$''
-            ''^src/libstore/path\.hh$''
-            ''^src/libstore/pathlocks\.cc$''
-            ''^src/libstore/pathlocks\.hh$''
-            ''^src/libstore/profiles\.cc$''
-            ''^src/libstore/profiles\.hh$''
-            ''^src/libstore/realisation\.cc$''
-            ''^src/libstore/realisation\.hh$''
-            ''^src/libstore/remote-fs-accessor\.cc$''
-            ''^src/libstore/remote-fs-accessor\.hh$''
-            ''^src/libstore/remote-store-connection\.hh$''
-            ''^src/libstore/remote-store\.cc$''
-            ''^src/libstore/remote-store\.hh$''
-            ''^src/libstore/s3-binary-cache-store\.cc$''
-            ''^src/libstore/s3\.hh$''
-            ''^src/libstore/serve-protocol-impl\.cc$''
-            ''^src/libstore/serve-protocol-impl\.hh$''
-            ''^src/libstore/serve-protocol\.cc$''
-            ''^src/libstore/serve-protocol\.hh$''
-            ''^src/libstore/sqlite\.cc$''
-            ''^src/libstore/sqlite\.hh$''
-            ''^src/libstore/ssh-store\.cc$''
-            ''^src/libstore/ssh\.cc$''
-            ''^src/libstore/ssh\.hh$''
-            ''^src/libstore/store-api\.cc$''
-            ''^src/libstore/store-api\.hh$''
-            ''^src/libstore/store-dir-config\.hh$''
-            ''^src/libstore/build/derivation-goal\.cc$''
-            ''^src/libstore/build/derivation-goal\.hh$''
-            ''^src/libstore/build/drv-output-substitution-goal\.cc$''
-            ''^src/libstore/build/drv-output-substitution-goal\.hh$''
-            ''^src/libstore/build/entry-points\.cc$''
-            ''^src/libstore/build/goal\.cc$''
-            ''^src/libstore/build/goal\.hh$''
-            ''^src/libstore/unix/build/hook-instance\.cc$''
-            ''^src/libstore/unix/build/local-derivation-goal\.cc$''
-            ''^src/libstore/unix/build/local-derivation-goal\.hh$''
-            ''^src/libstore/build/substitution-goal\.cc$''
-            ''^src/libstore/build/substitution-goal\.hh$''
-            ''^src/libstore/build/worker\.cc$''
-            ''^src/libstore/build/worker\.hh$''
-            ''^src/libstore/builtins/fetchurl\.cc$''
-            ''^src/libstore/builtins/unpack-channel\.cc$''
-            ''^src/libstore/gc\.cc$''
-            ''^src/libstore/local-overlay-store\.cc$''
-            ''^src/libstore/local-overlay-store\.hh$''
-            ''^src/libstore/local-store\.cc$''
-            ''^src/libstore/local-store\.hh$''
-            ''^src/libstore/unix/user-lock\.cc$''
-            ''^src/libstore/unix/user-lock\.hh$''
-            ''^src/libstore/optimise-store\.cc$''
-            ''^src/libstore/unix/pathlocks\.cc$''
-            ''^src/libstore/posix-fs-canonicalise\.cc$''
-            ''^src/libstore/posix-fs-canonicalise\.hh$''
-            ''^src/libstore/uds-remote-store\.cc$''
-            ''^src/libstore/uds-remote-store\.hh$''
-            ''^src/libstore/windows/build\.cc$''
-            ''^src/libstore/worker-protocol-impl\.hh$''
-            ''^src/libstore/worker-protocol\.cc$''
-            ''^src/libstore/worker-protocol\.hh$''
-            ''^src/libutil-c/nix_api_util_internal\.h$''
-            ''^src/libutil/archive\.cc$''
-            ''^src/libutil/archive\.hh$''
-            ''^src/libutil/args\.cc$''
-            ''^src/libutil/args\.hh$''
-            ''^src/libutil/args/root\.hh$''
-            ''^src/libutil/callback\.hh$''
-            ''^src/libutil/canon-path\.cc$''
-            ''^src/libutil/canon-path\.hh$''
-            ''^src/libutil/chunked-vector\.hh$''
-            ''^src/libutil/closure\.hh$''
-            ''^src/libutil/comparator\.hh$''
-            ''^src/libutil/compute-levels\.cc$''
-            ''^src/libutil/config-impl\.hh$''
-            ''^src/libutil/config\.cc$''
-            ''^src/libutil/config\.hh$''
-            ''^src/libutil/current-process\.cc$''
-            ''^src/libutil/current-process\.hh$''
-            ''^src/libutil/english\.cc$''
-            ''^src/libutil/english\.hh$''
-            ''^src/libutil/error\.cc$''
-            ''^src/libutil/error\.hh$''
-            ''^src/libutil/exit\.hh$''
-            ''^src/libutil/experimental-features\.cc$''
-            ''^src/libutil/experimental-features\.hh$''
-            ''^src/libutil/file-content-address\.cc$''
-            ''^src/libutil/file-content-address\.hh$''
-            ''^src/libutil/file-descriptor\.cc$''
-            ''^src/libutil/file-descriptor\.hh$''
-            ''^src/libutil/file-path-impl\.hh$''
-            ''^src/libutil/file-path\.hh$''
-            ''^src/libutil/file-system\.cc$''
-            ''^src/libutil/file-system\.hh$''
-            ''^src/libutil/finally\.hh$''
-            ''^src/libutil/fmt\.hh$''
-            ''^src/libutil/fs-sink\.cc$''
-            ''^src/libutil/fs-sink\.hh$''
-            ''^src/libutil/git\.cc$''
-            ''^src/libutil/git\.hh$''
-            ''^src/libutil/hash\.cc$''
-            ''^src/libutil/hash\.hh$''
-            ''^src/libutil/hilite\.cc$''
-            ''^src/libutil/hilite\.hh$''
-            ''^src/libutil/source-accessor\.hh$''
-            ''^src/libutil/json-impls\.hh$''
-            ''^src/libutil/json-utils\.cc$''
-            ''^src/libutil/json-utils\.hh$''
-            ''^src/libutil/linux/cgroup\.cc$''
-            ''^src/libutil/linux/namespaces\.cc$''
-            ''^src/libutil/logging\.cc$''
-            ''^src/libutil/logging\.hh$''
-            ''^src/libutil/lru-cache\.hh$''
-            ''^src/libutil/memory-source-accessor\.cc$''
-            ''^src/libutil/memory-source-accessor\.hh$''
-            ''^src/libutil/pool\.hh$''
-            ''^src/libutil/position\.cc$''
-            ''^src/libutil/position\.hh$''
-            ''^src/libutil/posix-source-accessor\.cc$''
-            ''^src/libutil/posix-source-accessor\.hh$''
-            ''^src/libutil/processes\.hh$''
-            ''^src/libutil/ref\.hh$''
-            ''^src/libutil/references\.cc$''
-            ''^src/libutil/references\.hh$''
-            ''^src/libutil/regex-combinators\.hh$''
-            ''^src/libutil/serialise\.cc$''
-            ''^src/libutil/serialise\.hh$''
-            ''^src/libutil/signals\.hh$''
-            ''^src/libutil/signature/local-keys\.cc$''
-            ''^src/libutil/signature/local-keys\.hh$''
-            ''^src/libutil/signature/signer\.cc$''
-            ''^src/libutil/signature/signer\.hh$''
-            ''^src/libutil/source-accessor\.cc$''
-            ''^src/libutil/source-accessor\.hh$''
-            ''^src/libutil/source-path\.cc$''
-            ''^src/libutil/source-path\.hh$''
-            ''^src/libutil/split\.hh$''
-            ''^src/libutil/suggestions\.cc$''
-            ''^src/libutil/suggestions\.hh$''
-            ''^src/libutil/sync\.hh$''
-            ''^src/libutil/terminal\.cc$''
-            ''^src/libutil/terminal\.hh$''
-            ''^src/libutil/thread-pool\.cc$''
-            ''^src/libutil/thread-pool\.hh$''
-            ''^src/libutil/topo-sort\.hh$''
-            ''^src/libutil/types\.hh$''
-            ''^src/libutil/unix/file-descriptor\.cc$''
-            ''^src/libutil/unix/file-path\.cc$''
-            ''^src/libutil/unix/monitor-fd\.hh$''
-            ''^src/libutil/unix/processes\.cc$''
-            ''^src/libutil/unix/signals-impl\.hh$''
-            ''^src/libutil/unix/signals\.cc$''
-            ''^src/libutil/unix-domain-socket\.cc$''
-            ''^src/libutil/unix/users\.cc$''
-            ''^src/libutil/url-parts\.hh$''
-            ''^src/libutil/url\.cc$''
-            ''^src/libutil/url\.hh$''
-            ''^src/libutil/users\.cc$''
-            ''^src/libutil/users\.hh$''
-            ''^src/libutil/util\.cc$''
-            ''^src/libutil/util\.hh$''
-            ''^src/libutil/variant-wrapper\.hh$''
-            ''^src/libutil/windows/file-descriptor\.cc$''
-            ''^src/libutil/windows/file-path\.cc$''
-            ''^src/libutil/windows/processes\.cc$''
-            ''^src/libutil/windows/users\.cc$''
-            ''^src/libutil/windows/windows-error\.cc$''
-            ''^src/libutil/windows/windows-error\.hh$''
-            ''^src/libutil/xml-writer\.cc$''
-            ''^src/libutil/xml-writer\.hh$''
-            ''^src/nix-build/nix-build\.cc$''
-            ''^src/nix-channel/nix-channel\.cc$''
-            ''^src/nix-collect-garbage/nix-collect-garbage\.cc$''
-            ''^src/nix-env/buildenv.nix$''
-            ''^src/nix-env/nix-env\.cc$''
-            ''^src/nix-env/user-env\.cc$''
-            ''^src/nix-env/user-env\.hh$''
-            ''^src/nix-instantiate/nix-instantiate\.cc$''
-            ''^src/nix-store/dotgraph\.cc$''
-            ''^src/nix-store/graphml\.cc$''
-            ''^src/nix-store/nix-store\.cc$''
-            ''^src/nix/add-to-store\.cc$''
-            ''^src/nix/app\.cc$''
-            ''^src/nix/build\.cc$''
-            ''^src/nix/bundle\.cc$''
-            ''^src/nix/cat\.cc$''
-            ''^src/nix/config-check\.cc$''
-            ''^src/nix/config\.cc$''
-            ''^src/nix/copy\.cc$''
-            ''^src/nix/derivation-add\.cc$''
-            ''^src/nix/derivation-show\.cc$''
-            ''^src/nix/derivation\.cc$''
-            ''^src/nix/develop\.cc$''
-            ''^src/nix/diff-closures\.cc$''
-            ''^src/nix/dump-path\.cc$''
-            ''^src/nix/edit\.cc$''
-            ''^src/nix/eval\.cc$''
-            ''^src/nix/flake\.cc$''
-            ''^src/nix/fmt\.cc$''
-            ''^src/nix/hash\.cc$''
-            ''^src/nix/log\.cc$''
-            ''^src/nix/ls\.cc$''
-            ''^src/nix/main\.cc$''
-            ''^src/nix/make-content-addressed\.cc$''
-            ''^src/nix/nar\.cc$''
-            ''^src/nix/optimise-store\.cc$''
-            ''^src/nix/path-from-hash-part\.cc$''
-            ''^src/nix/path-info\.cc$''
-            ''^src/nix/prefetch\.cc$''
-            ''^src/nix/profile\.cc$''
-            ''^src/nix/realisation\.cc$''
-            ''^src/nix/registry\.cc$''
-            ''^src/nix/repl\.cc$''
-            ''^src/nix/run\.cc$''
-            ''^src/nix/run\.hh$''
-            ''^src/nix/search\.cc$''
-            ''^src/nix/sigs\.cc$''
-            ''^src/nix/store-copy-log\.cc$''
-            ''^src/nix/store-delete\.cc$''
-            ''^src/nix/store-gc\.cc$''
-            ''^src/nix/store-info\.cc$''
-            ''^src/nix/store-repair\.cc$''
-            ''^src/nix/store\.cc$''
-            ''^src/nix/unix/daemon\.cc$''
-            ''^src/nix/upgrade-nix\.cc$''
-            ''^src/nix/verify\.cc$''
-            ''^src/nix/why-depends\.cc$''
+            ''^subprojects/build-remote/build-remote\.cc$''
+            ''^subprojects/libcmd/built-path\.cc$''
+            ''^subprojects/libcmd/built-path\.hh$''
+            ''^subprojects/libcmd/command\.cc$''
+            ''^subprojects/libcmd/command\.hh$''
+            ''^subprojects/libcmd/common-eval-args\.cc$''
+            ''^subprojects/libcmd/common-eval-args\.hh$''
+            ''^subprojects/libcmd/editor-for\.cc$''
+            ''^subprojects/libcmd/installable-attr-path\.cc$''
+            ''^subprojects/libcmd/installable-attr-path\.hh$''
+            ''^subprojects/libcmd/installable-derived-path\.cc$''
+            ''^subprojects/libcmd/installable-derived-path\.hh$''
+            ''^subprojects/libcmd/installable-flake\.cc$''
+            ''^subprojects/libcmd/installable-flake\.hh$''
+            ''^subprojects/libcmd/installable-value\.cc$''
+            ''^subprojects/libcmd/installable-value\.hh$''
+            ''^subprojects/libcmd/installables\.cc$''
+            ''^subprojects/libcmd/installables\.hh$''
+            ''^subprojects/libcmd/legacy\.hh$''
+            ''^subprojects/libcmd/markdown\.cc$''
+            ''^subprojects/libcmd/misc-store-flags\.cc$''
+            ''^subprojects/libcmd/repl-interacter\.cc$''
+            ''^subprojects/libcmd/repl-interacter\.hh$''
+            ''^subprojects/libcmd/repl\.cc$''
+            ''^subprojects/libcmd/repl\.hh$''
+            ''^subprojects/libexpr-c/nix_api_expr\.cc$''
+            ''^subprojects/libexpr-c/nix_api_external\.cc$''
+            ''^subprojects/libexpr/attr-path\.cc$''
+            ''^subprojects/libexpr/attr-path\.hh$''
+            ''^subprojects/libexpr/attr-set\.cc$''
+            ''^subprojects/libexpr/attr-set\.hh$''
+            ''^subprojects/libexpr/eval-cache\.cc$''
+            ''^subprojects/libexpr/eval-cache\.hh$''
+            ''^subprojects/libexpr/eval-error\.cc$''
+            ''^subprojects/libexpr/eval-inline\.hh$''
+            ''^subprojects/libexpr/eval-settings\.cc$''
+            ''^subprojects/libexpr/eval-settings\.hh$''
+            ''^subprojects/libexpr/eval\.cc$''
+            ''^subprojects/libexpr/eval\.hh$''
+            ''^subprojects/libexpr/function-trace\.cc$''
+            ''^subprojects/libexpr/gc-small-vector\.hh$''
+            ''^subprojects/libexpr/get-drvs\.cc$''
+            ''^subprojects/libexpr/get-drvs\.hh$''
+            ''^subprojects/libexpr/json-to-value\.cc$''
+            ''^subprojects/libexpr/nixexpr\.cc$''
+            ''^subprojects/libexpr/nixexpr\.hh$''
+            ''^subprojects/libexpr/parser-state\.hh$''
+            ''^subprojects/libexpr/pos-table\.hh$''
+            ''^subprojects/libexpr/primops\.cc$''
+            ''^subprojects/libexpr/primops\.hh$''
+            ''^subprojects/libexpr/primops/context\.cc$''
+            ''^subprojects/libexpr/primops/fetchClosure\.cc$''
+            ''^subprojects/libexpr/primops/fetchMercurial\.cc$''
+            ''^subprojects/libexpr/primops/fetchTree\.cc$''
+            ''^subprojects/libexpr/primops/fromTOML\.cc$''
+            ''^subprojects/libexpr/print-ambiguous\.cc$''
+            ''^subprojects/libexpr/print-ambiguous\.hh$''
+            ''^subprojects/libexpr/print-options\.hh$''
+            ''^subprojects/libexpr/print\.cc$''
+            ''^subprojects/libexpr/print\.hh$''
+            ''^subprojects/libexpr/search-path\.cc$''
+            ''^subprojects/libexpr/symbol-table\.hh$''
+            ''^subprojects/libexpr/value-to-json\.cc$''
+            ''^subprojects/libexpr/value-to-json\.hh$''
+            ''^subprojects/libexpr/value-to-xml\.cc$''
+            ''^subprojects/libexpr/value-to-xml\.hh$''
+            ''^subprojects/libexpr/value\.hh$''
+            ''^subprojects/libexpr/value/context\.cc$''
+            ''^subprojects/libexpr/value/context\.hh$''
+            ''^subprojects/libfetchers/attrs\.cc$''
+            ''^subprojects/libfetchers/cache\.cc$''
+            ''^subprojects/libfetchers/cache\.hh$''
+            ''^subprojects/libfetchers/fetch-settings\.cc$''
+            ''^subprojects/libfetchers/fetch-settings\.hh$''
+            ''^subprojects/libfetchers/fetch-to-store\.cc$''
+            ''^subprojects/libfetchers/fetchers\.cc$''
+            ''^subprojects/libfetchers/fetchers\.hh$''
+            ''^subprojects/libfetchers/filtering-source-accessor\.cc$''
+            ''^subprojects/libfetchers/filtering-source-accessor\.hh$''
+            ''^subprojects/libfetchers/fs-source-accessor\.cc$''
+            ''^subprojects/libfetchers/fs-source-accessor\.hh$''
+            ''^subprojects/libfetchers/git-utils\.cc$''
+            ''^subprojects/libfetchers/git-utils\.hh$''
+            ''^subprojects/libfetchers/github\.cc$''
+            ''^subprojects/libfetchers/indirect\.cc$''
+            ''^subprojects/libfetchers/memory-source-accessor\.cc$''
+            ''^subprojects/libfetchers/path\.cc$''
+            ''^subprojects/libfetchers/registry\.cc$''
+            ''^subprojects/libfetchers/registry\.hh$''
+            ''^subprojects/libfetchers/tarball\.cc$''
+            ''^subprojects/libfetchers/tarball\.hh$''
+            ''^subprojects/libfetchers/git\.cc$''
+            ''^subprojects/libfetchers/mercurial\.cc$''
+            ''^subprojects/libflake/flake/config\.cc$''
+            ''^subprojects/libflake/flake/flake\.cc$''
+            ''^subprojects/libflake/flake/flake\.hh$''
+            ''^subprojects/libflake/flake/flakeref\.cc$''
+            ''^subprojects/libflake/flake/flakeref\.hh$''
+            ''^subprojects/libflake/flake/lockfile\.cc$''
+            ''^subprojects/libflake/flake/lockfile\.hh$''
+            ''^subprojects/libflake/flake/url-name\.cc$''
+            ''^subprojects/libmain/common-args\.cc$''
+            ''^subprojects/libmain/common-args\.hh$''
+            ''^subprojects/libmain/loggers\.cc$''
+            ''^subprojects/libmain/loggers\.hh$''
+            ''^subprojects/libmain/progress-bar\.cc$''
+            ''^subprojects/libmain/shared\.cc$''
+            ''^subprojects/libmain/shared\.hh$''
+            ''^subprojects/libmain/unix/stack\.cc$''
+            ''^subprojects/libstore/binary-cache-store\.cc$''
+            ''^subprojects/libstore/binary-cache-store\.hh$''
+            ''^subprojects/libstore/build-result\.hh$''
+            ''^subprojects/libstore/builtins\.hh$''
+            ''^subprojects/libstore/builtins/buildenv\.cc$''
+            ''^subprojects/libstore/builtins/buildenv\.hh$''
+            ''^subprojects/libstore/common-protocol-impl\.hh$''
+            ''^subprojects/libstore/common-protocol\.cc$''
+            ''^subprojects/libstore/common-protocol\.hh$''
+            ''^subprojects/libstore/common-ssh-store-config\.hh$''
+            ''^subprojects/libstore/content-address\.cc$''
+            ''^subprojects/libstore/content-address\.hh$''
+            ''^subprojects/libstore/daemon\.cc$''
+            ''^subprojects/libstore/daemon\.hh$''
+            ''^subprojects/libstore/derivations\.cc$''
+            ''^subprojects/libstore/derivations\.hh$''
+            ''^subprojects/libstore/derived-path-map\.cc$''
+            ''^subprojects/libstore/derived-path-map\.hh$''
+            ''^subprojects/libstore/derived-path\.cc$''
+            ''^subprojects/libstore/derived-path\.hh$''
+            ''^subprojects/libstore/downstream-placeholder\.cc$''
+            ''^subprojects/libstore/downstream-placeholder\.hh$''
+            ''^subprojects/libstore/dummy-store\.cc$''
+            ''^subprojects/libstore/export-import\.cc$''
+            ''^subprojects/libstore/filetransfer\.cc$''
+            ''^subprojects/libstore/filetransfer\.hh$''
+            ''^subprojects/libstore/gc-store\.hh$''
+            ''^subprojects/libstore/globals\.cc$''
+            ''^subprojects/libstore/globals\.hh$''
+            ''^subprojects/libstore/http-binary-cache-store\.cc$''
+            ''^subprojects/libstore/legacy-ssh-store\.cc$''
+            ''^subprojects/libstore/legacy-ssh-store\.hh$''
+            ''^subprojects/libstore/length-prefixed-protocol-helper\.hh$''
+            ''^subprojects/libstore/linux/personality\.cc$''
+            ''^subprojects/libstore/linux/personality\.hh$''
+            ''^subprojects/libstore/local-binary-cache-store\.cc$''
+            ''^subprojects/libstore/local-fs-store\.cc$''
+            ''^subprojects/libstore/local-fs-store\.hh$''
+            ''^subprojects/libstore/log-store\.cc$''
+            ''^subprojects/libstore/log-store\.hh$''
+            ''^subprojects/libstore/machines\.cc$''
+            ''^subprojects/libstore/machines\.hh$''
+            ''^subprojects/libstore/make-content-addressed\.cc$''
+            ''^subprojects/libstore/make-content-addressed\.hh$''
+            ''^subprojects/libstore/misc\.cc$''
+            ''^subprojects/libstore/names\.cc$''
+            ''^subprojects/libstore/names\.hh$''
+            ''^subprojects/libstore/nar-accessor\.cc$''
+            ''^subprojects/libstore/nar-accessor\.hh$''
+            ''^subprojects/libstore/nar-info-disk-cache\.cc$''
+            ''^subprojects/libstore/nar-info-disk-cache\.hh$''
+            ''^subprojects/libstore/nar-info\.cc$''
+            ''^subprojects/libstore/nar-info\.hh$''
+            ''^subprojects/libstore/outputs-spec\.cc$''
+            ''^subprojects/libstore/outputs-spec\.hh$''
+            ''^subprojects/libstore/parsed-derivations\.cc$''
+            ''^subprojects/libstore/path-info\.cc$''
+            ''^subprojects/libstore/path-info\.hh$''
+            ''^subprojects/libstore/path-references\.cc$''
+            ''^subprojects/libstore/path-regex\.hh$''
+            ''^subprojects/libstore/path-with-outputs\.cc$''
+            ''^subprojects/libstore/path\.cc$''
+            ''^subprojects/libstore/path\.hh$''
+            ''^subprojects/libstore/pathlocks\.cc$''
+            ''^subprojects/libstore/pathlocks\.hh$''
+            ''^subprojects/libstore/profiles\.cc$''
+            ''^subprojects/libstore/profiles\.hh$''
+            ''^subprojects/libstore/realisation\.cc$''
+            ''^subprojects/libstore/realisation\.hh$''
+            ''^subprojects/libstore/remote-fs-accessor\.cc$''
+            ''^subprojects/libstore/remote-fs-accessor\.hh$''
+            ''^subprojects/libstore/remote-store-connection\.hh$''
+            ''^subprojects/libstore/remote-store\.cc$''
+            ''^subprojects/libstore/remote-store\.hh$''
+            ''^subprojects/libstore/s3-binary-cache-store\.cc$''
+            ''^subprojects/libstore/s3\.hh$''
+            ''^subprojects/libstore/serve-protocol-impl\.cc$''
+            ''^subprojects/libstore/serve-protocol-impl\.hh$''
+            ''^subprojects/libstore/serve-protocol\.cc$''
+            ''^subprojects/libstore/serve-protocol\.hh$''
+            ''^subprojects/libstore/sqlite\.cc$''
+            ''^subprojects/libstore/sqlite\.hh$''
+            ''^subprojects/libstore/ssh-store\.cc$''
+            ''^subprojects/libstore/ssh\.cc$''
+            ''^subprojects/libstore/ssh\.hh$''
+            ''^subprojects/libstore/store-api\.cc$''
+            ''^subprojects/libstore/store-api\.hh$''
+            ''^subprojects/libstore/store-dir-config\.hh$''
+            ''^subprojects/libstore/build/derivation-goal\.cc$''
+            ''^subprojects/libstore/build/derivation-goal\.hh$''
+            ''^subprojects/libstore/build/drv-output-substitution-goal\.cc$''
+            ''^subprojects/libstore/build/drv-output-substitution-goal\.hh$''
+            ''^subprojects/libstore/build/entry-points\.cc$''
+            ''^subprojects/libstore/build/goal\.cc$''
+            ''^subprojects/libstore/build/goal\.hh$''
+            ''^subprojects/libstore/unix/build/hook-instance\.cc$''
+            ''^subprojects/libstore/unix/build/local-derivation-goal\.cc$''
+            ''^subprojects/libstore/unix/build/local-derivation-goal\.hh$''
+            ''^subprojects/libstore/build/substitution-goal\.cc$''
+            ''^subprojects/libstore/build/substitution-goal\.hh$''
+            ''^subprojects/libstore/build/worker\.cc$''
+            ''^subprojects/libstore/build/worker\.hh$''
+            ''^subprojects/libstore/builtins/fetchurl\.cc$''
+            ''^subprojects/libstore/builtins/unpack-channel\.cc$''
+            ''^subprojects/libstore/gc\.cc$''
+            ''^subprojects/libstore/local-overlay-store\.cc$''
+            ''^subprojects/libstore/local-overlay-store\.hh$''
+            ''^subprojects/libstore/local-store\.cc$''
+            ''^subprojects/libstore/local-store\.hh$''
+            ''^subprojects/libstore/unix/user-lock\.cc$''
+            ''^subprojects/libstore/unix/user-lock\.hh$''
+            ''^subprojects/libstore/optimise-store\.cc$''
+            ''^subprojects/libstore/unix/pathlocks\.cc$''
+            ''^subprojects/libstore/posix-fs-canonicalise\.cc$''
+            ''^subprojects/libstore/posix-fs-canonicalise\.hh$''
+            ''^subprojects/libstore/uds-remote-store\.cc$''
+            ''^subprojects/libstore/uds-remote-store\.hh$''
+            ''^subprojects/libstore/windows/build\.cc$''
+            ''^subprojects/libstore/worker-protocol-impl\.hh$''
+            ''^subprojects/libstore/worker-protocol\.cc$''
+            ''^subprojects/libstore/worker-protocol\.hh$''
+            ''^subprojects/libutil-c/nix_api_util_internal\.h$''
+            ''^subprojects/libutil/archive\.cc$''
+            ''^subprojects/libutil/archive\.hh$''
+            ''^subprojects/libutil/args\.cc$''
+            ''^subprojects/libutil/args\.hh$''
+            ''^subprojects/libutil/args/root\.hh$''
+            ''^subprojects/libutil/callback\.hh$''
+            ''^subprojects/libutil/canon-path\.cc$''
+            ''^subprojects/libutil/canon-path\.hh$''
+            ''^subprojects/libutil/chunked-vector\.hh$''
+            ''^subprojects/libutil/closure\.hh$''
+            ''^subprojects/libutil/comparator\.hh$''
+            ''^subprojects/libutil/compute-levels\.cc$''
+            ''^subprojects/libutil/config-impl\.hh$''
+            ''^subprojects/libutil/config\.cc$''
+            ''^subprojects/libutil/config\.hh$''
+            ''^subprojects/libutil/current-process\.cc$''
+            ''^subprojects/libutil/current-process\.hh$''
+            ''^subprojects/libutil/english\.cc$''
+            ''^subprojects/libutil/english\.hh$''
+            ''^subprojects/libutil/error\.cc$''
+            ''^subprojects/libutil/error\.hh$''
+            ''^subprojects/libutil/exit\.hh$''
+            ''^subprojects/libutil/experimental-features\.cc$''
+            ''^subprojects/libutil/experimental-features\.hh$''
+            ''^subprojects/libutil/file-content-address\.cc$''
+            ''^subprojects/libutil/file-content-address\.hh$''
+            ''^subprojects/libutil/file-descriptor\.cc$''
+            ''^subprojects/libutil/file-descriptor\.hh$''
+            ''^subprojects/libutil/file-path-impl\.hh$''
+            ''^subprojects/libutil/file-path\.hh$''
+            ''^subprojects/libutil/file-system\.cc$''
+            ''^subprojects/libutil/file-system\.hh$''
+            ''^subprojects/libutil/finally\.hh$''
+            ''^subprojects/libutil/fmt\.hh$''
+            ''^subprojects/libutil/fs-sink\.cc$''
+            ''^subprojects/libutil/fs-sink\.hh$''
+            ''^subprojects/libutil/git\.cc$''
+            ''^subprojects/libutil/git\.hh$''
+            ''^subprojects/libutil/hash\.cc$''
+            ''^subprojects/libutil/hash\.hh$''
+            ''^subprojects/libutil/hilite\.cc$''
+            ''^subprojects/libutil/hilite\.hh$''
+            ''^subprojects/libutil/source-accessor\.hh$''
+            ''^subprojects/libutil/json-impls\.hh$''
+            ''^subprojects/libutil/json-utils\.cc$''
+            ''^subprojects/libutil/json-utils\.hh$''
+            ''^subprojects/libutil/linux/cgroup\.cc$''
+            ''^subprojects/libutil/linux/namespaces\.cc$''
+            ''^subprojects/libutil/logging\.cc$''
+            ''^subprojects/libutil/logging\.hh$''
+            ''^subprojects/libutil/lru-cache\.hh$''
+            ''^subprojects/libutil/memory-source-accessor\.cc$''
+            ''^subprojects/libutil/memory-source-accessor\.hh$''
+            ''^subprojects/libutil/pool\.hh$''
+            ''^subprojects/libutil/position\.cc$''
+            ''^subprojects/libutil/position\.hh$''
+            ''^subprojects/libutil/posix-source-accessor\.cc$''
+            ''^subprojects/libutil/posix-source-accessor\.hh$''
+            ''^subprojects/libutil/processes\.hh$''
+            ''^subprojects/libutil/ref\.hh$''
+            ''^subprojects/libutil/references\.cc$''
+            ''^subprojects/libutil/references\.hh$''
+            ''^subprojects/libutil/regex-combinators\.hh$''
+            ''^subprojects/libutil/serialise\.cc$''
+            ''^subprojects/libutil/serialise\.hh$''
+            ''^subprojects/libutil/signals\.hh$''
+            ''^subprojects/libutil/signature/local-keys\.cc$''
+            ''^subprojects/libutil/signature/local-keys\.hh$''
+            ''^subprojects/libutil/signature/signer\.cc$''
+            ''^subprojects/libutil/signature/signer\.hh$''
+            ''^subprojects/libutil/source-accessor\.cc$''
+            ''^subprojects/libutil/source-accessor\.hh$''
+            ''^subprojects/libutil/source-path\.cc$''
+            ''^subprojects/libutil/source-path\.hh$''
+            ''^subprojects/libutil/split\.hh$''
+            ''^subprojects/libutil/suggestions\.cc$''
+            ''^subprojects/libutil/suggestions\.hh$''
+            ''^subprojects/libutil/sync\.hh$''
+            ''^subprojects/libutil/terminal\.cc$''
+            ''^subprojects/libutil/terminal\.hh$''
+            ''^subprojects/libutil/thread-pool\.cc$''
+            ''^subprojects/libutil/thread-pool\.hh$''
+            ''^subprojects/libutil/topo-sort\.hh$''
+            ''^subprojects/libutil/types\.hh$''
+            ''^subprojects/libutil/unix/file-descriptor\.cc$''
+            ''^subprojects/libutil/unix/file-path\.cc$''
+            ''^subprojects/libutil/unix/monitor-fd\.hh$''
+            ''^subprojects/libutil/unix/processes\.cc$''
+            ''^subprojects/libutil/unix/signals-impl\.hh$''
+            ''^subprojects/libutil/unix/signals\.cc$''
+            ''^subprojects/libutil/unix-domain-socket\.cc$''
+            ''^subprojects/libutil/unix/users\.cc$''
+            ''^subprojects/libutil/url-parts\.hh$''
+            ''^subprojects/libutil/url\.cc$''
+            ''^subprojects/libutil/url\.hh$''
+            ''^subprojects/libutil/users\.cc$''
+            ''^subprojects/libutil/users\.hh$''
+            ''^subprojects/libutil/util\.cc$''
+            ''^subprojects/libutil/util\.hh$''
+            ''^subprojects/libutil/variant-wrapper\.hh$''
+            ''^subprojects/libutil/windows/file-descriptor\.cc$''
+            ''^subprojects/libutil/windows/file-path\.cc$''
+            ''^subprojects/libutil/windows/processes\.cc$''
+            ''^subprojects/libutil/windows/users\.cc$''
+            ''^subprojects/libutil/windows/windows-error\.cc$''
+            ''^subprojects/libutil/windows/windows-error\.hh$''
+            ''^subprojects/libutil/xml-writer\.cc$''
+            ''^subprojects/libutil/xml-writer\.hh$''
+            ''^subprojects/nix-build/nix-build\.cc$''
+            ''^subprojects/nix-channel/nix-channel\.cc$''
+            ''^subprojects/nix-collect-garbage/nix-collect-garbage\.cc$''
+            ''^subprojects/nix-env/buildenv.nix$''
+            ''^subprojects/nix-env/nix-env\.cc$''
+            ''^subprojects/nix-env/user-env\.cc$''
+            ''^subprojects/nix-env/user-env\.hh$''
+            ''^subprojects/nix-instantiate/nix-instantiate\.cc$''
+            ''^subprojects/nix-store/dotgraph\.cc$''
+            ''^subprojects/nix-store/graphml\.cc$''
+            ''^subprojects/nix-store/nix-store\.cc$''
+            ''^subprojects/nix/add-to-store\.cc$''
+            ''^subprojects/nix/app\.cc$''
+            ''^subprojects/nix/build\.cc$''
+            ''^subprojects/nix/bundle\.cc$''
+            ''^subprojects/nix/cat\.cc$''
+            ''^subprojects/nix/config-check\.cc$''
+            ''^subprojects/nix/config\.cc$''
+            ''^subprojects/nix/copy\.cc$''
+            ''^subprojects/nix/derivation-add\.cc$''
+            ''^subprojects/nix/derivation-show\.cc$''
+            ''^subprojects/nix/derivation\.cc$''
+            ''^subprojects/nix/develop\.cc$''
+            ''^subprojects/nix/diff-closures\.cc$''
+            ''^subprojects/nix/dump-path\.cc$''
+            ''^subprojects/nix/edit\.cc$''
+            ''^subprojects/nix/eval\.cc$''
+            ''^subprojects/nix/flake\.cc$''
+            ''^subprojects/nix/fmt\.cc$''
+            ''^subprojects/nix/hash\.cc$''
+            ''^subprojects/nix/log\.cc$''
+            ''^subprojects/nix/ls\.cc$''
+            ''^subprojects/nix/main\.cc$''
+            ''^subprojects/nix/make-content-addressed\.cc$''
+            ''^subprojects/nix/nar\.cc$''
+            ''^subprojects/nix/optimise-store\.cc$''
+            ''^subprojects/nix/path-from-hash-part\.cc$''
+            ''^subprojects/nix/path-info\.cc$''
+            ''^subprojects/nix/prefetch\.cc$''
+            ''^subprojects/nix/profile\.cc$''
+            ''^subprojects/nix/realisation\.cc$''
+            ''^subprojects/nix/registry\.cc$''
+            ''^subprojects/nix/repl\.cc$''
+            ''^subprojects/nix/run\.cc$''
+            ''^subprojects/nix/run\.hh$''
+            ''^subprojects/nix/search\.cc$''
+            ''^subprojects/nix/sigs\.cc$''
+            ''^subprojects/nix/store-copy-log\.cc$''
+            ''^subprojects/nix/store-delete\.cc$''
+            ''^subprojects/nix/store-gc\.cc$''
+            ''^subprojects/nix/store-info\.cc$''
+            ''^subprojects/nix/store-repair\.cc$''
+            ''^subprojects/nix/store\.cc$''
+            ''^subprojects/nix/unix/daemon\.cc$''
+            ''^subprojects/nix/upgrade-nix\.cc$''
+            ''^subprojects/nix/verify\.cc$''
+            ''^subprojects/nix/why-depends\.cc$''
 
             ''^tests/functional/plugins/plugintest\.cc''
             ''^tests/functional/test-libstoreconsumer/main\.cc''
@@ -500,7 +500,7 @@
             ''^scripts/install-multi-user\.sh$''
             ''^scripts/install-nix-from-closure\.sh$''
             ''^scripts/install-systemd-multi-user\.sh$''
-            ''^src/nix/get-env\.sh$''
+            ''^subprojects/nix/get-env\.sh$''
             ''^tests/functional/build\.sh$''
             ''^tests/functional/ca/build-dry\.sh$''
             ''^tests/functional/ca/build-with-garbage-path\.sh$''
diff --git a/mk/common-test.sh b/mk/common-test.sh
index 817422c40..61e202bd0 100644
--- a/mk/common-test.sh
+++ b/mk/common-test.sh
@@ -4,7 +4,7 @@
 # remove file extension.
 
 test_name=$(echo -n "${test?must be defined by caller (test runner)}" | sed \
-    -e "s|^src/[^/]*-test/data/||" \
+    -e "s|^subprojects/[^/]*-test/data/||" \
     -e "s|^tests/functional/||" \
     -e "s|\.sh$||" \
     )
diff --git a/package.nix b/package.nix
index 8ab184667..6ed459c4b 100644
--- a/package.nix
+++ b/package.nix
@@ -171,7 +171,7 @@ in {
           ./doc
           ./misc
           ./precompiled-headers.h
-          (fileset.difference ./src ./src/perl)
+          (fileset.difference ./subprojects ./subprojects/perl)
           ./COPYING
           ./scripts/local.mk
         ] ++ lib.optionals enableManual [
@@ -316,7 +316,7 @@ in {
   # Work around weird bug where it doesn't think there is a Makefile.
   installCheckPhase = if (!doBuild && doInstallCheck) then ''
     runHook preInstallCheck
-    mkdir -p src/nix-channel
+    mkdir -p subprojects/nix-channel
     make installcheck -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
   '' else null;
 
@@ -324,7 +324,7 @@ in {
   # built Nix.
   preInstallCheck =
     lib.optionalString (! doBuild) ''
-      mkdir -p src/nix-channel
+      mkdir -p subprojects/nix-channel
     '';
 
   separateDebugInfo = !stdenv.hostPlatform.isStatic;
diff --git a/packaging/components.nix b/packaging/components.nix
index 4c18dc6a3..d3429e2b2 100644
--- a/packaging/components.nix
+++ b/packaging/components.nix
@@ -30,41 +30,41 @@ in
     versionSuffix = fineVersionSuffix;
   };
 
-  nix-util = callPackage ../src/libutil/package.nix { };
-  nix-util-c = callPackage ../src/libutil-c/package.nix { };
+  nix-util = callPackage ../subprojects/libutil/package.nix { };
+  nix-util-c = callPackage ../subprojects/libutil-c/package.nix { };
   nix-util-test-support = callPackage ../tests/unit/libutil-support/package.nix { };
   nix-util-tests = callPackage ../tests/unit/libutil/package.nix { };
 
-  nix-store = callPackage ../src/libstore/package.nix { };
-  nix-store-c = callPackage ../src/libstore-c/package.nix { };
+  nix-store = callPackage ../subprojects/libstore/package.nix { };
+  nix-store-c = callPackage ../subprojects/libstore-c/package.nix { };
   nix-store-test-support = callPackage ../tests/unit/libstore-support/package.nix { };
   nix-store-tests = callPackage ../tests/unit/libstore/package.nix { };
 
-  nix-fetchers = callPackage ../src/libfetchers/package.nix { };
+  nix-fetchers = callPackage ../subprojects/libfetchers/package.nix { };
   nix-fetchers-tests = callPackage ../tests/unit/libfetchers/package.nix { };
 
-  nix-expr = callPackage ../src/libexpr/package.nix { };
-  nix-expr-c = callPackage ../src/libexpr-c/package.nix { };
+  nix-expr = callPackage ../subprojects/libexpr/package.nix { };
+  nix-expr-c = callPackage ../subprojects/libexpr-c/package.nix { };
   nix-expr-test-support = callPackage ../tests/unit/libexpr-support/package.nix { };
   nix-expr-tests = callPackage ../tests/unit/libexpr/package.nix { };
 
-  nix-flake = callPackage ../src/libflake/package.nix { };
+  nix-flake = callPackage ../subprojects/libflake/package.nix { };
   nix-flake-tests = callPackage ../tests/unit/libflake/package.nix { };
 
-  nix-main = callPackage ../src/libmain/package.nix { };
-  nix-main-c = callPackage ../src/libmain-c/package.nix { };
+  nix-main = callPackage ../subprojects/libmain/package.nix { };
+  nix-main-c = callPackage ../subprojects/libmain-c/package.nix { };
 
-  nix-cmd = callPackage ../src/libcmd/package.nix { };
+  nix-cmd = callPackage ../subprojects/libcmd/package.nix { };
 
-  nix-cli = callPackage ../src/nix/package.nix { version = fineVersion; };
+  nix-cli = callPackage ../subprojects/nix/package.nix { version = fineVersion; };
 
-  nix-functional-tests = callPackage ../src/nix-functional-tests/package.nix { version = fineVersion; };
+  nix-functional-tests = callPackage ../subprojects/nix-functional-tests/package.nix { version = fineVersion; };
 
   nix-manual = callPackage ../doc/manual/package.nix { version = fineVersion; };
-  nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { version = fineVersion; };
-  nix-external-api-docs = callPackage ../src/external-api-docs/package.nix { version = fineVersion; };
+  nix-internal-api-docs = callPackage ../subprojects/internal-api-docs/package.nix { version = fineVersion; };
+  nix-external-api-docs = callPackage ../subprojects/external-api-docs/package.nix { version = fineVersion; };
 
-  nix-perl-bindings = callPackage ../src/perl/package.nix { };
+  nix-perl-bindings = callPackage ../subprojects/perl/package.nix { };
 
   # Will replace `nix` once the old build system is gone.
   nix-ng = callPackage ../packaging/everything.nix { };
diff --git a/subprojects b/subprojects
deleted file mode 120000
index e8310385c..000000000
--- a/subprojects
+++ /dev/null
@@ -1 +0,0 @@
-src
\ No newline at end of file
diff --git a/src/build-remote/build-remote.cc b/subprojects/build-remote/build-remote.cc
similarity index 99%
rename from src/build-remote/build-remote.cc
rename to subprojects/build-remote/build-remote.cc
index 82ad7d862..9a44fda85 100644
--- a/src/build-remote/build-remote.cc
+++ b/subprojects/build-remote/build-remote.cc
@@ -311,7 +311,7 @@ connected:
         });
 
         // See the very large comment in `case WorkerProto::Op::BuildDerivation:` in
-        // `src/libstore/daemon.cc` that explains the trust model here.
+        // `subprojects/libstore/daemon.cc` that explains the trust model here.
         //
         // This condition mirrors that: that code enforces the "rules" outlined there;
         // we do the best we can given those "rules".
diff --git a/src/external-api-docs/.gitignore b/subprojects/external-api-docs/.gitignore
similarity index 100%
rename from src/external-api-docs/.gitignore
rename to subprojects/external-api-docs/.gitignore
diff --git a/src/external-api-docs/.version b/subprojects/external-api-docs/.version
similarity index 100%
rename from src/external-api-docs/.version
rename to subprojects/external-api-docs/.version
diff --git a/src/external-api-docs/README.md b/subprojects/external-api-docs/README.md
similarity index 100%
rename from src/external-api-docs/README.md
rename to subprojects/external-api-docs/README.md
diff --git a/src/external-api-docs/doxygen.cfg.in b/subprojects/external-api-docs/doxygen.cfg.in
similarity index 95%
rename from src/external-api-docs/doxygen.cfg.in
rename to subprojects/external-api-docs/doxygen.cfg.in
index 1be71d895..b7f23c1c9 100644
--- a/src/external-api-docs/doxygen.cfg.in
+++ b/subprojects/external-api-docs/doxygen.cfg.in
@@ -38,9 +38,9 @@ GENERATE_LATEX         = NO
 # so they can expand variables despite configure variables.
 
 INPUT                  = \
-  @src@/src/libutil-c \
-  @src@/src/libexpr-c \
-  @src@/src/libstore-c \
+  @src@/subprojects/libutil-c \
+  @src@/subprojects/libexpr-c \
+  @src@/subprojects/libstore-c \
   @src@/doc/external-api/README.md
 
 FILE_PATTERNS = nix_api_*.h *.md
diff --git a/src/external-api-docs/meson.build b/subprojects/external-api-docs/meson.build
similarity index 100%
rename from src/external-api-docs/meson.build
rename to subprojects/external-api-docs/meson.build
diff --git a/src/external-api-docs/package.nix b/subprojects/external-api-docs/package.nix
similarity index 100%
rename from src/external-api-docs/package.nix
rename to subprojects/external-api-docs/package.nix
diff --git a/src/internal-api-docs/.gitignore b/subprojects/internal-api-docs/.gitignore
similarity index 100%
rename from src/internal-api-docs/.gitignore
rename to subprojects/internal-api-docs/.gitignore
diff --git a/src/internal-api-docs/.version b/subprojects/internal-api-docs/.version
similarity index 100%
rename from src/internal-api-docs/.version
rename to subprojects/internal-api-docs/.version
diff --git a/src/internal-api-docs/doxygen.cfg.in b/subprojects/internal-api-docs/doxygen.cfg.in
similarity index 97%
rename from src/internal-api-docs/doxygen.cfg.in
rename to subprojects/internal-api-docs/doxygen.cfg.in
index f1ef75b38..33838ce4e 100644
--- a/src/internal-api-docs/doxygen.cfg.in
+++ b/subprojects/internal-api-docs/doxygen.cfg.in
@@ -29,7 +29,7 @@ GENERATE_LATEX         = NO
 
 # The INPUT tag is used to specify the files and/or directories that contain
 # documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
+# directories like /usr/subprojects/myproject. Separate the files or directories with
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
diff --git a/src/internal-api-docs/meson.build b/subprojects/internal-api-docs/meson.build
similarity index 100%
rename from src/internal-api-docs/meson.build
rename to subprojects/internal-api-docs/meson.build
diff --git a/src/internal-api-docs/package.nix b/subprojects/internal-api-docs/package.nix
similarity index 100%
rename from src/internal-api-docs/package.nix
rename to subprojects/internal-api-docs/package.nix
diff --git a/src/libcmd/.version b/subprojects/libcmd/.version
similarity index 100%
rename from src/libcmd/.version
rename to subprojects/libcmd/.version
diff --git a/src/libcmd/build-utils-meson b/subprojects/libcmd/build-utils-meson
similarity index 100%
rename from src/libcmd/build-utils-meson
rename to subprojects/libcmd/build-utils-meson
diff --git a/src/libcmd/built-path.cc b/subprojects/libcmd/built-path.cc
similarity index 100%
rename from src/libcmd/built-path.cc
rename to subprojects/libcmd/built-path.cc
diff --git a/src/libcmd/built-path.hh b/subprojects/libcmd/built-path.hh
similarity index 100%
rename from src/libcmd/built-path.hh
rename to subprojects/libcmd/built-path.hh
diff --git a/src/libcmd/command-installable-value.cc b/subprojects/libcmd/command-installable-value.cc
similarity index 100%
rename from src/libcmd/command-installable-value.cc
rename to subprojects/libcmd/command-installable-value.cc
diff --git a/src/libcmd/command-installable-value.hh b/subprojects/libcmd/command-installable-value.hh
similarity index 100%
rename from src/libcmd/command-installable-value.hh
rename to subprojects/libcmd/command-installable-value.hh
diff --git a/src/libcmd/command.cc b/subprojects/libcmd/command.cc
similarity index 100%
rename from src/libcmd/command.cc
rename to subprojects/libcmd/command.cc
diff --git a/src/libcmd/command.hh b/subprojects/libcmd/command.hh
similarity index 100%
rename from src/libcmd/command.hh
rename to subprojects/libcmd/command.hh
diff --git a/src/libcmd/common-eval-args.cc b/subprojects/libcmd/common-eval-args.cc
similarity index 100%
rename from src/libcmd/common-eval-args.cc
rename to subprojects/libcmd/common-eval-args.cc
diff --git a/src/libcmd/common-eval-args.hh b/subprojects/libcmd/common-eval-args.hh
similarity index 100%
rename from src/libcmd/common-eval-args.hh
rename to subprojects/libcmd/common-eval-args.hh
diff --git a/src/libcmd/compatibility-settings.hh b/subprojects/libcmd/compatibility-settings.hh
similarity index 100%
rename from src/libcmd/compatibility-settings.hh
rename to subprojects/libcmd/compatibility-settings.hh
diff --git a/src/libcmd/editor-for.cc b/subprojects/libcmd/editor-for.cc
similarity index 100%
rename from src/libcmd/editor-for.cc
rename to subprojects/libcmd/editor-for.cc
diff --git a/src/libcmd/editor-for.hh b/subprojects/libcmd/editor-for.hh
similarity index 100%
rename from src/libcmd/editor-for.hh
rename to subprojects/libcmd/editor-for.hh
diff --git a/src/libcmd/installable-attr-path.cc b/subprojects/libcmd/installable-attr-path.cc
similarity index 100%
rename from src/libcmd/installable-attr-path.cc
rename to subprojects/libcmd/installable-attr-path.cc
diff --git a/src/libcmd/installable-attr-path.hh b/subprojects/libcmd/installable-attr-path.hh
similarity index 100%
rename from src/libcmd/installable-attr-path.hh
rename to subprojects/libcmd/installable-attr-path.hh
diff --git a/src/libcmd/installable-derived-path.cc b/subprojects/libcmd/installable-derived-path.cc
similarity index 100%
rename from src/libcmd/installable-derived-path.cc
rename to subprojects/libcmd/installable-derived-path.cc
diff --git a/src/libcmd/installable-derived-path.hh b/subprojects/libcmd/installable-derived-path.hh
similarity index 100%
rename from src/libcmd/installable-derived-path.hh
rename to subprojects/libcmd/installable-derived-path.hh
diff --git a/src/libcmd/installable-flake.cc b/subprojects/libcmd/installable-flake.cc
similarity index 100%
rename from src/libcmd/installable-flake.cc
rename to subprojects/libcmd/installable-flake.cc
diff --git a/src/libcmd/installable-flake.hh b/subprojects/libcmd/installable-flake.hh
similarity index 100%
rename from src/libcmd/installable-flake.hh
rename to subprojects/libcmd/installable-flake.hh
diff --git a/src/libcmd/installable-value.cc b/subprojects/libcmd/installable-value.cc
similarity index 100%
rename from src/libcmd/installable-value.cc
rename to subprojects/libcmd/installable-value.cc
diff --git a/src/libcmd/installable-value.hh b/subprojects/libcmd/installable-value.hh
similarity index 100%
rename from src/libcmd/installable-value.hh
rename to subprojects/libcmd/installable-value.hh
diff --git a/src/libcmd/installables.cc b/subprojects/libcmd/installables.cc
similarity index 100%
rename from src/libcmd/installables.cc
rename to subprojects/libcmd/installables.cc
diff --git a/src/libcmd/installables.hh b/subprojects/libcmd/installables.hh
similarity index 100%
rename from src/libcmd/installables.hh
rename to subprojects/libcmd/installables.hh
diff --git a/src/libcmd/legacy.cc b/subprojects/libcmd/legacy.cc
similarity index 100%
rename from src/libcmd/legacy.cc
rename to subprojects/libcmd/legacy.cc
diff --git a/src/libcmd/legacy.hh b/subprojects/libcmd/legacy.hh
similarity index 100%
rename from src/libcmd/legacy.hh
rename to subprojects/libcmd/legacy.hh
diff --git a/src/libcmd/local.mk b/subprojects/libcmd/local.mk
similarity index 100%
rename from src/libcmd/local.mk
rename to subprojects/libcmd/local.mk
diff --git a/src/libcmd/markdown.cc b/subprojects/libcmd/markdown.cc
similarity index 100%
rename from src/libcmd/markdown.cc
rename to subprojects/libcmd/markdown.cc
diff --git a/src/libcmd/markdown.hh b/subprojects/libcmd/markdown.hh
similarity index 100%
rename from src/libcmd/markdown.hh
rename to subprojects/libcmd/markdown.hh
diff --git a/src/libcmd/meson.build b/subprojects/libcmd/meson.build
similarity index 100%
rename from src/libcmd/meson.build
rename to subprojects/libcmd/meson.build
diff --git a/src/libcmd/meson.options b/subprojects/libcmd/meson.options
similarity index 100%
rename from src/libcmd/meson.options
rename to subprojects/libcmd/meson.options
diff --git a/src/libcmd/misc-store-flags.cc b/subprojects/libcmd/misc-store-flags.cc
similarity index 100%
rename from src/libcmd/misc-store-flags.cc
rename to subprojects/libcmd/misc-store-flags.cc
diff --git a/src/libcmd/misc-store-flags.hh b/subprojects/libcmd/misc-store-flags.hh
similarity index 100%
rename from src/libcmd/misc-store-flags.hh
rename to subprojects/libcmd/misc-store-flags.hh
diff --git a/src/libcmd/network-proxy.cc b/subprojects/libcmd/network-proxy.cc
similarity index 100%
rename from src/libcmd/network-proxy.cc
rename to subprojects/libcmd/network-proxy.cc
diff --git a/src/libcmd/network-proxy.hh b/subprojects/libcmd/network-proxy.hh
similarity index 100%
rename from src/libcmd/network-proxy.hh
rename to subprojects/libcmd/network-proxy.hh
diff --git a/src/libcmd/nix-cmd.pc.in b/subprojects/libcmd/nix-cmd.pc.in
similarity index 100%
rename from src/libcmd/nix-cmd.pc.in
rename to subprojects/libcmd/nix-cmd.pc.in
diff --git a/src/libcmd/package.nix b/subprojects/libcmd/package.nix
similarity index 100%
rename from src/libcmd/package.nix
rename to subprojects/libcmd/package.nix
diff --git a/src/libcmd/repl-interacter.cc b/subprojects/libcmd/repl-interacter.cc
similarity index 100%
rename from src/libcmd/repl-interacter.cc
rename to subprojects/libcmd/repl-interacter.cc
diff --git a/src/libcmd/repl-interacter.hh b/subprojects/libcmd/repl-interacter.hh
similarity index 100%
rename from src/libcmd/repl-interacter.hh
rename to subprojects/libcmd/repl-interacter.hh
diff --git a/src/libcmd/repl.cc b/subprojects/libcmd/repl.cc
similarity index 100%
rename from src/libcmd/repl.cc
rename to subprojects/libcmd/repl.cc
diff --git a/src/libcmd/repl.hh b/subprojects/libcmd/repl.hh
similarity index 100%
rename from src/libcmd/repl.hh
rename to subprojects/libcmd/repl.hh
diff --git a/src/libexpr-c/.version b/subprojects/libexpr-c/.version
similarity index 100%
rename from src/libexpr-c/.version
rename to subprojects/libexpr-c/.version
diff --git a/src/libexpr-c/build-utils-meson b/subprojects/libexpr-c/build-utils-meson
similarity index 100%
rename from src/libexpr-c/build-utils-meson
rename to subprojects/libexpr-c/build-utils-meson
diff --git a/src/libexpr-c/local.mk b/subprojects/libexpr-c/local.mk
similarity index 100%
rename from src/libexpr-c/local.mk
rename to subprojects/libexpr-c/local.mk
diff --git a/src/libexpr-c/meson.build b/subprojects/libexpr-c/meson.build
similarity index 100%
rename from src/libexpr-c/meson.build
rename to subprojects/libexpr-c/meson.build
diff --git a/src/libexpr-c/nix-expr-c.pc.in b/subprojects/libexpr-c/nix-expr-c.pc.in
similarity index 100%
rename from src/libexpr-c/nix-expr-c.pc.in
rename to subprojects/libexpr-c/nix-expr-c.pc.in
diff --git a/src/libexpr-c/nix_api_expr.cc b/subprojects/libexpr-c/nix_api_expr.cc
similarity index 100%
rename from src/libexpr-c/nix_api_expr.cc
rename to subprojects/libexpr-c/nix_api_expr.cc
diff --git a/src/libexpr-c/nix_api_expr.h b/subprojects/libexpr-c/nix_api_expr.h
similarity index 100%
rename from src/libexpr-c/nix_api_expr.h
rename to subprojects/libexpr-c/nix_api_expr.h
diff --git a/src/libexpr-c/nix_api_expr_internal.h b/subprojects/libexpr-c/nix_api_expr_internal.h
similarity index 100%
rename from src/libexpr-c/nix_api_expr_internal.h
rename to subprojects/libexpr-c/nix_api_expr_internal.h
diff --git a/src/libexpr-c/nix_api_external.cc b/subprojects/libexpr-c/nix_api_external.cc
similarity index 100%
rename from src/libexpr-c/nix_api_external.cc
rename to subprojects/libexpr-c/nix_api_external.cc
diff --git a/src/libexpr-c/nix_api_external.h b/subprojects/libexpr-c/nix_api_external.h
similarity index 100%
rename from src/libexpr-c/nix_api_external.h
rename to subprojects/libexpr-c/nix_api_external.h
diff --git a/src/libexpr-c/nix_api_value.cc b/subprojects/libexpr-c/nix_api_value.cc
similarity index 100%
rename from src/libexpr-c/nix_api_value.cc
rename to subprojects/libexpr-c/nix_api_value.cc
diff --git a/src/libexpr-c/nix_api_value.h b/subprojects/libexpr-c/nix_api_value.h
similarity index 100%
rename from src/libexpr-c/nix_api_value.h
rename to subprojects/libexpr-c/nix_api_value.h
diff --git a/src/libexpr-c/package.nix b/subprojects/libexpr-c/package.nix
similarity index 100%
rename from src/libexpr-c/package.nix
rename to subprojects/libexpr-c/package.nix
diff --git a/src/libexpr/.version b/subprojects/libexpr/.version
similarity index 100%
rename from src/libexpr/.version
rename to subprojects/libexpr/.version
diff --git a/src/libexpr/attr-path.cc b/subprojects/libexpr/attr-path.cc
similarity index 100%
rename from src/libexpr/attr-path.cc
rename to subprojects/libexpr/attr-path.cc
diff --git a/src/libexpr/attr-path.hh b/subprojects/libexpr/attr-path.hh
similarity index 100%
rename from src/libexpr/attr-path.hh
rename to subprojects/libexpr/attr-path.hh
diff --git a/src/libexpr/attr-set.cc b/subprojects/libexpr/attr-set.cc
similarity index 100%
rename from src/libexpr/attr-set.cc
rename to subprojects/libexpr/attr-set.cc
diff --git a/src/libexpr/attr-set.hh b/subprojects/libexpr/attr-set.hh
similarity index 100%
rename from src/libexpr/attr-set.hh
rename to subprojects/libexpr/attr-set.hh
diff --git a/src/libexpr/build-utils-meson b/subprojects/libexpr/build-utils-meson
similarity index 100%
rename from src/libexpr/build-utils-meson
rename to subprojects/libexpr/build-utils-meson
diff --git a/src/libexpr/call-flake.nix b/subprojects/libexpr/call-flake.nix
similarity index 100%
rename from src/libexpr/call-flake.nix
rename to subprojects/libexpr/call-flake.nix
diff --git a/src/libexpr/eval-cache.cc b/subprojects/libexpr/eval-cache.cc
similarity index 100%
rename from src/libexpr/eval-cache.cc
rename to subprojects/libexpr/eval-cache.cc
diff --git a/src/libexpr/eval-cache.hh b/subprojects/libexpr/eval-cache.hh
similarity index 100%
rename from src/libexpr/eval-cache.hh
rename to subprojects/libexpr/eval-cache.hh
diff --git a/src/libexpr/eval-error.cc b/subprojects/libexpr/eval-error.cc
similarity index 100%
rename from src/libexpr/eval-error.cc
rename to subprojects/libexpr/eval-error.cc
diff --git a/src/libexpr/eval-error.hh b/subprojects/libexpr/eval-error.hh
similarity index 100%
rename from src/libexpr/eval-error.hh
rename to subprojects/libexpr/eval-error.hh
diff --git a/src/libexpr/eval-gc.cc b/subprojects/libexpr/eval-gc.cc
similarity index 100%
rename from src/libexpr/eval-gc.cc
rename to subprojects/libexpr/eval-gc.cc
diff --git a/src/libexpr/eval-gc.hh b/subprojects/libexpr/eval-gc.hh
similarity index 100%
rename from src/libexpr/eval-gc.hh
rename to subprojects/libexpr/eval-gc.hh
diff --git a/src/libexpr/eval-inline.hh b/subprojects/libexpr/eval-inline.hh
similarity index 100%
rename from src/libexpr/eval-inline.hh
rename to subprojects/libexpr/eval-inline.hh
diff --git a/src/libexpr/eval-settings.cc b/subprojects/libexpr/eval-settings.cc
similarity index 100%
rename from src/libexpr/eval-settings.cc
rename to subprojects/libexpr/eval-settings.cc
diff --git a/src/libexpr/eval-settings.hh b/subprojects/libexpr/eval-settings.hh
similarity index 100%
rename from src/libexpr/eval-settings.hh
rename to subprojects/libexpr/eval-settings.hh
diff --git a/src/libexpr/eval.cc b/subprojects/libexpr/eval.cc
similarity index 100%
rename from src/libexpr/eval.cc
rename to subprojects/libexpr/eval.cc
diff --git a/src/libexpr/eval.hh b/subprojects/libexpr/eval.hh
similarity index 100%
rename from src/libexpr/eval.hh
rename to subprojects/libexpr/eval.hh
diff --git a/src/libexpr/fetchurl.nix b/subprojects/libexpr/fetchurl.nix
similarity index 100%
rename from src/libexpr/fetchurl.nix
rename to subprojects/libexpr/fetchurl.nix
diff --git a/src/libexpr/function-trace.cc b/subprojects/libexpr/function-trace.cc
similarity index 100%
rename from src/libexpr/function-trace.cc
rename to subprojects/libexpr/function-trace.cc
diff --git a/src/libexpr/function-trace.hh b/subprojects/libexpr/function-trace.hh
similarity index 100%
rename from src/libexpr/function-trace.hh
rename to subprojects/libexpr/function-trace.hh
diff --git a/src/libexpr/gc-small-vector.hh b/subprojects/libexpr/gc-small-vector.hh
similarity index 100%
rename from src/libexpr/gc-small-vector.hh
rename to subprojects/libexpr/gc-small-vector.hh
diff --git a/src/libexpr/get-drvs.cc b/subprojects/libexpr/get-drvs.cc
similarity index 100%
rename from src/libexpr/get-drvs.cc
rename to subprojects/libexpr/get-drvs.cc
diff --git a/src/libexpr/get-drvs.hh b/subprojects/libexpr/get-drvs.hh
similarity index 100%
rename from src/libexpr/get-drvs.hh
rename to subprojects/libexpr/get-drvs.hh
diff --git a/src/libexpr/imported-drv-to-derivation.nix b/subprojects/libexpr/imported-drv-to-derivation.nix
similarity index 100%
rename from src/libexpr/imported-drv-to-derivation.nix
rename to subprojects/libexpr/imported-drv-to-derivation.nix
diff --git a/src/libexpr/json-to-value.cc b/subprojects/libexpr/json-to-value.cc
similarity index 100%
rename from src/libexpr/json-to-value.cc
rename to subprojects/libexpr/json-to-value.cc
diff --git a/src/libexpr/json-to-value.hh b/subprojects/libexpr/json-to-value.hh
similarity index 100%
rename from src/libexpr/json-to-value.hh
rename to subprojects/libexpr/json-to-value.hh
diff --git a/src/libexpr/lexer-helpers.cc b/subprojects/libexpr/lexer-helpers.cc
similarity index 100%
rename from src/libexpr/lexer-helpers.cc
rename to subprojects/libexpr/lexer-helpers.cc
diff --git a/src/libexpr/lexer-helpers.hh b/subprojects/libexpr/lexer-helpers.hh
similarity index 100%
rename from src/libexpr/lexer-helpers.hh
rename to subprojects/libexpr/lexer-helpers.hh
diff --git a/src/libexpr/lexer.l b/subprojects/libexpr/lexer.l
similarity index 100%
rename from src/libexpr/lexer.l
rename to subprojects/libexpr/lexer.l
diff --git a/src/libexpr/local.mk b/subprojects/libexpr/local.mk
similarity index 96%
rename from src/libexpr/local.mk
rename to subprojects/libexpr/local.mk
index 68518e184..df090f6ed 100644
--- a/src/libexpr/local.mk
+++ b/subprojects/libexpr/local.mk
@@ -42,7 +42,7 @@ clean-files += $(d)/parser-tab.cc $(d)/parser-tab.hh $(d)/lexer-tab.cc $(d)/lexe
 
 $(eval $(call install-file-in, $(buildprefix)$(d)/nix-expr.pc, $(libdir)/pkgconfig, 0644))
 
-$(foreach i, $(wildcard src/libexpr/value/*.hh), \
+$(foreach i, $(wildcard $(d)/value/*.hh), \
   $(eval $(call install-file-in, $(i), $(includedir)/nix/value, 0644)))
 
 $(d)/primops.cc: $(d)/imported-drv-to-derivation.nix.gen.hh
diff --git a/src/libexpr/meson.build b/subprojects/libexpr/meson.build
similarity index 100%
rename from src/libexpr/meson.build
rename to subprojects/libexpr/meson.build
diff --git a/src/libexpr/meson.options b/subprojects/libexpr/meson.options
similarity index 100%
rename from src/libexpr/meson.options
rename to subprojects/libexpr/meson.options
diff --git a/src/libexpr/nix-expr.pc.in b/subprojects/libexpr/nix-expr.pc.in
similarity index 100%
rename from src/libexpr/nix-expr.pc.in
rename to subprojects/libexpr/nix-expr.pc.in
diff --git a/src/libexpr/nixexpr.cc b/subprojects/libexpr/nixexpr.cc
similarity index 100%
rename from src/libexpr/nixexpr.cc
rename to subprojects/libexpr/nixexpr.cc
diff --git a/src/libexpr/nixexpr.hh b/subprojects/libexpr/nixexpr.hh
similarity index 100%
rename from src/libexpr/nixexpr.hh
rename to subprojects/libexpr/nixexpr.hh
diff --git a/src/libexpr/package.nix b/subprojects/libexpr/package.nix
similarity index 100%
rename from src/libexpr/package.nix
rename to subprojects/libexpr/package.nix
diff --git a/src/libexpr/parser-state.hh b/subprojects/libexpr/parser-state.hh
similarity index 100%
rename from src/libexpr/parser-state.hh
rename to subprojects/libexpr/parser-state.hh
diff --git a/src/libexpr/parser.y b/subprojects/libexpr/parser.y
similarity index 100%
rename from src/libexpr/parser.y
rename to subprojects/libexpr/parser.y
diff --git a/src/libexpr/paths.cc b/subprojects/libexpr/paths.cc
similarity index 100%
rename from src/libexpr/paths.cc
rename to subprojects/libexpr/paths.cc
diff --git a/src/libexpr/pos-idx.hh b/subprojects/libexpr/pos-idx.hh
similarity index 100%
rename from src/libexpr/pos-idx.hh
rename to subprojects/libexpr/pos-idx.hh
diff --git a/src/libexpr/pos-table.hh b/subprojects/libexpr/pos-table.hh
similarity index 100%
rename from src/libexpr/pos-table.hh
rename to subprojects/libexpr/pos-table.hh
diff --git a/src/libexpr/primops.cc b/subprojects/libexpr/primops.cc
similarity index 100%
rename from src/libexpr/primops.cc
rename to subprojects/libexpr/primops.cc
diff --git a/src/libexpr/primops.hh b/subprojects/libexpr/primops.hh
similarity index 100%
rename from src/libexpr/primops.hh
rename to subprojects/libexpr/primops.hh
diff --git a/src/libexpr/primops/context.cc b/subprojects/libexpr/primops/context.cc
similarity index 100%
rename from src/libexpr/primops/context.cc
rename to subprojects/libexpr/primops/context.cc
diff --git a/src/libexpr/primops/derivation.nix b/subprojects/libexpr/primops/derivation.nix
similarity index 100%
rename from src/libexpr/primops/derivation.nix
rename to subprojects/libexpr/primops/derivation.nix
diff --git a/src/libexpr/primops/fetchClosure.cc b/subprojects/libexpr/primops/fetchClosure.cc
similarity index 100%
rename from src/libexpr/primops/fetchClosure.cc
rename to subprojects/libexpr/primops/fetchClosure.cc
diff --git a/src/libexpr/primops/fetchMercurial.cc b/subprojects/libexpr/primops/fetchMercurial.cc
similarity index 100%
rename from src/libexpr/primops/fetchMercurial.cc
rename to subprojects/libexpr/primops/fetchMercurial.cc
diff --git a/src/libexpr/primops/fetchTree.cc b/subprojects/libexpr/primops/fetchTree.cc
similarity index 100%
rename from src/libexpr/primops/fetchTree.cc
rename to subprojects/libexpr/primops/fetchTree.cc
diff --git a/src/libexpr/primops/fromTOML.cc b/subprojects/libexpr/primops/fromTOML.cc
similarity index 100%
rename from src/libexpr/primops/fromTOML.cc
rename to subprojects/libexpr/primops/fromTOML.cc
diff --git a/src/libexpr/primops/meson.build b/subprojects/libexpr/primops/meson.build
similarity index 100%
rename from src/libexpr/primops/meson.build
rename to subprojects/libexpr/primops/meson.build
diff --git a/src/libexpr/print-ambiguous.cc b/subprojects/libexpr/print-ambiguous.cc
similarity index 100%
rename from src/libexpr/print-ambiguous.cc
rename to subprojects/libexpr/print-ambiguous.cc
diff --git a/src/libexpr/print-ambiguous.hh b/subprojects/libexpr/print-ambiguous.hh
similarity index 100%
rename from src/libexpr/print-ambiguous.hh
rename to subprojects/libexpr/print-ambiguous.hh
diff --git a/src/libexpr/print-options.hh b/subprojects/libexpr/print-options.hh
similarity index 100%
rename from src/libexpr/print-options.hh
rename to subprojects/libexpr/print-options.hh
diff --git a/src/libexpr/print.cc b/subprojects/libexpr/print.cc
similarity index 100%
rename from src/libexpr/print.cc
rename to subprojects/libexpr/print.cc
diff --git a/src/libexpr/print.hh b/subprojects/libexpr/print.hh
similarity index 100%
rename from src/libexpr/print.hh
rename to subprojects/libexpr/print.hh
diff --git a/src/libexpr/repl-exit-status.hh b/subprojects/libexpr/repl-exit-status.hh
similarity index 100%
rename from src/libexpr/repl-exit-status.hh
rename to subprojects/libexpr/repl-exit-status.hh
diff --git a/src/libexpr/search-path.cc b/subprojects/libexpr/search-path.cc
similarity index 100%
rename from src/libexpr/search-path.cc
rename to subprojects/libexpr/search-path.cc
diff --git a/src/libexpr/search-path.hh b/subprojects/libexpr/search-path.hh
similarity index 100%
rename from src/libexpr/search-path.hh
rename to subprojects/libexpr/search-path.hh
diff --git a/src/libexpr/symbol-table.hh b/subprojects/libexpr/symbol-table.hh
similarity index 100%
rename from src/libexpr/symbol-table.hh
rename to subprojects/libexpr/symbol-table.hh
diff --git a/src/libexpr/value-to-json.cc b/subprojects/libexpr/value-to-json.cc
similarity index 100%
rename from src/libexpr/value-to-json.cc
rename to subprojects/libexpr/value-to-json.cc
diff --git a/src/libexpr/value-to-json.hh b/subprojects/libexpr/value-to-json.hh
similarity index 100%
rename from src/libexpr/value-to-json.hh
rename to subprojects/libexpr/value-to-json.hh
diff --git a/src/libexpr/value-to-xml.cc b/subprojects/libexpr/value-to-xml.cc
similarity index 100%
rename from src/libexpr/value-to-xml.cc
rename to subprojects/libexpr/value-to-xml.cc
diff --git a/src/libexpr/value-to-xml.hh b/subprojects/libexpr/value-to-xml.hh
similarity index 100%
rename from src/libexpr/value-to-xml.hh
rename to subprojects/libexpr/value-to-xml.hh
diff --git a/src/libexpr/value.hh b/subprojects/libexpr/value.hh
similarity index 100%
rename from src/libexpr/value.hh
rename to subprojects/libexpr/value.hh
diff --git a/src/libexpr/value/context.cc b/subprojects/libexpr/value/context.cc
similarity index 100%
rename from src/libexpr/value/context.cc
rename to subprojects/libexpr/value/context.cc
diff --git a/src/libexpr/value/context.hh b/subprojects/libexpr/value/context.hh
similarity index 100%
rename from src/libexpr/value/context.hh
rename to subprojects/libexpr/value/context.hh
diff --git a/src/libfetchers/.version b/subprojects/libfetchers/.version
similarity index 100%
rename from src/libfetchers/.version
rename to subprojects/libfetchers/.version
diff --git a/src/libfetchers/attrs.cc b/subprojects/libfetchers/attrs.cc
similarity index 100%
rename from src/libfetchers/attrs.cc
rename to subprojects/libfetchers/attrs.cc
diff --git a/src/libfetchers/attrs.hh b/subprojects/libfetchers/attrs.hh
similarity index 100%
rename from src/libfetchers/attrs.hh
rename to subprojects/libfetchers/attrs.hh
diff --git a/src/libfetchers/build-utils-meson b/subprojects/libfetchers/build-utils-meson
similarity index 100%
rename from src/libfetchers/build-utils-meson
rename to subprojects/libfetchers/build-utils-meson
diff --git a/src/libfetchers/cache.cc b/subprojects/libfetchers/cache.cc
similarity index 100%
rename from src/libfetchers/cache.cc
rename to subprojects/libfetchers/cache.cc
diff --git a/src/libfetchers/cache.hh b/subprojects/libfetchers/cache.hh
similarity index 100%
rename from src/libfetchers/cache.hh
rename to subprojects/libfetchers/cache.hh
diff --git a/src/libfetchers/fetch-settings.cc b/subprojects/libfetchers/fetch-settings.cc
similarity index 100%
rename from src/libfetchers/fetch-settings.cc
rename to subprojects/libfetchers/fetch-settings.cc
diff --git a/src/libfetchers/fetch-settings.hh b/subprojects/libfetchers/fetch-settings.hh
similarity index 100%
rename from src/libfetchers/fetch-settings.hh
rename to subprojects/libfetchers/fetch-settings.hh
diff --git a/src/libfetchers/fetch-to-store.cc b/subprojects/libfetchers/fetch-to-store.cc
similarity index 100%
rename from src/libfetchers/fetch-to-store.cc
rename to subprojects/libfetchers/fetch-to-store.cc
diff --git a/src/libfetchers/fetch-to-store.hh b/subprojects/libfetchers/fetch-to-store.hh
similarity index 100%
rename from src/libfetchers/fetch-to-store.hh
rename to subprojects/libfetchers/fetch-to-store.hh
diff --git a/src/libfetchers/fetchers.cc b/subprojects/libfetchers/fetchers.cc
similarity index 100%
rename from src/libfetchers/fetchers.cc
rename to subprojects/libfetchers/fetchers.cc
diff --git a/src/libfetchers/fetchers.hh b/subprojects/libfetchers/fetchers.hh
similarity index 100%
rename from src/libfetchers/fetchers.hh
rename to subprojects/libfetchers/fetchers.hh
diff --git a/src/libfetchers/filtering-source-accessor.cc b/subprojects/libfetchers/filtering-source-accessor.cc
similarity index 100%
rename from src/libfetchers/filtering-source-accessor.cc
rename to subprojects/libfetchers/filtering-source-accessor.cc
diff --git a/src/libfetchers/filtering-source-accessor.hh b/subprojects/libfetchers/filtering-source-accessor.hh
similarity index 100%
rename from src/libfetchers/filtering-source-accessor.hh
rename to subprojects/libfetchers/filtering-source-accessor.hh
diff --git a/src/libfetchers/git-utils.cc b/subprojects/libfetchers/git-utils.cc
similarity index 100%
rename from src/libfetchers/git-utils.cc
rename to subprojects/libfetchers/git-utils.cc
diff --git a/src/libfetchers/git-utils.hh b/subprojects/libfetchers/git-utils.hh
similarity index 100%
rename from src/libfetchers/git-utils.hh
rename to subprojects/libfetchers/git-utils.hh
diff --git a/src/libfetchers/git.cc b/subprojects/libfetchers/git.cc
similarity index 100%
rename from src/libfetchers/git.cc
rename to subprojects/libfetchers/git.cc
diff --git a/src/libfetchers/github.cc b/subprojects/libfetchers/github.cc
similarity index 100%
rename from src/libfetchers/github.cc
rename to subprojects/libfetchers/github.cc
diff --git a/src/libfetchers/indirect.cc b/subprojects/libfetchers/indirect.cc
similarity index 100%
rename from src/libfetchers/indirect.cc
rename to subprojects/libfetchers/indirect.cc
diff --git a/src/libfetchers/local.mk b/subprojects/libfetchers/local.mk
similarity index 100%
rename from src/libfetchers/local.mk
rename to subprojects/libfetchers/local.mk
diff --git a/src/libfetchers/mercurial.cc b/subprojects/libfetchers/mercurial.cc
similarity index 100%
rename from src/libfetchers/mercurial.cc
rename to subprojects/libfetchers/mercurial.cc
diff --git a/src/libfetchers/meson.build b/subprojects/libfetchers/meson.build
similarity index 100%
rename from src/libfetchers/meson.build
rename to subprojects/libfetchers/meson.build
diff --git a/src/libfetchers/mounted-source-accessor.cc b/subprojects/libfetchers/mounted-source-accessor.cc
similarity index 100%
rename from src/libfetchers/mounted-source-accessor.cc
rename to subprojects/libfetchers/mounted-source-accessor.cc
diff --git a/src/libfetchers/mounted-source-accessor.hh b/subprojects/libfetchers/mounted-source-accessor.hh
similarity index 100%
rename from src/libfetchers/mounted-source-accessor.hh
rename to subprojects/libfetchers/mounted-source-accessor.hh
diff --git a/src/libfetchers/package.nix b/subprojects/libfetchers/package.nix
similarity index 100%
rename from src/libfetchers/package.nix
rename to subprojects/libfetchers/package.nix
diff --git a/src/libfetchers/path.cc b/subprojects/libfetchers/path.cc
similarity index 100%
rename from src/libfetchers/path.cc
rename to subprojects/libfetchers/path.cc
diff --git a/src/libfetchers/registry.cc b/subprojects/libfetchers/registry.cc
similarity index 100%
rename from src/libfetchers/registry.cc
rename to subprojects/libfetchers/registry.cc
diff --git a/src/libfetchers/registry.hh b/subprojects/libfetchers/registry.hh
similarity index 100%
rename from src/libfetchers/registry.hh
rename to subprojects/libfetchers/registry.hh
diff --git a/src/libfetchers/store-path-accessor.cc b/subprojects/libfetchers/store-path-accessor.cc
similarity index 100%
rename from src/libfetchers/store-path-accessor.cc
rename to subprojects/libfetchers/store-path-accessor.cc
diff --git a/src/libfetchers/store-path-accessor.hh b/subprojects/libfetchers/store-path-accessor.hh
similarity index 100%
rename from src/libfetchers/store-path-accessor.hh
rename to subprojects/libfetchers/store-path-accessor.hh
diff --git a/src/libfetchers/tarball.cc b/subprojects/libfetchers/tarball.cc
similarity index 100%
rename from src/libfetchers/tarball.cc
rename to subprojects/libfetchers/tarball.cc
diff --git a/src/libfetchers/tarball.hh b/subprojects/libfetchers/tarball.hh
similarity index 100%
rename from src/libfetchers/tarball.hh
rename to subprojects/libfetchers/tarball.hh
diff --git a/src/libflake/.version b/subprojects/libflake/.version
similarity index 100%
rename from src/libflake/.version
rename to subprojects/libflake/.version
diff --git a/src/libflake/build-utils-meson b/subprojects/libflake/build-utils-meson
similarity index 100%
rename from src/libflake/build-utils-meson
rename to subprojects/libflake/build-utils-meson
diff --git a/src/libflake/flake/config.cc b/subprojects/libflake/flake/config.cc
similarity index 100%
rename from src/libflake/flake/config.cc
rename to subprojects/libflake/flake/config.cc
diff --git a/src/libflake/flake/flake.cc b/subprojects/libflake/flake/flake.cc
similarity index 100%
rename from src/libflake/flake/flake.cc
rename to subprojects/libflake/flake/flake.cc
diff --git a/src/libflake/flake/flake.hh b/subprojects/libflake/flake/flake.hh
similarity index 100%
rename from src/libflake/flake/flake.hh
rename to subprojects/libflake/flake/flake.hh
diff --git a/src/libflake/flake/flakeref.cc b/subprojects/libflake/flake/flakeref.cc
similarity index 100%
rename from src/libflake/flake/flakeref.cc
rename to subprojects/libflake/flake/flakeref.cc
diff --git a/src/libflake/flake/flakeref.hh b/subprojects/libflake/flake/flakeref.hh
similarity index 100%
rename from src/libflake/flake/flakeref.hh
rename to subprojects/libflake/flake/flakeref.hh
diff --git a/src/libflake/flake/lockfile.cc b/subprojects/libflake/flake/lockfile.cc
similarity index 100%
rename from src/libflake/flake/lockfile.cc
rename to subprojects/libflake/flake/lockfile.cc
diff --git a/src/libflake/flake/lockfile.hh b/subprojects/libflake/flake/lockfile.hh
similarity index 100%
rename from src/libflake/flake/lockfile.hh
rename to subprojects/libflake/flake/lockfile.hh
diff --git a/src/libflake/flake/nix-flake.pc.in b/subprojects/libflake/flake/nix-flake.pc.in
similarity index 100%
rename from src/libflake/flake/nix-flake.pc.in
rename to subprojects/libflake/flake/nix-flake.pc.in
diff --git a/src/libflake/flake/settings.cc b/subprojects/libflake/flake/settings.cc
similarity index 100%
rename from src/libflake/flake/settings.cc
rename to subprojects/libflake/flake/settings.cc
diff --git a/src/libflake/flake/settings.hh b/subprojects/libflake/flake/settings.hh
similarity index 100%
rename from src/libflake/flake/settings.hh
rename to subprojects/libflake/flake/settings.hh
diff --git a/src/libflake/flake/url-name.cc b/subprojects/libflake/flake/url-name.cc
similarity index 100%
rename from src/libflake/flake/url-name.cc
rename to subprojects/libflake/flake/url-name.cc
diff --git a/src/libflake/flake/url-name.hh b/subprojects/libflake/flake/url-name.hh
similarity index 100%
rename from src/libflake/flake/url-name.hh
rename to subprojects/libflake/flake/url-name.hh
diff --git a/src/libflake/local.mk b/subprojects/libflake/local.mk
similarity index 100%
rename from src/libflake/local.mk
rename to subprojects/libflake/local.mk
diff --git a/src/libflake/meson.build b/subprojects/libflake/meson.build
similarity index 100%
rename from src/libflake/meson.build
rename to subprojects/libflake/meson.build
diff --git a/src/libflake/package.nix b/subprojects/libflake/package.nix
similarity index 100%
rename from src/libflake/package.nix
rename to subprojects/libflake/package.nix
diff --git a/src/libmain-c/.version b/subprojects/libmain-c/.version
similarity index 100%
rename from src/libmain-c/.version
rename to subprojects/libmain-c/.version
diff --git a/src/libmain-c/build-utils-meson b/subprojects/libmain-c/build-utils-meson
similarity index 100%
rename from src/libmain-c/build-utils-meson
rename to subprojects/libmain-c/build-utils-meson
diff --git a/src/libmain-c/meson.build b/subprojects/libmain-c/meson.build
similarity index 100%
rename from src/libmain-c/meson.build
rename to subprojects/libmain-c/meson.build
diff --git a/src/libmain-c/nix_api_main.cc b/subprojects/libmain-c/nix_api_main.cc
similarity index 100%
rename from src/libmain-c/nix_api_main.cc
rename to subprojects/libmain-c/nix_api_main.cc
diff --git a/src/libmain-c/nix_api_main.h b/subprojects/libmain-c/nix_api_main.h
similarity index 100%
rename from src/libmain-c/nix_api_main.h
rename to subprojects/libmain-c/nix_api_main.h
diff --git a/src/libmain-c/package.nix b/subprojects/libmain-c/package.nix
similarity index 100%
rename from src/libmain-c/package.nix
rename to subprojects/libmain-c/package.nix
diff --git a/src/libmain/.version b/subprojects/libmain/.version
similarity index 100%
rename from src/libmain/.version
rename to subprojects/libmain/.version
diff --git a/src/libmain/build-utils-meson b/subprojects/libmain/build-utils-meson
similarity index 100%
rename from src/libmain/build-utils-meson
rename to subprojects/libmain/build-utils-meson
diff --git a/src/libmain/common-args.cc b/subprojects/libmain/common-args.cc
similarity index 100%
rename from src/libmain/common-args.cc
rename to subprojects/libmain/common-args.cc
diff --git a/src/libmain/common-args.hh b/subprojects/libmain/common-args.hh
similarity index 100%
rename from src/libmain/common-args.hh
rename to subprojects/libmain/common-args.hh
diff --git a/src/libmain/local.mk b/subprojects/libmain/local.mk
similarity index 100%
rename from src/libmain/local.mk
rename to subprojects/libmain/local.mk
diff --git a/src/libmain/loggers.cc b/subprojects/libmain/loggers.cc
similarity index 100%
rename from src/libmain/loggers.cc
rename to subprojects/libmain/loggers.cc
diff --git a/src/libmain/loggers.hh b/subprojects/libmain/loggers.hh
similarity index 100%
rename from src/libmain/loggers.hh
rename to subprojects/libmain/loggers.hh
diff --git a/src/libmain/meson.build b/subprojects/libmain/meson.build
similarity index 100%
rename from src/libmain/meson.build
rename to subprojects/libmain/meson.build
diff --git a/src/libmain/nix-main.pc.in b/subprojects/libmain/nix-main.pc.in
similarity index 100%
rename from src/libmain/nix-main.pc.in
rename to subprojects/libmain/nix-main.pc.in
diff --git a/src/libmain/package.nix b/subprojects/libmain/package.nix
similarity index 100%
rename from src/libmain/package.nix
rename to subprojects/libmain/package.nix
diff --git a/src/libmain/plugin.cc b/subprojects/libmain/plugin.cc
similarity index 100%
rename from src/libmain/plugin.cc
rename to subprojects/libmain/plugin.cc
diff --git a/src/libmain/plugin.hh b/subprojects/libmain/plugin.hh
similarity index 100%
rename from src/libmain/plugin.hh
rename to subprojects/libmain/plugin.hh
diff --git a/src/libmain/progress-bar.cc b/subprojects/libmain/progress-bar.cc
similarity index 100%
rename from src/libmain/progress-bar.cc
rename to subprojects/libmain/progress-bar.cc
diff --git a/src/libmain/progress-bar.hh b/subprojects/libmain/progress-bar.hh
similarity index 100%
rename from src/libmain/progress-bar.hh
rename to subprojects/libmain/progress-bar.hh
diff --git a/src/libmain/shared.cc b/subprojects/libmain/shared.cc
similarity index 100%
rename from src/libmain/shared.cc
rename to subprojects/libmain/shared.cc
diff --git a/src/libmain/shared.hh b/subprojects/libmain/shared.hh
similarity index 100%
rename from src/libmain/shared.hh
rename to subprojects/libmain/shared.hh
diff --git a/src/libmain/unix/stack.cc b/subprojects/libmain/unix/stack.cc
similarity index 100%
rename from src/libmain/unix/stack.cc
rename to subprojects/libmain/unix/stack.cc
diff --git a/src/libstore-c/.version b/subprojects/libstore-c/.version
similarity index 100%
rename from src/libstore-c/.version
rename to subprojects/libstore-c/.version
diff --git a/src/libstore-c/build-utils-meson b/subprojects/libstore-c/build-utils-meson
similarity index 100%
rename from src/libstore-c/build-utils-meson
rename to subprojects/libstore-c/build-utils-meson
diff --git a/src/libstore-c/local.mk b/subprojects/libstore-c/local.mk
similarity index 100%
rename from src/libstore-c/local.mk
rename to subprojects/libstore-c/local.mk
diff --git a/src/libstore-c/meson.build b/subprojects/libstore-c/meson.build
similarity index 100%
rename from src/libstore-c/meson.build
rename to subprojects/libstore-c/meson.build
diff --git a/src/libstore-c/nix-store-c.pc.in b/subprojects/libstore-c/nix-store-c.pc.in
similarity index 100%
rename from src/libstore-c/nix-store-c.pc.in
rename to subprojects/libstore-c/nix-store-c.pc.in
diff --git a/src/libstore-c/nix_api_store.cc b/subprojects/libstore-c/nix_api_store.cc
similarity index 100%
rename from src/libstore-c/nix_api_store.cc
rename to subprojects/libstore-c/nix_api_store.cc
diff --git a/src/libstore-c/nix_api_store.h b/subprojects/libstore-c/nix_api_store.h
similarity index 100%
rename from src/libstore-c/nix_api_store.h
rename to subprojects/libstore-c/nix_api_store.h
diff --git a/src/libstore-c/nix_api_store_internal.h b/subprojects/libstore-c/nix_api_store_internal.h
similarity index 100%
rename from src/libstore-c/nix_api_store_internal.h
rename to subprojects/libstore-c/nix_api_store_internal.h
diff --git a/src/libstore-c/package.nix b/subprojects/libstore-c/package.nix
similarity index 100%
rename from src/libstore-c/package.nix
rename to subprojects/libstore-c/package.nix
diff --git a/src/libstore/.version b/subprojects/libstore/.version
similarity index 100%
rename from src/libstore/.version
rename to subprojects/libstore/.version
diff --git a/src/libstore/binary-cache-store.cc b/subprojects/libstore/binary-cache-store.cc
similarity index 100%
rename from src/libstore/binary-cache-store.cc
rename to subprojects/libstore/binary-cache-store.cc
diff --git a/src/libstore/binary-cache-store.hh b/subprojects/libstore/binary-cache-store.hh
similarity index 100%
rename from src/libstore/binary-cache-store.hh
rename to subprojects/libstore/binary-cache-store.hh
diff --git a/src/libstore/build-result.cc b/subprojects/libstore/build-result.cc
similarity index 100%
rename from src/libstore/build-result.cc
rename to subprojects/libstore/build-result.cc
diff --git a/src/libstore/build-result.hh b/subprojects/libstore/build-result.hh
similarity index 100%
rename from src/libstore/build-result.hh
rename to subprojects/libstore/build-result.hh
diff --git a/src/libstore/build-utils-meson b/subprojects/libstore/build-utils-meson
similarity index 100%
rename from src/libstore/build-utils-meson
rename to subprojects/libstore/build-utils-meson
diff --git a/src/libstore/build/derivation-goal.cc b/subprojects/libstore/build/derivation-goal.cc
similarity index 100%
rename from src/libstore/build/derivation-goal.cc
rename to subprojects/libstore/build/derivation-goal.cc
diff --git a/src/libstore/build/derivation-goal.hh b/subprojects/libstore/build/derivation-goal.hh
similarity index 100%
rename from src/libstore/build/derivation-goal.hh
rename to subprojects/libstore/build/derivation-goal.hh
diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/subprojects/libstore/build/drv-output-substitution-goal.cc
similarity index 100%
rename from src/libstore/build/drv-output-substitution-goal.cc
rename to subprojects/libstore/build/drv-output-substitution-goal.cc
diff --git a/src/libstore/build/drv-output-substitution-goal.hh b/subprojects/libstore/build/drv-output-substitution-goal.hh
similarity index 100%
rename from src/libstore/build/drv-output-substitution-goal.hh
rename to subprojects/libstore/build/drv-output-substitution-goal.hh
diff --git a/src/libstore/build/entry-points.cc b/subprojects/libstore/build/entry-points.cc
similarity index 100%
rename from src/libstore/build/entry-points.cc
rename to subprojects/libstore/build/entry-points.cc
diff --git a/src/libstore/build/goal.cc b/subprojects/libstore/build/goal.cc
similarity index 100%
rename from src/libstore/build/goal.cc
rename to subprojects/libstore/build/goal.cc
diff --git a/src/libstore/build/goal.hh b/subprojects/libstore/build/goal.hh
similarity index 100%
rename from src/libstore/build/goal.hh
rename to subprojects/libstore/build/goal.hh
diff --git a/src/libstore/build/substitution-goal.cc b/subprojects/libstore/build/substitution-goal.cc
similarity index 100%
rename from src/libstore/build/substitution-goal.cc
rename to subprojects/libstore/build/substitution-goal.cc
diff --git a/src/libstore/build/substitution-goal.hh b/subprojects/libstore/build/substitution-goal.hh
similarity index 100%
rename from src/libstore/build/substitution-goal.hh
rename to subprojects/libstore/build/substitution-goal.hh
diff --git a/src/libstore/build/worker.cc b/subprojects/libstore/build/worker.cc
similarity index 100%
rename from src/libstore/build/worker.cc
rename to subprojects/libstore/build/worker.cc
diff --git a/src/libstore/build/worker.hh b/subprojects/libstore/build/worker.hh
similarity index 100%
rename from src/libstore/build/worker.hh
rename to subprojects/libstore/build/worker.hh
diff --git a/src/libstore/builtins.hh b/subprojects/libstore/builtins.hh
similarity index 100%
rename from src/libstore/builtins.hh
rename to subprojects/libstore/builtins.hh
diff --git a/src/libstore/builtins/buildenv.cc b/subprojects/libstore/builtins/buildenv.cc
similarity index 100%
rename from src/libstore/builtins/buildenv.cc
rename to subprojects/libstore/builtins/buildenv.cc
diff --git a/src/libstore/builtins/buildenv.hh b/subprojects/libstore/builtins/buildenv.hh
similarity index 100%
rename from src/libstore/builtins/buildenv.hh
rename to subprojects/libstore/builtins/buildenv.hh
diff --git a/src/libstore/builtins/fetchurl.cc b/subprojects/libstore/builtins/fetchurl.cc
similarity index 100%
rename from src/libstore/builtins/fetchurl.cc
rename to subprojects/libstore/builtins/fetchurl.cc
diff --git a/src/libstore/builtins/unpack-channel.cc b/subprojects/libstore/builtins/unpack-channel.cc
similarity index 100%
rename from src/libstore/builtins/unpack-channel.cc
rename to subprojects/libstore/builtins/unpack-channel.cc
diff --git a/src/libstore/ca-specific-schema.sql b/subprojects/libstore/ca-specific-schema.sql
similarity index 100%
rename from src/libstore/ca-specific-schema.sql
rename to subprojects/libstore/ca-specific-schema.sql
diff --git a/src/libstore/common-protocol-impl.hh b/subprojects/libstore/common-protocol-impl.hh
similarity index 100%
rename from src/libstore/common-protocol-impl.hh
rename to subprojects/libstore/common-protocol-impl.hh
diff --git a/src/libstore/common-protocol.cc b/subprojects/libstore/common-protocol.cc
similarity index 100%
rename from src/libstore/common-protocol.cc
rename to subprojects/libstore/common-protocol.cc
diff --git a/src/libstore/common-protocol.hh b/subprojects/libstore/common-protocol.hh
similarity index 100%
rename from src/libstore/common-protocol.hh
rename to subprojects/libstore/common-protocol.hh
diff --git a/src/libstore/common-ssh-store-config.cc b/subprojects/libstore/common-ssh-store-config.cc
similarity index 100%
rename from src/libstore/common-ssh-store-config.cc
rename to subprojects/libstore/common-ssh-store-config.cc
diff --git a/src/libstore/common-ssh-store-config.hh b/subprojects/libstore/common-ssh-store-config.hh
similarity index 100%
rename from src/libstore/common-ssh-store-config.hh
rename to subprojects/libstore/common-ssh-store-config.hh
diff --git a/src/libstore/content-address.cc b/subprojects/libstore/content-address.cc
similarity index 100%
rename from src/libstore/content-address.cc
rename to subprojects/libstore/content-address.cc
diff --git a/src/libstore/content-address.hh b/subprojects/libstore/content-address.hh
similarity index 100%
rename from src/libstore/content-address.hh
rename to subprojects/libstore/content-address.hh
diff --git a/src/libstore/daemon.cc b/subprojects/libstore/daemon.cc
similarity index 100%
rename from src/libstore/daemon.cc
rename to subprojects/libstore/daemon.cc
diff --git a/src/libstore/daemon.hh b/subprojects/libstore/daemon.hh
similarity index 100%
rename from src/libstore/daemon.hh
rename to subprojects/libstore/daemon.hh
diff --git a/src/libstore/derivations.cc b/subprojects/libstore/derivations.cc
similarity index 100%
rename from src/libstore/derivations.cc
rename to subprojects/libstore/derivations.cc
diff --git a/src/libstore/derivations.hh b/subprojects/libstore/derivations.hh
similarity index 100%
rename from src/libstore/derivations.hh
rename to subprojects/libstore/derivations.hh
diff --git a/src/libstore/derived-path-map.cc b/subprojects/libstore/derived-path-map.cc
similarity index 100%
rename from src/libstore/derived-path-map.cc
rename to subprojects/libstore/derived-path-map.cc
diff --git a/src/libstore/derived-path-map.hh b/subprojects/libstore/derived-path-map.hh
similarity index 100%
rename from src/libstore/derived-path-map.hh
rename to subprojects/libstore/derived-path-map.hh
diff --git a/src/libstore/derived-path.cc b/subprojects/libstore/derived-path.cc
similarity index 100%
rename from src/libstore/derived-path.cc
rename to subprojects/libstore/derived-path.cc
diff --git a/src/libstore/derived-path.hh b/subprojects/libstore/derived-path.hh
similarity index 100%
rename from src/libstore/derived-path.hh
rename to subprojects/libstore/derived-path.hh
diff --git a/src/libstore/downstream-placeholder.cc b/subprojects/libstore/downstream-placeholder.cc
similarity index 100%
rename from src/libstore/downstream-placeholder.cc
rename to subprojects/libstore/downstream-placeholder.cc
diff --git a/src/libstore/downstream-placeholder.hh b/subprojects/libstore/downstream-placeholder.hh
similarity index 100%
rename from src/libstore/downstream-placeholder.hh
rename to subprojects/libstore/downstream-placeholder.hh
diff --git a/src/libstore/dummy-store.cc b/subprojects/libstore/dummy-store.cc
similarity index 100%
rename from src/libstore/dummy-store.cc
rename to subprojects/libstore/dummy-store.cc
diff --git a/src/libstore/dummy-store.md b/subprojects/libstore/dummy-store.md
similarity index 100%
rename from src/libstore/dummy-store.md
rename to subprojects/libstore/dummy-store.md
diff --git a/src/libstore/export-import.cc b/subprojects/libstore/export-import.cc
similarity index 100%
rename from src/libstore/export-import.cc
rename to subprojects/libstore/export-import.cc
diff --git a/src/libstore/filetransfer.cc b/subprojects/libstore/filetransfer.cc
similarity index 100%
rename from src/libstore/filetransfer.cc
rename to subprojects/libstore/filetransfer.cc
diff --git a/src/libstore/filetransfer.hh b/subprojects/libstore/filetransfer.hh
similarity index 100%
rename from src/libstore/filetransfer.hh
rename to subprojects/libstore/filetransfer.hh
diff --git a/src/libstore/gc-store.hh b/subprojects/libstore/gc-store.hh
similarity index 100%
rename from src/libstore/gc-store.hh
rename to subprojects/libstore/gc-store.hh
diff --git a/src/libstore/gc.cc b/subprojects/libstore/gc.cc
similarity index 100%
rename from src/libstore/gc.cc
rename to subprojects/libstore/gc.cc
diff --git a/src/libstore/globals.cc b/subprojects/libstore/globals.cc
similarity index 100%
rename from src/libstore/globals.cc
rename to subprojects/libstore/globals.cc
diff --git a/src/libstore/globals.hh b/subprojects/libstore/globals.hh
similarity index 100%
rename from src/libstore/globals.hh
rename to subprojects/libstore/globals.hh
diff --git a/src/libstore/http-binary-cache-store.cc b/subprojects/libstore/http-binary-cache-store.cc
similarity index 100%
rename from src/libstore/http-binary-cache-store.cc
rename to subprojects/libstore/http-binary-cache-store.cc
diff --git a/src/libstore/http-binary-cache-store.hh b/subprojects/libstore/http-binary-cache-store.hh
similarity index 100%
rename from src/libstore/http-binary-cache-store.hh
rename to subprojects/libstore/http-binary-cache-store.hh
diff --git a/src/libstore/http-binary-cache-store.md b/subprojects/libstore/http-binary-cache-store.md
similarity index 100%
rename from src/libstore/http-binary-cache-store.md
rename to subprojects/libstore/http-binary-cache-store.md
diff --git a/src/libstore/indirect-root-store.cc b/subprojects/libstore/indirect-root-store.cc
similarity index 100%
rename from src/libstore/indirect-root-store.cc
rename to subprojects/libstore/indirect-root-store.cc
diff --git a/src/libstore/indirect-root-store.hh b/subprojects/libstore/indirect-root-store.hh
similarity index 100%
rename from src/libstore/indirect-root-store.hh
rename to subprojects/libstore/indirect-root-store.hh
diff --git a/src/libstore/keys.cc b/subprojects/libstore/keys.cc
similarity index 100%
rename from src/libstore/keys.cc
rename to subprojects/libstore/keys.cc
diff --git a/src/libstore/keys.hh b/subprojects/libstore/keys.hh
similarity index 100%
rename from src/libstore/keys.hh
rename to subprojects/libstore/keys.hh
diff --git a/src/libstore/legacy-ssh-store.cc b/subprojects/libstore/legacy-ssh-store.cc
similarity index 100%
rename from src/libstore/legacy-ssh-store.cc
rename to subprojects/libstore/legacy-ssh-store.cc
diff --git a/src/libstore/legacy-ssh-store.hh b/subprojects/libstore/legacy-ssh-store.hh
similarity index 100%
rename from src/libstore/legacy-ssh-store.hh
rename to subprojects/libstore/legacy-ssh-store.hh
diff --git a/src/libstore/legacy-ssh-store.md b/subprojects/libstore/legacy-ssh-store.md
similarity index 100%
rename from src/libstore/legacy-ssh-store.md
rename to subprojects/libstore/legacy-ssh-store.md
diff --git a/src/libstore/length-prefixed-protocol-helper.hh b/subprojects/libstore/length-prefixed-protocol-helper.hh
similarity index 100%
rename from src/libstore/length-prefixed-protocol-helper.hh
rename to subprojects/libstore/length-prefixed-protocol-helper.hh
diff --git a/src/libstore/linux/fchmodat2-compat.hh b/subprojects/libstore/linux/fchmodat2-compat.hh
similarity index 100%
rename from src/libstore/linux/fchmodat2-compat.hh
rename to subprojects/libstore/linux/fchmodat2-compat.hh
diff --git a/src/libstore/linux/meson.build b/subprojects/libstore/linux/meson.build
similarity index 100%
rename from src/libstore/linux/meson.build
rename to subprojects/libstore/linux/meson.build
diff --git a/src/libstore/linux/personality.cc b/subprojects/libstore/linux/personality.cc
similarity index 100%
rename from src/libstore/linux/personality.cc
rename to subprojects/libstore/linux/personality.cc
diff --git a/src/libstore/linux/personality.hh b/subprojects/libstore/linux/personality.hh
similarity index 100%
rename from src/libstore/linux/personality.hh
rename to subprojects/libstore/linux/personality.hh
diff --git a/src/libstore/local-binary-cache-store.cc b/subprojects/libstore/local-binary-cache-store.cc
similarity index 100%
rename from src/libstore/local-binary-cache-store.cc
rename to subprojects/libstore/local-binary-cache-store.cc
diff --git a/src/libstore/local-binary-cache-store.hh b/subprojects/libstore/local-binary-cache-store.hh
similarity index 100%
rename from src/libstore/local-binary-cache-store.hh
rename to subprojects/libstore/local-binary-cache-store.hh
diff --git a/src/libstore/local-binary-cache-store.md b/subprojects/libstore/local-binary-cache-store.md
similarity index 100%
rename from src/libstore/local-binary-cache-store.md
rename to subprojects/libstore/local-binary-cache-store.md
diff --git a/src/libstore/local-fs-store.cc b/subprojects/libstore/local-fs-store.cc
similarity index 100%
rename from src/libstore/local-fs-store.cc
rename to subprojects/libstore/local-fs-store.cc
diff --git a/src/libstore/local-fs-store.hh b/subprojects/libstore/local-fs-store.hh
similarity index 100%
rename from src/libstore/local-fs-store.hh
rename to subprojects/libstore/local-fs-store.hh
diff --git a/src/libstore/local-overlay-store.cc b/subprojects/libstore/local-overlay-store.cc
similarity index 100%
rename from src/libstore/local-overlay-store.cc
rename to subprojects/libstore/local-overlay-store.cc
diff --git a/src/libstore/local-overlay-store.hh b/subprojects/libstore/local-overlay-store.hh
similarity index 100%
rename from src/libstore/local-overlay-store.hh
rename to subprojects/libstore/local-overlay-store.hh
diff --git a/src/libstore/local-overlay-store.md b/subprojects/libstore/local-overlay-store.md
similarity index 100%
rename from src/libstore/local-overlay-store.md
rename to subprojects/libstore/local-overlay-store.md
diff --git a/src/libstore/local-store.cc b/subprojects/libstore/local-store.cc
similarity index 100%
rename from src/libstore/local-store.cc
rename to subprojects/libstore/local-store.cc
diff --git a/src/libstore/local-store.hh b/subprojects/libstore/local-store.hh
similarity index 100%
rename from src/libstore/local-store.hh
rename to subprojects/libstore/local-store.hh
diff --git a/src/libstore/local-store.md b/subprojects/libstore/local-store.md
similarity index 100%
rename from src/libstore/local-store.md
rename to subprojects/libstore/local-store.md
diff --git a/src/libstore/local.mk b/subprojects/libstore/local.mk
similarity index 96%
rename from src/libstore/local.mk
rename to subprojects/libstore/local.mk
index 43d8993ba..bb0f3bec3 100644
--- a/src/libstore/local.mk
+++ b/subprojects/libstore/local.mk
@@ -96,8 +96,8 @@ clean-files += $(d)/schema.sql.gen.hh $(d)/ca-specific-schema.sql.gen.hh
 
 $(eval $(call install-file-in, $(buildprefix)$(d)/nix-store.pc, $(libdir)/pkgconfig, 0644))
 
-$(foreach i, $(wildcard src/libstore/builtins/*.hh), \
+$(foreach i, $(wildcard $(d)/builtins/*.hh), \
   $(eval $(call install-file-in, $(i), $(includedir)/nix/builtins, 0644)))
 
-$(foreach i, $(wildcard src/libstore/build/*.hh), \
+$(foreach i, $(wildcard $(d)/build/*.hh), \
   $(eval $(call install-file-in, $(i), $(includedir)/nix/build, 0644)))
diff --git a/src/libstore/log-store.cc b/subprojects/libstore/log-store.cc
similarity index 100%
rename from src/libstore/log-store.cc
rename to subprojects/libstore/log-store.cc
diff --git a/src/libstore/log-store.hh b/subprojects/libstore/log-store.hh
similarity index 100%
rename from src/libstore/log-store.hh
rename to subprojects/libstore/log-store.hh
diff --git a/src/libstore/machines.cc b/subprojects/libstore/machines.cc
similarity index 100%
rename from src/libstore/machines.cc
rename to subprojects/libstore/machines.cc
diff --git a/src/libstore/machines.hh b/subprojects/libstore/machines.hh
similarity index 100%
rename from src/libstore/machines.hh
rename to subprojects/libstore/machines.hh
diff --git a/src/libstore/make-content-addressed.cc b/subprojects/libstore/make-content-addressed.cc
similarity index 100%
rename from src/libstore/make-content-addressed.cc
rename to subprojects/libstore/make-content-addressed.cc
diff --git a/src/libstore/make-content-addressed.hh b/subprojects/libstore/make-content-addressed.hh
similarity index 100%
rename from src/libstore/make-content-addressed.hh
rename to subprojects/libstore/make-content-addressed.hh
diff --git a/src/libstore/meson.build b/subprojects/libstore/meson.build
similarity index 100%
rename from src/libstore/meson.build
rename to subprojects/libstore/meson.build
diff --git a/src/libstore/meson.options b/subprojects/libstore/meson.options
similarity index 100%
rename from src/libstore/meson.options
rename to subprojects/libstore/meson.options
diff --git a/src/libstore/misc.cc b/subprojects/libstore/misc.cc
similarity index 100%
rename from src/libstore/misc.cc
rename to subprojects/libstore/misc.cc
diff --git a/src/libstore/mounted-ssh-store.md b/subprojects/libstore/mounted-ssh-store.md
similarity index 100%
rename from src/libstore/mounted-ssh-store.md
rename to subprojects/libstore/mounted-ssh-store.md
diff --git a/src/libstore/names.cc b/subprojects/libstore/names.cc
similarity index 100%
rename from src/libstore/names.cc
rename to subprojects/libstore/names.cc
diff --git a/src/libstore/names.hh b/subprojects/libstore/names.hh
similarity index 100%
rename from src/libstore/names.hh
rename to subprojects/libstore/names.hh
diff --git a/src/libstore/nar-accessor.cc b/subprojects/libstore/nar-accessor.cc
similarity index 100%
rename from src/libstore/nar-accessor.cc
rename to subprojects/libstore/nar-accessor.cc
diff --git a/src/libstore/nar-accessor.hh b/subprojects/libstore/nar-accessor.hh
similarity index 100%
rename from src/libstore/nar-accessor.hh
rename to subprojects/libstore/nar-accessor.hh
diff --git a/src/libstore/nar-info-disk-cache.cc b/subprojects/libstore/nar-info-disk-cache.cc
similarity index 100%
rename from src/libstore/nar-info-disk-cache.cc
rename to subprojects/libstore/nar-info-disk-cache.cc
diff --git a/src/libstore/nar-info-disk-cache.hh b/subprojects/libstore/nar-info-disk-cache.hh
similarity index 100%
rename from src/libstore/nar-info-disk-cache.hh
rename to subprojects/libstore/nar-info-disk-cache.hh
diff --git a/src/libstore/nar-info.cc b/subprojects/libstore/nar-info.cc
similarity index 100%
rename from src/libstore/nar-info.cc
rename to subprojects/libstore/nar-info.cc
diff --git a/src/libstore/nar-info.hh b/subprojects/libstore/nar-info.hh
similarity index 100%
rename from src/libstore/nar-info.hh
rename to subprojects/libstore/nar-info.hh
diff --git a/src/libstore/nix-store.pc.in b/subprojects/libstore/nix-store.pc.in
similarity index 100%
rename from src/libstore/nix-store.pc.in
rename to subprojects/libstore/nix-store.pc.in
diff --git a/src/libstore/optimise-store.cc b/subprojects/libstore/optimise-store.cc
similarity index 100%
rename from src/libstore/optimise-store.cc
rename to subprojects/libstore/optimise-store.cc
diff --git a/src/libstore/outputs-spec.cc b/subprojects/libstore/outputs-spec.cc
similarity index 100%
rename from src/libstore/outputs-spec.cc
rename to subprojects/libstore/outputs-spec.cc
diff --git a/src/libstore/outputs-spec.hh b/subprojects/libstore/outputs-spec.hh
similarity index 100%
rename from src/libstore/outputs-spec.hh
rename to subprojects/libstore/outputs-spec.hh
diff --git a/src/libstore/package.nix b/subprojects/libstore/package.nix
similarity index 100%
rename from src/libstore/package.nix
rename to subprojects/libstore/package.nix
diff --git a/src/libstore/parsed-derivations.cc b/subprojects/libstore/parsed-derivations.cc
similarity index 100%
rename from src/libstore/parsed-derivations.cc
rename to subprojects/libstore/parsed-derivations.cc
diff --git a/src/libstore/parsed-derivations.hh b/subprojects/libstore/parsed-derivations.hh
similarity index 100%
rename from src/libstore/parsed-derivations.hh
rename to subprojects/libstore/parsed-derivations.hh
diff --git a/src/libstore/path-info.cc b/subprojects/libstore/path-info.cc
similarity index 100%
rename from src/libstore/path-info.cc
rename to subprojects/libstore/path-info.cc
diff --git a/src/libstore/path-info.hh b/subprojects/libstore/path-info.hh
similarity index 100%
rename from src/libstore/path-info.hh
rename to subprojects/libstore/path-info.hh
diff --git a/src/libstore/path-references.cc b/subprojects/libstore/path-references.cc
similarity index 100%
rename from src/libstore/path-references.cc
rename to subprojects/libstore/path-references.cc
diff --git a/src/libstore/path-references.hh b/subprojects/libstore/path-references.hh
similarity index 100%
rename from src/libstore/path-references.hh
rename to subprojects/libstore/path-references.hh
diff --git a/src/libstore/path-regex.hh b/subprojects/libstore/path-regex.hh
similarity index 100%
rename from src/libstore/path-regex.hh
rename to subprojects/libstore/path-regex.hh
diff --git a/src/libstore/path-with-outputs.cc b/subprojects/libstore/path-with-outputs.cc
similarity index 100%
rename from src/libstore/path-with-outputs.cc
rename to subprojects/libstore/path-with-outputs.cc
diff --git a/src/libstore/path-with-outputs.hh b/subprojects/libstore/path-with-outputs.hh
similarity index 100%
rename from src/libstore/path-with-outputs.hh
rename to subprojects/libstore/path-with-outputs.hh
diff --git a/src/libstore/path.cc b/subprojects/libstore/path.cc
similarity index 100%
rename from src/libstore/path.cc
rename to subprojects/libstore/path.cc
diff --git a/src/libstore/path.hh b/subprojects/libstore/path.hh
similarity index 100%
rename from src/libstore/path.hh
rename to subprojects/libstore/path.hh
diff --git a/src/libstore/pathlocks.cc b/subprojects/libstore/pathlocks.cc
similarity index 100%
rename from src/libstore/pathlocks.cc
rename to subprojects/libstore/pathlocks.cc
diff --git a/src/libstore/pathlocks.hh b/subprojects/libstore/pathlocks.hh
similarity index 100%
rename from src/libstore/pathlocks.hh
rename to subprojects/libstore/pathlocks.hh
diff --git a/src/libstore/posix-fs-canonicalise.cc b/subprojects/libstore/posix-fs-canonicalise.cc
similarity index 100%
rename from src/libstore/posix-fs-canonicalise.cc
rename to subprojects/libstore/posix-fs-canonicalise.cc
diff --git a/src/libstore/posix-fs-canonicalise.hh b/subprojects/libstore/posix-fs-canonicalise.hh
similarity index 100%
rename from src/libstore/posix-fs-canonicalise.hh
rename to subprojects/libstore/posix-fs-canonicalise.hh
diff --git a/src/libstore/profiles.cc b/subprojects/libstore/profiles.cc
similarity index 100%
rename from src/libstore/profiles.cc
rename to subprojects/libstore/profiles.cc
diff --git a/src/libstore/profiles.hh b/subprojects/libstore/profiles.hh
similarity index 100%
rename from src/libstore/profiles.hh
rename to subprojects/libstore/profiles.hh
diff --git a/src/libstore/realisation.cc b/subprojects/libstore/realisation.cc
similarity index 100%
rename from src/libstore/realisation.cc
rename to subprojects/libstore/realisation.cc
diff --git a/src/libstore/realisation.hh b/subprojects/libstore/realisation.hh
similarity index 100%
rename from src/libstore/realisation.hh
rename to subprojects/libstore/realisation.hh
diff --git a/src/libstore/remote-fs-accessor.cc b/subprojects/libstore/remote-fs-accessor.cc
similarity index 100%
rename from src/libstore/remote-fs-accessor.cc
rename to subprojects/libstore/remote-fs-accessor.cc
diff --git a/src/libstore/remote-fs-accessor.hh b/subprojects/libstore/remote-fs-accessor.hh
similarity index 100%
rename from src/libstore/remote-fs-accessor.hh
rename to subprojects/libstore/remote-fs-accessor.hh
diff --git a/src/libstore/remote-store-connection.hh b/subprojects/libstore/remote-store-connection.hh
similarity index 100%
rename from src/libstore/remote-store-connection.hh
rename to subprojects/libstore/remote-store-connection.hh
diff --git a/src/libstore/remote-store.cc b/subprojects/libstore/remote-store.cc
similarity index 100%
rename from src/libstore/remote-store.cc
rename to subprojects/libstore/remote-store.cc
diff --git a/src/libstore/remote-store.hh b/subprojects/libstore/remote-store.hh
similarity index 100%
rename from src/libstore/remote-store.hh
rename to subprojects/libstore/remote-store.hh
diff --git a/src/libstore/s3-binary-cache-store.cc b/subprojects/libstore/s3-binary-cache-store.cc
similarity index 100%
rename from src/libstore/s3-binary-cache-store.cc
rename to subprojects/libstore/s3-binary-cache-store.cc
diff --git a/src/libstore/s3-binary-cache-store.hh b/subprojects/libstore/s3-binary-cache-store.hh
similarity index 100%
rename from src/libstore/s3-binary-cache-store.hh
rename to subprojects/libstore/s3-binary-cache-store.hh
diff --git a/src/libstore/s3-binary-cache-store.md b/subprojects/libstore/s3-binary-cache-store.md
similarity index 100%
rename from src/libstore/s3-binary-cache-store.md
rename to subprojects/libstore/s3-binary-cache-store.md
diff --git a/src/libstore/s3.hh b/subprojects/libstore/s3.hh
similarity index 100%
rename from src/libstore/s3.hh
rename to subprojects/libstore/s3.hh
diff --git a/src/libstore/schema.sql b/subprojects/libstore/schema.sql
similarity index 100%
rename from src/libstore/schema.sql
rename to subprojects/libstore/schema.sql
diff --git a/src/libstore/serve-protocol-connection.cc b/subprojects/libstore/serve-protocol-connection.cc
similarity index 100%
rename from src/libstore/serve-protocol-connection.cc
rename to subprojects/libstore/serve-protocol-connection.cc
diff --git a/src/libstore/serve-protocol-connection.hh b/subprojects/libstore/serve-protocol-connection.hh
similarity index 100%
rename from src/libstore/serve-protocol-connection.hh
rename to subprojects/libstore/serve-protocol-connection.hh
diff --git a/src/libstore/serve-protocol-impl.hh b/subprojects/libstore/serve-protocol-impl.hh
similarity index 100%
rename from src/libstore/serve-protocol-impl.hh
rename to subprojects/libstore/serve-protocol-impl.hh
diff --git a/src/libstore/serve-protocol.cc b/subprojects/libstore/serve-protocol.cc
similarity index 100%
rename from src/libstore/serve-protocol.cc
rename to subprojects/libstore/serve-protocol.cc
diff --git a/src/libstore/serve-protocol.hh b/subprojects/libstore/serve-protocol.hh
similarity index 100%
rename from src/libstore/serve-protocol.hh
rename to subprojects/libstore/serve-protocol.hh
diff --git a/src/libstore/sqlite.cc b/subprojects/libstore/sqlite.cc
similarity index 100%
rename from src/libstore/sqlite.cc
rename to subprojects/libstore/sqlite.cc
diff --git a/src/libstore/sqlite.hh b/subprojects/libstore/sqlite.hh
similarity index 100%
rename from src/libstore/sqlite.hh
rename to subprojects/libstore/sqlite.hh
diff --git a/src/libstore/ssh-store.cc b/subprojects/libstore/ssh-store.cc
similarity index 100%
rename from src/libstore/ssh-store.cc
rename to subprojects/libstore/ssh-store.cc
diff --git a/src/libstore/ssh-store.hh b/subprojects/libstore/ssh-store.hh
similarity index 100%
rename from src/libstore/ssh-store.hh
rename to subprojects/libstore/ssh-store.hh
diff --git a/src/libstore/ssh-store.md b/subprojects/libstore/ssh-store.md
similarity index 100%
rename from src/libstore/ssh-store.md
rename to subprojects/libstore/ssh-store.md
diff --git a/src/libstore/ssh.cc b/subprojects/libstore/ssh.cc
similarity index 100%
rename from src/libstore/ssh.cc
rename to subprojects/libstore/ssh.cc
diff --git a/src/libstore/ssh.hh b/subprojects/libstore/ssh.hh
similarity index 100%
rename from src/libstore/ssh.hh
rename to subprojects/libstore/ssh.hh
diff --git a/src/libstore/store-api.cc b/subprojects/libstore/store-api.cc
similarity index 100%
rename from src/libstore/store-api.cc
rename to subprojects/libstore/store-api.cc
diff --git a/src/libstore/store-api.hh b/subprojects/libstore/store-api.hh
similarity index 100%
rename from src/libstore/store-api.hh
rename to subprojects/libstore/store-api.hh
diff --git a/src/libstore/store-cast.hh b/subprojects/libstore/store-cast.hh
similarity index 100%
rename from src/libstore/store-cast.hh
rename to subprojects/libstore/store-cast.hh
diff --git a/src/libstore/store-dir-config.hh b/subprojects/libstore/store-dir-config.hh
similarity index 100%
rename from src/libstore/store-dir-config.hh
rename to subprojects/libstore/store-dir-config.hh
diff --git a/src/libstore/store-reference.cc b/subprojects/libstore/store-reference.cc
similarity index 100%
rename from src/libstore/store-reference.cc
rename to subprojects/libstore/store-reference.cc
diff --git a/src/libstore/store-reference.hh b/subprojects/libstore/store-reference.hh
similarity index 100%
rename from src/libstore/store-reference.hh
rename to subprojects/libstore/store-reference.hh
diff --git a/src/libstore/uds-remote-store.cc b/subprojects/libstore/uds-remote-store.cc
similarity index 100%
rename from src/libstore/uds-remote-store.cc
rename to subprojects/libstore/uds-remote-store.cc
diff --git a/src/libstore/uds-remote-store.hh b/subprojects/libstore/uds-remote-store.hh
similarity index 100%
rename from src/libstore/uds-remote-store.hh
rename to subprojects/libstore/uds-remote-store.hh
diff --git a/src/libstore/uds-remote-store.md b/subprojects/libstore/uds-remote-store.md
similarity index 100%
rename from src/libstore/uds-remote-store.md
rename to subprojects/libstore/uds-remote-store.md
diff --git a/src/libstore/unix/build/child.cc b/subprojects/libstore/unix/build/child.cc
similarity index 100%
rename from src/libstore/unix/build/child.cc
rename to subprojects/libstore/unix/build/child.cc
diff --git a/src/libstore/unix/build/child.hh b/subprojects/libstore/unix/build/child.hh
similarity index 100%
rename from src/libstore/unix/build/child.hh
rename to subprojects/libstore/unix/build/child.hh
diff --git a/src/libstore/unix/build/hook-instance.cc b/subprojects/libstore/unix/build/hook-instance.cc
similarity index 100%
rename from src/libstore/unix/build/hook-instance.cc
rename to subprojects/libstore/unix/build/hook-instance.cc
diff --git a/src/libstore/unix/build/hook-instance.hh b/subprojects/libstore/unix/build/hook-instance.hh
similarity index 100%
rename from src/libstore/unix/build/hook-instance.hh
rename to subprojects/libstore/unix/build/hook-instance.hh
diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/subprojects/libstore/unix/build/local-derivation-goal.cc
similarity index 100%
rename from src/libstore/unix/build/local-derivation-goal.cc
rename to subprojects/libstore/unix/build/local-derivation-goal.cc
diff --git a/src/libstore/unix/build/local-derivation-goal.hh b/subprojects/libstore/unix/build/local-derivation-goal.hh
similarity index 100%
rename from src/libstore/unix/build/local-derivation-goal.hh
rename to subprojects/libstore/unix/build/local-derivation-goal.hh
diff --git a/src/libstore/unix/build/sandbox-defaults.sb b/subprojects/libstore/unix/build/sandbox-defaults.sb
similarity index 100%
rename from src/libstore/unix/build/sandbox-defaults.sb
rename to subprojects/libstore/unix/build/sandbox-defaults.sb
diff --git a/src/libstore/unix/build/sandbox-minimal.sb b/subprojects/libstore/unix/build/sandbox-minimal.sb
similarity index 100%
rename from src/libstore/unix/build/sandbox-minimal.sb
rename to subprojects/libstore/unix/build/sandbox-minimal.sb
diff --git a/src/libstore/unix/build/sandbox-network.sb b/subprojects/libstore/unix/build/sandbox-network.sb
similarity index 100%
rename from src/libstore/unix/build/sandbox-network.sb
rename to subprojects/libstore/unix/build/sandbox-network.sb
diff --git a/src/libstore/unix/meson.build b/subprojects/libstore/unix/meson.build
similarity index 100%
rename from src/libstore/unix/meson.build
rename to subprojects/libstore/unix/meson.build
diff --git a/src/libstore/unix/pathlocks.cc b/subprojects/libstore/unix/pathlocks.cc
similarity index 100%
rename from src/libstore/unix/pathlocks.cc
rename to subprojects/libstore/unix/pathlocks.cc
diff --git a/src/libstore/unix/user-lock.cc b/subprojects/libstore/unix/user-lock.cc
similarity index 100%
rename from src/libstore/unix/user-lock.cc
rename to subprojects/libstore/unix/user-lock.cc
diff --git a/src/libstore/unix/user-lock.hh b/subprojects/libstore/unix/user-lock.hh
similarity index 100%
rename from src/libstore/unix/user-lock.hh
rename to subprojects/libstore/unix/user-lock.hh
diff --git a/src/libstore/windows/meson.build b/subprojects/libstore/windows/meson.build
similarity index 100%
rename from src/libstore/windows/meson.build
rename to subprojects/libstore/windows/meson.build
diff --git a/src/libstore/windows/pathlocks.cc b/subprojects/libstore/windows/pathlocks.cc
similarity index 100%
rename from src/libstore/windows/pathlocks.cc
rename to subprojects/libstore/windows/pathlocks.cc
diff --git a/src/libstore/worker-protocol-connection.cc b/subprojects/libstore/worker-protocol-connection.cc
similarity index 100%
rename from src/libstore/worker-protocol-connection.cc
rename to subprojects/libstore/worker-protocol-connection.cc
diff --git a/src/libstore/worker-protocol-connection.hh b/subprojects/libstore/worker-protocol-connection.hh
similarity index 100%
rename from src/libstore/worker-protocol-connection.hh
rename to subprojects/libstore/worker-protocol-connection.hh
diff --git a/src/libstore/worker-protocol-impl.hh b/subprojects/libstore/worker-protocol-impl.hh
similarity index 100%
rename from src/libstore/worker-protocol-impl.hh
rename to subprojects/libstore/worker-protocol-impl.hh
diff --git a/src/libstore/worker-protocol.cc b/subprojects/libstore/worker-protocol.cc
similarity index 100%
rename from src/libstore/worker-protocol.cc
rename to subprojects/libstore/worker-protocol.cc
diff --git a/src/libstore/worker-protocol.hh b/subprojects/libstore/worker-protocol.hh
similarity index 100%
rename from src/libstore/worker-protocol.hh
rename to subprojects/libstore/worker-protocol.hh
diff --git a/src/libutil-c/.version b/subprojects/libutil-c/.version
similarity index 100%
rename from src/libutil-c/.version
rename to subprojects/libutil-c/.version
diff --git a/src/libutil-c/build-utils-meson b/subprojects/libutil-c/build-utils-meson
similarity index 100%
rename from src/libutil-c/build-utils-meson
rename to subprojects/libutil-c/build-utils-meson
diff --git a/src/libutil-c/local.mk b/subprojects/libutil-c/local.mk
similarity index 100%
rename from src/libutil-c/local.mk
rename to subprojects/libutil-c/local.mk
diff --git a/src/libutil-c/meson.build b/subprojects/libutil-c/meson.build
similarity index 100%
rename from src/libutil-c/meson.build
rename to subprojects/libutil-c/meson.build
diff --git a/src/libutil-c/meson.options b/subprojects/libutil-c/meson.options
similarity index 100%
rename from src/libutil-c/meson.options
rename to subprojects/libutil-c/meson.options
diff --git a/src/libutil-c/nix-util-c.pc.in b/subprojects/libutil-c/nix-util-c.pc.in
similarity index 100%
rename from src/libutil-c/nix-util-c.pc.in
rename to subprojects/libutil-c/nix-util-c.pc.in
diff --git a/src/libutil-c/nix_api_util.cc b/subprojects/libutil-c/nix_api_util.cc
similarity index 100%
rename from src/libutil-c/nix_api_util.cc
rename to subprojects/libutil-c/nix_api_util.cc
diff --git a/src/libutil-c/nix_api_util.h b/subprojects/libutil-c/nix_api_util.h
similarity index 100%
rename from src/libutil-c/nix_api_util.h
rename to subprojects/libutil-c/nix_api_util.h
diff --git a/src/libutil-c/nix_api_util_internal.h b/subprojects/libutil-c/nix_api_util_internal.h
similarity index 100%
rename from src/libutil-c/nix_api_util_internal.h
rename to subprojects/libutil-c/nix_api_util_internal.h
diff --git a/src/libutil-c/package.nix b/subprojects/libutil-c/package.nix
similarity index 100%
rename from src/libutil-c/package.nix
rename to subprojects/libutil-c/package.nix
diff --git a/src/libutil/.version b/subprojects/libutil/.version
similarity index 100%
rename from src/libutil/.version
rename to subprojects/libutil/.version
diff --git a/src/libutil/abstract-setting-to-json.hh b/subprojects/libutil/abstract-setting-to-json.hh
similarity index 100%
rename from src/libutil/abstract-setting-to-json.hh
rename to subprojects/libutil/abstract-setting-to-json.hh
diff --git a/src/libutil/ansicolor.hh b/subprojects/libutil/ansicolor.hh
similarity index 100%
rename from src/libutil/ansicolor.hh
rename to subprojects/libutil/ansicolor.hh
diff --git a/src/libutil/archive.cc b/subprojects/libutil/archive.cc
similarity index 100%
rename from src/libutil/archive.cc
rename to subprojects/libutil/archive.cc
diff --git a/src/libutil/archive.hh b/subprojects/libutil/archive.hh
similarity index 100%
rename from src/libutil/archive.hh
rename to subprojects/libutil/archive.hh
diff --git a/src/libutil/args.cc b/subprojects/libutil/args.cc
similarity index 100%
rename from src/libutil/args.cc
rename to subprojects/libutil/args.cc
diff --git a/src/libutil/args.hh b/subprojects/libutil/args.hh
similarity index 100%
rename from src/libutil/args.hh
rename to subprojects/libutil/args.hh
diff --git a/src/libutil/args/root.hh b/subprojects/libutil/args/root.hh
similarity index 100%
rename from src/libutil/args/root.hh
rename to subprojects/libutil/args/root.hh
diff --git a/src/libutil/build-utils-meson b/subprojects/libutil/build-utils-meson
similarity index 100%
rename from src/libutil/build-utils-meson
rename to subprojects/libutil/build-utils-meson
diff --git a/src/libutil/callback.hh b/subprojects/libutil/callback.hh
similarity index 100%
rename from src/libutil/callback.hh
rename to subprojects/libutil/callback.hh
diff --git a/src/libutil/canon-path.cc b/subprojects/libutil/canon-path.cc
similarity index 100%
rename from src/libutil/canon-path.cc
rename to subprojects/libutil/canon-path.cc
diff --git a/src/libutil/canon-path.hh b/subprojects/libutil/canon-path.hh
similarity index 100%
rename from src/libutil/canon-path.hh
rename to subprojects/libutil/canon-path.hh
diff --git a/src/libutil/checked-arithmetic.hh b/subprojects/libutil/checked-arithmetic.hh
similarity index 100%
rename from src/libutil/checked-arithmetic.hh
rename to subprojects/libutil/checked-arithmetic.hh
diff --git a/src/libutil/chunked-vector.hh b/subprojects/libutil/chunked-vector.hh
similarity index 100%
rename from src/libutil/chunked-vector.hh
rename to subprojects/libutil/chunked-vector.hh
diff --git a/src/libutil/closure.hh b/subprojects/libutil/closure.hh
similarity index 100%
rename from src/libutil/closure.hh
rename to subprojects/libutil/closure.hh
diff --git a/src/libutil/comparator.hh b/subprojects/libutil/comparator.hh
similarity index 100%
rename from src/libutil/comparator.hh
rename to subprojects/libutil/comparator.hh
diff --git a/src/libutil/compression.cc b/subprojects/libutil/compression.cc
similarity index 100%
rename from src/libutil/compression.cc
rename to subprojects/libutil/compression.cc
diff --git a/src/libutil/compression.hh b/subprojects/libutil/compression.hh
similarity index 100%
rename from src/libutil/compression.hh
rename to subprojects/libutil/compression.hh
diff --git a/src/libutil/compute-levels.cc b/subprojects/libutil/compute-levels.cc
similarity index 100%
rename from src/libutil/compute-levels.cc
rename to subprojects/libutil/compute-levels.cc
diff --git a/src/libutil/compute-levels.hh b/subprojects/libutil/compute-levels.hh
similarity index 100%
rename from src/libutil/compute-levels.hh
rename to subprojects/libutil/compute-levels.hh
diff --git a/src/libutil/config-global.cc b/subprojects/libutil/config-global.cc
similarity index 100%
rename from src/libutil/config-global.cc
rename to subprojects/libutil/config-global.cc
diff --git a/src/libutil/config-global.hh b/subprojects/libutil/config-global.hh
similarity index 100%
rename from src/libutil/config-global.hh
rename to subprojects/libutil/config-global.hh
diff --git a/src/libutil/config-impl.hh b/subprojects/libutil/config-impl.hh
similarity index 100%
rename from src/libutil/config-impl.hh
rename to subprojects/libutil/config-impl.hh
diff --git a/src/libutil/config.cc b/subprojects/libutil/config.cc
similarity index 100%
rename from src/libutil/config.cc
rename to subprojects/libutil/config.cc
diff --git a/src/libutil/config.hh b/subprojects/libutil/config.hh
similarity index 100%
rename from src/libutil/config.hh
rename to subprojects/libutil/config.hh
diff --git a/src/libutil/current-process.cc b/subprojects/libutil/current-process.cc
similarity index 100%
rename from src/libutil/current-process.cc
rename to subprojects/libutil/current-process.cc
diff --git a/src/libutil/current-process.hh b/subprojects/libutil/current-process.hh
similarity index 100%
rename from src/libutil/current-process.hh
rename to subprojects/libutil/current-process.hh
diff --git a/src/libutil/english.cc b/subprojects/libutil/english.cc
similarity index 100%
rename from src/libutil/english.cc
rename to subprojects/libutil/english.cc
diff --git a/src/libutil/english.hh b/subprojects/libutil/english.hh
similarity index 100%
rename from src/libutil/english.hh
rename to subprojects/libutil/english.hh
diff --git a/src/libutil/environment-variables.cc b/subprojects/libutil/environment-variables.cc
similarity index 100%
rename from src/libutil/environment-variables.cc
rename to subprojects/libutil/environment-variables.cc
diff --git a/src/libutil/environment-variables.hh b/subprojects/libutil/environment-variables.hh
similarity index 100%
rename from src/libutil/environment-variables.hh
rename to subprojects/libutil/environment-variables.hh
diff --git a/src/libutil/error.cc b/subprojects/libutil/error.cc
similarity index 100%
rename from src/libutil/error.cc
rename to subprojects/libutil/error.cc
diff --git a/src/libutil/error.hh b/subprojects/libutil/error.hh
similarity index 100%
rename from src/libutil/error.hh
rename to subprojects/libutil/error.hh
diff --git a/src/libutil/exec.hh b/subprojects/libutil/exec.hh
similarity index 100%
rename from src/libutil/exec.hh
rename to subprojects/libutil/exec.hh
diff --git a/src/libutil/executable-path.cc b/subprojects/libutil/executable-path.cc
similarity index 100%
rename from src/libutil/executable-path.cc
rename to subprojects/libutil/executable-path.cc
diff --git a/src/libutil/executable-path.hh b/subprojects/libutil/executable-path.hh
similarity index 100%
rename from src/libutil/executable-path.hh
rename to subprojects/libutil/executable-path.hh
diff --git a/src/libutil/exit.cc b/subprojects/libutil/exit.cc
similarity index 100%
rename from src/libutil/exit.cc
rename to subprojects/libutil/exit.cc
diff --git a/src/libutil/exit.hh b/subprojects/libutil/exit.hh
similarity index 100%
rename from src/libutil/exit.hh
rename to subprojects/libutil/exit.hh
diff --git a/src/libutil/experimental-features.cc b/subprojects/libutil/experimental-features.cc
similarity index 100%
rename from src/libutil/experimental-features.cc
rename to subprojects/libutil/experimental-features.cc
diff --git a/src/libutil/experimental-features.hh b/subprojects/libutil/experimental-features.hh
similarity index 100%
rename from src/libutil/experimental-features.hh
rename to subprojects/libutil/experimental-features.hh
diff --git a/src/libutil/file-content-address.cc b/subprojects/libutil/file-content-address.cc
similarity index 100%
rename from src/libutil/file-content-address.cc
rename to subprojects/libutil/file-content-address.cc
diff --git a/src/libutil/file-content-address.hh b/subprojects/libutil/file-content-address.hh
similarity index 100%
rename from src/libutil/file-content-address.hh
rename to subprojects/libutil/file-content-address.hh
diff --git a/src/libutil/file-descriptor.cc b/subprojects/libutil/file-descriptor.cc
similarity index 100%
rename from src/libutil/file-descriptor.cc
rename to subprojects/libutil/file-descriptor.cc
diff --git a/src/libutil/file-descriptor.hh b/subprojects/libutil/file-descriptor.hh
similarity index 100%
rename from src/libutil/file-descriptor.hh
rename to subprojects/libutil/file-descriptor.hh
diff --git a/src/libutil/file-path-impl.hh b/subprojects/libutil/file-path-impl.hh
similarity index 100%
rename from src/libutil/file-path-impl.hh
rename to subprojects/libutil/file-path-impl.hh
diff --git a/src/libutil/file-path.hh b/subprojects/libutil/file-path.hh
similarity index 100%
rename from src/libutil/file-path.hh
rename to subprojects/libutil/file-path.hh
diff --git a/src/libutil/file-system.cc b/subprojects/libutil/file-system.cc
similarity index 100%
rename from src/libutil/file-system.cc
rename to subprojects/libutil/file-system.cc
diff --git a/src/libutil/file-system.hh b/subprojects/libutil/file-system.hh
similarity index 100%
rename from src/libutil/file-system.hh
rename to subprojects/libutil/file-system.hh
diff --git a/src/libutil/finally.hh b/subprojects/libutil/finally.hh
similarity index 100%
rename from src/libutil/finally.hh
rename to subprojects/libutil/finally.hh
diff --git a/src/libutil/fmt.hh b/subprojects/libutil/fmt.hh
similarity index 100%
rename from src/libutil/fmt.hh
rename to subprojects/libutil/fmt.hh
diff --git a/src/libutil/fs-sink.cc b/subprojects/libutil/fs-sink.cc
similarity index 100%
rename from src/libutil/fs-sink.cc
rename to subprojects/libutil/fs-sink.cc
diff --git a/src/libutil/fs-sink.hh b/subprojects/libutil/fs-sink.hh
similarity index 100%
rename from src/libutil/fs-sink.hh
rename to subprojects/libutil/fs-sink.hh
diff --git a/src/libutil/git.cc b/subprojects/libutil/git.cc
similarity index 100%
rename from src/libutil/git.cc
rename to subprojects/libutil/git.cc
diff --git a/src/libutil/git.hh b/subprojects/libutil/git.hh
similarity index 100%
rename from src/libutil/git.hh
rename to subprojects/libutil/git.hh
diff --git a/src/libutil/hash.cc b/subprojects/libutil/hash.cc
similarity index 100%
rename from src/libutil/hash.cc
rename to subprojects/libutil/hash.cc
diff --git a/src/libutil/hash.hh b/subprojects/libutil/hash.hh
similarity index 100%
rename from src/libutil/hash.hh
rename to subprojects/libutil/hash.hh
diff --git a/src/libutil/hilite.cc b/subprojects/libutil/hilite.cc
similarity index 100%
rename from src/libutil/hilite.cc
rename to subprojects/libutil/hilite.cc
diff --git a/src/libutil/hilite.hh b/subprojects/libutil/hilite.hh
similarity index 100%
rename from src/libutil/hilite.hh
rename to subprojects/libutil/hilite.hh
diff --git a/src/libutil/json-impls.hh b/subprojects/libutil/json-impls.hh
similarity index 100%
rename from src/libutil/json-impls.hh
rename to subprojects/libutil/json-impls.hh
diff --git a/src/libutil/json-utils.cc b/subprojects/libutil/json-utils.cc
similarity index 100%
rename from src/libutil/json-utils.cc
rename to subprojects/libutil/json-utils.cc
diff --git a/src/libutil/json-utils.hh b/subprojects/libutil/json-utils.hh
similarity index 100%
rename from src/libutil/json-utils.hh
rename to subprojects/libutil/json-utils.hh
diff --git a/src/libutil/linux/cgroup.cc b/subprojects/libutil/linux/cgroup.cc
similarity index 100%
rename from src/libutil/linux/cgroup.cc
rename to subprojects/libutil/linux/cgroup.cc
diff --git a/src/libutil/linux/cgroup.hh b/subprojects/libutil/linux/cgroup.hh
similarity index 100%
rename from src/libutil/linux/cgroup.hh
rename to subprojects/libutil/linux/cgroup.hh
diff --git a/src/libutil/linux/meson.build b/subprojects/libutil/linux/meson.build
similarity index 100%
rename from src/libutil/linux/meson.build
rename to subprojects/libutil/linux/meson.build
diff --git a/src/libutil/linux/namespaces.cc b/subprojects/libutil/linux/namespaces.cc
similarity index 100%
rename from src/libutil/linux/namespaces.cc
rename to subprojects/libutil/linux/namespaces.cc
diff --git a/src/libutil/linux/namespaces.hh b/subprojects/libutil/linux/namespaces.hh
similarity index 100%
rename from src/libutil/linux/namespaces.hh
rename to subprojects/libutil/linux/namespaces.hh
diff --git a/src/libutil/local.mk b/subprojects/libutil/local.mk
similarity index 100%
rename from src/libutil/local.mk
rename to subprojects/libutil/local.mk
diff --git a/src/libutil/logging.cc b/subprojects/libutil/logging.cc
similarity index 100%
rename from src/libutil/logging.cc
rename to subprojects/libutil/logging.cc
diff --git a/src/libutil/logging.hh b/subprojects/libutil/logging.hh
similarity index 100%
rename from src/libutil/logging.hh
rename to subprojects/libutil/logging.hh
diff --git a/src/libutil/lru-cache.hh b/subprojects/libutil/lru-cache.hh
similarity index 100%
rename from src/libutil/lru-cache.hh
rename to subprojects/libutil/lru-cache.hh
diff --git a/src/libutil/memory-source-accessor.cc b/subprojects/libutil/memory-source-accessor.cc
similarity index 100%
rename from src/libutil/memory-source-accessor.cc
rename to subprojects/libutil/memory-source-accessor.cc
diff --git a/src/libutil/memory-source-accessor.hh b/subprojects/libutil/memory-source-accessor.hh
similarity index 100%
rename from src/libutil/memory-source-accessor.hh
rename to subprojects/libutil/memory-source-accessor.hh
diff --git a/src/libutil/meson.build b/subprojects/libutil/meson.build
similarity index 100%
rename from src/libutil/meson.build
rename to subprojects/libutil/meson.build
diff --git a/src/libutil/meson.options b/subprojects/libutil/meson.options
similarity index 100%
rename from src/libutil/meson.options
rename to subprojects/libutil/meson.options
diff --git a/src/libutil/muxable-pipe.hh b/subprojects/libutil/muxable-pipe.hh
similarity index 100%
rename from src/libutil/muxable-pipe.hh
rename to subprojects/libutil/muxable-pipe.hh
diff --git a/src/libutil/nix-util.pc.in b/subprojects/libutil/nix-util.pc.in
similarity index 100%
rename from src/libutil/nix-util.pc.in
rename to subprojects/libutil/nix-util.pc.in
diff --git a/src/libutil/os-string.hh b/subprojects/libutil/os-string.hh
similarity index 100%
rename from src/libutil/os-string.hh
rename to subprojects/libutil/os-string.hh
diff --git a/src/libutil/package.nix b/subprojects/libutil/package.nix
similarity index 100%
rename from src/libutil/package.nix
rename to subprojects/libutil/package.nix
diff --git a/src/libutil/pool.hh b/subprojects/libutil/pool.hh
similarity index 100%
rename from src/libutil/pool.hh
rename to subprojects/libutil/pool.hh
diff --git a/src/libutil/position.cc b/subprojects/libutil/position.cc
similarity index 100%
rename from src/libutil/position.cc
rename to subprojects/libutil/position.cc
diff --git a/src/libutil/position.hh b/subprojects/libutil/position.hh
similarity index 100%
rename from src/libutil/position.hh
rename to subprojects/libutil/position.hh
diff --git a/src/libutil/posix-source-accessor.cc b/subprojects/libutil/posix-source-accessor.cc
similarity index 100%
rename from src/libutil/posix-source-accessor.cc
rename to subprojects/libutil/posix-source-accessor.cc
diff --git a/src/libutil/posix-source-accessor.hh b/subprojects/libutil/posix-source-accessor.hh
similarity index 100%
rename from src/libutil/posix-source-accessor.hh
rename to subprojects/libutil/posix-source-accessor.hh
diff --git a/src/libutil/processes.hh b/subprojects/libutil/processes.hh
similarity index 100%
rename from src/libutil/processes.hh
rename to subprojects/libutil/processes.hh
diff --git a/src/libutil/ref.hh b/subprojects/libutil/ref.hh
similarity index 100%
rename from src/libutil/ref.hh
rename to subprojects/libutil/ref.hh
diff --git a/src/libutil/references.cc b/subprojects/libutil/references.cc
similarity index 100%
rename from src/libutil/references.cc
rename to subprojects/libutil/references.cc
diff --git a/src/libutil/references.hh b/subprojects/libutil/references.hh
similarity index 100%
rename from src/libutil/references.hh
rename to subprojects/libutil/references.hh
diff --git a/src/libutil/regex-combinators.hh b/subprojects/libutil/regex-combinators.hh
similarity index 100%
rename from src/libutil/regex-combinators.hh
rename to subprojects/libutil/regex-combinators.hh
diff --git a/src/libutil/repair-flag.hh b/subprojects/libutil/repair-flag.hh
similarity index 100%
rename from src/libutil/repair-flag.hh
rename to subprojects/libutil/repair-flag.hh
diff --git a/src/libutil/serialise.cc b/subprojects/libutil/serialise.cc
similarity index 100%
rename from src/libutil/serialise.cc
rename to subprojects/libutil/serialise.cc
diff --git a/src/libutil/serialise.hh b/subprojects/libutil/serialise.hh
similarity index 100%
rename from src/libutil/serialise.hh
rename to subprojects/libutil/serialise.hh
diff --git a/src/libutil/signals.hh b/subprojects/libutil/signals.hh
similarity index 100%
rename from src/libutil/signals.hh
rename to subprojects/libutil/signals.hh
diff --git a/src/libutil/signature/local-keys.cc b/subprojects/libutil/signature/local-keys.cc
similarity index 100%
rename from src/libutil/signature/local-keys.cc
rename to subprojects/libutil/signature/local-keys.cc
diff --git a/src/libutil/signature/local-keys.hh b/subprojects/libutil/signature/local-keys.hh
similarity index 100%
rename from src/libutil/signature/local-keys.hh
rename to subprojects/libutil/signature/local-keys.hh
diff --git a/src/libutil/signature/signer.cc b/subprojects/libutil/signature/signer.cc
similarity index 100%
rename from src/libutil/signature/signer.cc
rename to subprojects/libutil/signature/signer.cc
diff --git a/src/libutil/signature/signer.hh b/subprojects/libutil/signature/signer.hh
similarity index 100%
rename from src/libutil/signature/signer.hh
rename to subprojects/libutil/signature/signer.hh
diff --git a/src/libutil/source-accessor.cc b/subprojects/libutil/source-accessor.cc
similarity index 100%
rename from src/libutil/source-accessor.cc
rename to subprojects/libutil/source-accessor.cc
diff --git a/src/libutil/source-accessor.hh b/subprojects/libutil/source-accessor.hh
similarity index 100%
rename from src/libutil/source-accessor.hh
rename to subprojects/libutil/source-accessor.hh
diff --git a/src/libutil/source-path.cc b/subprojects/libutil/source-path.cc
similarity index 100%
rename from src/libutil/source-path.cc
rename to subprojects/libutil/source-path.cc
diff --git a/src/libutil/source-path.hh b/subprojects/libutil/source-path.hh
similarity index 100%
rename from src/libutil/source-path.hh
rename to subprojects/libutil/source-path.hh
diff --git a/src/libutil/split.hh b/subprojects/libutil/split.hh
similarity index 100%
rename from src/libutil/split.hh
rename to subprojects/libutil/split.hh
diff --git a/src/libutil/std-hash.hh b/subprojects/libutil/std-hash.hh
similarity index 100%
rename from src/libutil/std-hash.hh
rename to subprojects/libutil/std-hash.hh
diff --git a/src/libutil/strings-inline.hh b/subprojects/libutil/strings-inline.hh
similarity index 100%
rename from src/libutil/strings-inline.hh
rename to subprojects/libutil/strings-inline.hh
diff --git a/src/libutil/strings.cc b/subprojects/libutil/strings.cc
similarity index 100%
rename from src/libutil/strings.cc
rename to subprojects/libutil/strings.cc
diff --git a/src/libutil/strings.hh b/subprojects/libutil/strings.hh
similarity index 100%
rename from src/libutil/strings.hh
rename to subprojects/libutil/strings.hh
diff --git a/src/libutil/suggestions.cc b/subprojects/libutil/suggestions.cc
similarity index 100%
rename from src/libutil/suggestions.cc
rename to subprojects/libutil/suggestions.cc
diff --git a/src/libutil/suggestions.hh b/subprojects/libutil/suggestions.hh
similarity index 100%
rename from src/libutil/suggestions.hh
rename to subprojects/libutil/suggestions.hh
diff --git a/src/libutil/sync.hh b/subprojects/libutil/sync.hh
similarity index 100%
rename from src/libutil/sync.hh
rename to subprojects/libutil/sync.hh
diff --git a/src/libutil/tarfile.cc b/subprojects/libutil/tarfile.cc
similarity index 100%
rename from src/libutil/tarfile.cc
rename to subprojects/libutil/tarfile.cc
diff --git a/src/libutil/tarfile.hh b/subprojects/libutil/tarfile.hh
similarity index 100%
rename from src/libutil/tarfile.hh
rename to subprojects/libutil/tarfile.hh
diff --git a/src/libutil/terminal.cc b/subprojects/libutil/terminal.cc
similarity index 100%
rename from src/libutil/terminal.cc
rename to subprojects/libutil/terminal.cc
diff --git a/src/libutil/terminal.hh b/subprojects/libutil/terminal.hh
similarity index 100%
rename from src/libutil/terminal.hh
rename to subprojects/libutil/terminal.hh
diff --git a/src/libutil/thread-pool.cc b/subprojects/libutil/thread-pool.cc
similarity index 100%
rename from src/libutil/thread-pool.cc
rename to subprojects/libutil/thread-pool.cc
diff --git a/src/libutil/thread-pool.hh b/subprojects/libutil/thread-pool.hh
similarity index 100%
rename from src/libutil/thread-pool.hh
rename to subprojects/libutil/thread-pool.hh
diff --git a/src/libutil/topo-sort.hh b/subprojects/libutil/topo-sort.hh
similarity index 100%
rename from src/libutil/topo-sort.hh
rename to subprojects/libutil/topo-sort.hh
diff --git a/src/libutil/types.hh b/subprojects/libutil/types.hh
similarity index 100%
rename from src/libutil/types.hh
rename to subprojects/libutil/types.hh
diff --git a/src/libutil/unix-domain-socket.cc b/subprojects/libutil/unix-domain-socket.cc
similarity index 100%
rename from src/libutil/unix-domain-socket.cc
rename to subprojects/libutil/unix-domain-socket.cc
diff --git a/src/libutil/unix-domain-socket.hh b/subprojects/libutil/unix-domain-socket.hh
similarity index 100%
rename from src/libutil/unix-domain-socket.hh
rename to subprojects/libutil/unix-domain-socket.hh
diff --git a/src/libutil/unix/environment-variables.cc b/subprojects/libutil/unix/environment-variables.cc
similarity index 100%
rename from src/libutil/unix/environment-variables.cc
rename to subprojects/libutil/unix/environment-variables.cc
diff --git a/src/libutil/unix/file-descriptor.cc b/subprojects/libutil/unix/file-descriptor.cc
similarity index 100%
rename from src/libutil/unix/file-descriptor.cc
rename to subprojects/libutil/unix/file-descriptor.cc
diff --git a/src/libutil/unix/file-path.cc b/subprojects/libutil/unix/file-path.cc
similarity index 100%
rename from src/libutil/unix/file-path.cc
rename to subprojects/libutil/unix/file-path.cc
diff --git a/src/libutil/unix/file-system.cc b/subprojects/libutil/unix/file-system.cc
similarity index 100%
rename from src/libutil/unix/file-system.cc
rename to subprojects/libutil/unix/file-system.cc
diff --git a/src/libutil/unix/meson.build b/subprojects/libutil/unix/meson.build
similarity index 100%
rename from src/libutil/unix/meson.build
rename to subprojects/libutil/unix/meson.build
diff --git a/src/libutil/unix/monitor-fd.hh b/subprojects/libutil/unix/monitor-fd.hh
similarity index 100%
rename from src/libutil/unix/monitor-fd.hh
rename to subprojects/libutil/unix/monitor-fd.hh
diff --git a/src/libutil/unix/muxable-pipe.cc b/subprojects/libutil/unix/muxable-pipe.cc
similarity index 100%
rename from src/libutil/unix/muxable-pipe.cc
rename to subprojects/libutil/unix/muxable-pipe.cc
diff --git a/src/libutil/unix/os-string.cc b/subprojects/libutil/unix/os-string.cc
similarity index 100%
rename from src/libutil/unix/os-string.cc
rename to subprojects/libutil/unix/os-string.cc
diff --git a/src/libutil/unix/processes.cc b/subprojects/libutil/unix/processes.cc
similarity index 100%
rename from src/libutil/unix/processes.cc
rename to subprojects/libutil/unix/processes.cc
diff --git a/src/libutil/unix/signals-impl.hh b/subprojects/libutil/unix/signals-impl.hh
similarity index 100%
rename from src/libutil/unix/signals-impl.hh
rename to subprojects/libutil/unix/signals-impl.hh
diff --git a/src/libutil/unix/signals.cc b/subprojects/libutil/unix/signals.cc
similarity index 100%
rename from src/libutil/unix/signals.cc
rename to subprojects/libutil/unix/signals.cc
diff --git a/src/libutil/unix/users.cc b/subprojects/libutil/unix/users.cc
similarity index 100%
rename from src/libutil/unix/users.cc
rename to subprojects/libutil/unix/users.cc
diff --git a/src/libutil/url-parts.hh b/subprojects/libutil/url-parts.hh
similarity index 100%
rename from src/libutil/url-parts.hh
rename to subprojects/libutil/url-parts.hh
diff --git a/src/libutil/url.cc b/subprojects/libutil/url.cc
similarity index 100%
rename from src/libutil/url.cc
rename to subprojects/libutil/url.cc
diff --git a/src/libutil/url.hh b/subprojects/libutil/url.hh
similarity index 100%
rename from src/libutil/url.hh
rename to subprojects/libutil/url.hh
diff --git a/src/libutil/users.cc b/subprojects/libutil/users.cc
similarity index 100%
rename from src/libutil/users.cc
rename to subprojects/libutil/users.cc
diff --git a/src/libutil/users.hh b/subprojects/libutil/users.hh
similarity index 100%
rename from src/libutil/users.hh
rename to subprojects/libutil/users.hh
diff --git a/src/libutil/util.cc b/subprojects/libutil/util.cc
similarity index 100%
rename from src/libutil/util.cc
rename to subprojects/libutil/util.cc
diff --git a/src/libutil/util.hh b/subprojects/libutil/util.hh
similarity index 100%
rename from src/libutil/util.hh
rename to subprojects/libutil/util.hh
diff --git a/src/libutil/variant-wrapper.hh b/subprojects/libutil/variant-wrapper.hh
similarity index 100%
rename from src/libutil/variant-wrapper.hh
rename to subprojects/libutil/variant-wrapper.hh
diff --git a/src/libutil/windows/environment-variables.cc b/subprojects/libutil/windows/environment-variables.cc
similarity index 100%
rename from src/libutil/windows/environment-variables.cc
rename to subprojects/libutil/windows/environment-variables.cc
diff --git a/src/libutil/windows/file-descriptor.cc b/subprojects/libutil/windows/file-descriptor.cc
similarity index 100%
rename from src/libutil/windows/file-descriptor.cc
rename to subprojects/libutil/windows/file-descriptor.cc
diff --git a/src/libutil/windows/file-path.cc b/subprojects/libutil/windows/file-path.cc
similarity index 100%
rename from src/libutil/windows/file-path.cc
rename to subprojects/libutil/windows/file-path.cc
diff --git a/src/libutil/windows/file-system.cc b/subprojects/libutil/windows/file-system.cc
similarity index 100%
rename from src/libutil/windows/file-system.cc
rename to subprojects/libutil/windows/file-system.cc
diff --git a/src/libutil/windows/meson.build b/subprojects/libutil/windows/meson.build
similarity index 100%
rename from src/libutil/windows/meson.build
rename to subprojects/libutil/windows/meson.build
diff --git a/src/libutil/windows/muxable-pipe.cc b/subprojects/libutil/windows/muxable-pipe.cc
similarity index 100%
rename from src/libutil/windows/muxable-pipe.cc
rename to subprojects/libutil/windows/muxable-pipe.cc
diff --git a/src/libutil/windows/os-string.cc b/subprojects/libutil/windows/os-string.cc
similarity index 100%
rename from src/libutil/windows/os-string.cc
rename to subprojects/libutil/windows/os-string.cc
diff --git a/src/libutil/windows/processes.cc b/subprojects/libutil/windows/processes.cc
similarity index 100%
rename from src/libutil/windows/processes.cc
rename to subprojects/libutil/windows/processes.cc
diff --git a/src/libutil/windows/signals-impl.hh b/subprojects/libutil/windows/signals-impl.hh
similarity index 100%
rename from src/libutil/windows/signals-impl.hh
rename to subprojects/libutil/windows/signals-impl.hh
diff --git a/src/libutil/windows/users.cc b/subprojects/libutil/windows/users.cc
similarity index 100%
rename from src/libutil/windows/users.cc
rename to subprojects/libutil/windows/users.cc
diff --git a/src/libutil/windows/windows-async-pipe.cc b/subprojects/libutil/windows/windows-async-pipe.cc
similarity index 100%
rename from src/libutil/windows/windows-async-pipe.cc
rename to subprojects/libutil/windows/windows-async-pipe.cc
diff --git a/src/libutil/windows/windows-async-pipe.hh b/subprojects/libutil/windows/windows-async-pipe.hh
similarity index 100%
rename from src/libutil/windows/windows-async-pipe.hh
rename to subprojects/libutil/windows/windows-async-pipe.hh
diff --git a/src/libutil/windows/windows-error.cc b/subprojects/libutil/windows/windows-error.cc
similarity index 100%
rename from src/libutil/windows/windows-error.cc
rename to subprojects/libutil/windows/windows-error.cc
diff --git a/src/libutil/windows/windows-error.hh b/subprojects/libutil/windows/windows-error.hh
similarity index 100%
rename from src/libutil/windows/windows-error.hh
rename to subprojects/libutil/windows/windows-error.hh
diff --git a/src/libutil/xml-writer.cc b/subprojects/libutil/xml-writer.cc
similarity index 100%
rename from src/libutil/xml-writer.cc
rename to subprojects/libutil/xml-writer.cc
diff --git a/src/libutil/xml-writer.hh b/subprojects/libutil/xml-writer.hh
similarity index 100%
rename from src/libutil/xml-writer.hh
rename to subprojects/libutil/xml-writer.hh
diff --git a/src/nix-build/nix-build.cc b/subprojects/nix-build/nix-build.cc
similarity index 100%
rename from src/nix-build/nix-build.cc
rename to subprojects/nix-build/nix-build.cc
diff --git a/src/nix-channel/nix-channel.cc b/subprojects/nix-channel/nix-channel.cc
similarity index 100%
rename from src/nix-channel/nix-channel.cc
rename to subprojects/nix-channel/nix-channel.cc
diff --git a/src/nix-channel/unpack-channel.nix b/subprojects/nix-channel/unpack-channel.nix
similarity index 100%
rename from src/nix-channel/unpack-channel.nix
rename to subprojects/nix-channel/unpack-channel.nix
diff --git a/src/nix-collect-garbage/nix-collect-garbage.cc b/subprojects/nix-collect-garbage/nix-collect-garbage.cc
similarity index 100%
rename from src/nix-collect-garbage/nix-collect-garbage.cc
rename to subprojects/nix-collect-garbage/nix-collect-garbage.cc
diff --git a/src/nix-copy-closure/nix-copy-closure.cc b/subprojects/nix-copy-closure/nix-copy-closure.cc
similarity index 100%
rename from src/nix-copy-closure/nix-copy-closure.cc
rename to subprojects/nix-copy-closure/nix-copy-closure.cc
diff --git a/src/nix-env/buildenv.nix b/subprojects/nix-env/buildenv.nix
similarity index 100%
rename from src/nix-env/buildenv.nix
rename to subprojects/nix-env/buildenv.nix
diff --git a/src/nix-env/nix-env.cc b/subprojects/nix-env/nix-env.cc
similarity index 100%
rename from src/nix-env/nix-env.cc
rename to subprojects/nix-env/nix-env.cc
diff --git a/src/nix-env/user-env.cc b/subprojects/nix-env/user-env.cc
similarity index 100%
rename from src/nix-env/user-env.cc
rename to subprojects/nix-env/user-env.cc
diff --git a/src/nix-env/user-env.hh b/subprojects/nix-env/user-env.hh
similarity index 100%
rename from src/nix-env/user-env.hh
rename to subprojects/nix-env/user-env.hh
diff --git a/src/nix-expr-test-support b/subprojects/nix-expr-test-support
similarity index 100%
rename from src/nix-expr-test-support
rename to subprojects/nix-expr-test-support
diff --git a/src/nix-expr-tests b/subprojects/nix-expr-tests
similarity index 100%
rename from src/nix-expr-tests
rename to subprojects/nix-expr-tests
diff --git a/src/nix-fetchers-tests b/subprojects/nix-fetchers-tests
similarity index 100%
rename from src/nix-fetchers-tests
rename to subprojects/nix-fetchers-tests
diff --git a/src/nix-flake-tests b/subprojects/nix-flake-tests
similarity index 100%
rename from src/nix-flake-tests
rename to subprojects/nix-flake-tests
diff --git a/src/nix-functional-tests b/subprojects/nix-functional-tests
similarity index 100%
rename from src/nix-functional-tests
rename to subprojects/nix-functional-tests
diff --git a/src/nix-instantiate/nix-instantiate.cc b/subprojects/nix-instantiate/nix-instantiate.cc
similarity index 100%
rename from src/nix-instantiate/nix-instantiate.cc
rename to subprojects/nix-instantiate/nix-instantiate.cc
diff --git a/src/nix-manual b/subprojects/nix-manual
similarity index 100%
rename from src/nix-manual
rename to subprojects/nix-manual
diff --git a/src/nix-store-test-support b/subprojects/nix-store-test-support
similarity index 100%
rename from src/nix-store-test-support
rename to subprojects/nix-store-test-support
diff --git a/src/nix-store-tests b/subprojects/nix-store-tests
similarity index 100%
rename from src/nix-store-tests
rename to subprojects/nix-store-tests
diff --git a/src/nix-store/dotgraph.cc b/subprojects/nix-store/dotgraph.cc
similarity index 100%
rename from src/nix-store/dotgraph.cc
rename to subprojects/nix-store/dotgraph.cc
diff --git a/src/nix-store/dotgraph.hh b/subprojects/nix-store/dotgraph.hh
similarity index 100%
rename from src/nix-store/dotgraph.hh
rename to subprojects/nix-store/dotgraph.hh
diff --git a/src/nix-store/graphml.cc b/subprojects/nix-store/graphml.cc
similarity index 100%
rename from src/nix-store/graphml.cc
rename to subprojects/nix-store/graphml.cc
diff --git a/src/nix-store/graphml.hh b/subprojects/nix-store/graphml.hh
similarity index 100%
rename from src/nix-store/graphml.hh
rename to subprojects/nix-store/graphml.hh
diff --git a/src/nix-store/nix-store.cc b/subprojects/nix-store/nix-store.cc
similarity index 100%
rename from src/nix-store/nix-store.cc
rename to subprojects/nix-store/nix-store.cc
diff --git a/src/nix-util-test-support b/subprojects/nix-util-test-support
similarity index 100%
rename from src/nix-util-test-support
rename to subprojects/nix-util-test-support
diff --git a/src/nix-util-tests b/subprojects/nix-util-tests
similarity index 100%
rename from src/nix-util-tests
rename to subprojects/nix-util-tests
diff --git a/src/nix/.version b/subprojects/nix/.version
similarity index 100%
rename from src/nix/.version
rename to subprojects/nix/.version
diff --git a/src/nix/add-to-store.cc b/subprojects/nix/add-to-store.cc
similarity index 100%
rename from src/nix/add-to-store.cc
rename to subprojects/nix/add-to-store.cc
diff --git a/src/nix/add.md b/subprojects/nix/add.md
similarity index 100%
rename from src/nix/add.md
rename to subprojects/nix/add.md
diff --git a/src/nix/app.cc b/subprojects/nix/app.cc
similarity index 100%
rename from src/nix/app.cc
rename to subprojects/nix/app.cc
diff --git a/src/nix/build-remote b/subprojects/nix/build-remote
similarity index 100%
rename from src/nix/build-remote
rename to subprojects/nix/build-remote
diff --git a/src/nix/build-utils-meson b/subprojects/nix/build-utils-meson
similarity index 100%
rename from src/nix/build-utils-meson
rename to subprojects/nix/build-utils-meson
diff --git a/src/nix/build.cc b/subprojects/nix/build.cc
similarity index 100%
rename from src/nix/build.cc
rename to subprojects/nix/build.cc
diff --git a/src/nix/build.md b/subprojects/nix/build.md
similarity index 100%
rename from src/nix/build.md
rename to subprojects/nix/build.md
diff --git a/src/nix/bundle.cc b/subprojects/nix/bundle.cc
similarity index 100%
rename from src/nix/bundle.cc
rename to subprojects/nix/bundle.cc
diff --git a/src/nix/bundle.md b/subprojects/nix/bundle.md
similarity index 100%
rename from src/nix/bundle.md
rename to subprojects/nix/bundle.md
diff --git a/src/nix/cat.cc b/subprojects/nix/cat.cc
similarity index 100%
rename from src/nix/cat.cc
rename to subprojects/nix/cat.cc
diff --git a/src/nix/config-check.cc b/subprojects/nix/config-check.cc
similarity index 100%
rename from src/nix/config-check.cc
rename to subprojects/nix/config-check.cc
diff --git a/src/nix/config.cc b/subprojects/nix/config.cc
similarity index 100%
rename from src/nix/config.cc
rename to subprojects/nix/config.cc
diff --git a/src/nix/copy.cc b/subprojects/nix/copy.cc
similarity index 100%
rename from src/nix/copy.cc
rename to subprojects/nix/copy.cc
diff --git a/src/nix/copy.md b/subprojects/nix/copy.md
similarity index 100%
rename from src/nix/copy.md
rename to subprojects/nix/copy.md
diff --git a/src/nix/derivation-add.cc b/subprojects/nix/derivation-add.cc
similarity index 100%
rename from src/nix/derivation-add.cc
rename to subprojects/nix/derivation-add.cc
diff --git a/src/nix/derivation-add.md b/subprojects/nix/derivation-add.md
similarity index 100%
rename from src/nix/derivation-add.md
rename to subprojects/nix/derivation-add.md
diff --git a/src/nix/derivation-show.cc b/subprojects/nix/derivation-show.cc
similarity index 100%
rename from src/nix/derivation-show.cc
rename to subprojects/nix/derivation-show.cc
diff --git a/src/nix/derivation-show.md b/subprojects/nix/derivation-show.md
similarity index 100%
rename from src/nix/derivation-show.md
rename to subprojects/nix/derivation-show.md
diff --git a/src/nix/derivation.cc b/subprojects/nix/derivation.cc
similarity index 100%
rename from src/nix/derivation.cc
rename to subprojects/nix/derivation.cc
diff --git a/src/nix/develop.cc b/subprojects/nix/develop.cc
similarity index 100%
rename from src/nix/develop.cc
rename to subprojects/nix/develop.cc
diff --git a/src/nix/develop.md b/subprojects/nix/develop.md
similarity index 100%
rename from src/nix/develop.md
rename to subprojects/nix/develop.md
diff --git a/src/nix/diff-closures.cc b/subprojects/nix/diff-closures.cc
similarity index 100%
rename from src/nix/diff-closures.cc
rename to subprojects/nix/diff-closures.cc
diff --git a/src/nix/diff-closures.md b/subprojects/nix/diff-closures.md
similarity index 100%
rename from src/nix/diff-closures.md
rename to subprojects/nix/diff-closures.md
diff --git a/src/nix/doc b/subprojects/nix/doc
similarity index 100%
rename from src/nix/doc
rename to subprojects/nix/doc
diff --git a/src/nix/dump-path.cc b/subprojects/nix/dump-path.cc
similarity index 100%
rename from src/nix/dump-path.cc
rename to subprojects/nix/dump-path.cc
diff --git a/src/nix/edit.cc b/subprojects/nix/edit.cc
similarity index 100%
rename from src/nix/edit.cc
rename to subprojects/nix/edit.cc
diff --git a/src/nix/edit.md b/subprojects/nix/edit.md
similarity index 100%
rename from src/nix/edit.md
rename to subprojects/nix/edit.md
diff --git a/src/nix/env.cc b/subprojects/nix/env.cc
similarity index 100%
rename from src/nix/env.cc
rename to subprojects/nix/env.cc
diff --git a/src/nix/eval.cc b/subprojects/nix/eval.cc
similarity index 100%
rename from src/nix/eval.cc
rename to subprojects/nix/eval.cc
diff --git a/src/nix/eval.md b/subprojects/nix/eval.md
similarity index 100%
rename from src/nix/eval.md
rename to subprojects/nix/eval.md
diff --git a/src/nix/flake-archive.md b/subprojects/nix/flake-archive.md
similarity index 100%
rename from src/nix/flake-archive.md
rename to subprojects/nix/flake-archive.md
diff --git a/src/nix/flake-check.md b/subprojects/nix/flake-check.md
similarity index 100%
rename from src/nix/flake-check.md
rename to subprojects/nix/flake-check.md
diff --git a/src/nix/flake-clone.md b/subprojects/nix/flake-clone.md
similarity index 100%
rename from src/nix/flake-clone.md
rename to subprojects/nix/flake-clone.md
diff --git a/src/nix/flake-init.md b/subprojects/nix/flake-init.md
similarity index 100%
rename from src/nix/flake-init.md
rename to subprojects/nix/flake-init.md
diff --git a/src/nix/flake-lock.md b/subprojects/nix/flake-lock.md
similarity index 100%
rename from src/nix/flake-lock.md
rename to subprojects/nix/flake-lock.md
diff --git a/src/nix/flake-metadata.md b/subprojects/nix/flake-metadata.md
similarity index 100%
rename from src/nix/flake-metadata.md
rename to subprojects/nix/flake-metadata.md
diff --git a/src/nix/flake-new.md b/subprojects/nix/flake-new.md
similarity index 100%
rename from src/nix/flake-new.md
rename to subprojects/nix/flake-new.md
diff --git a/src/nix/flake-prefetch.md b/subprojects/nix/flake-prefetch.md
similarity index 100%
rename from src/nix/flake-prefetch.md
rename to subprojects/nix/flake-prefetch.md
diff --git a/src/nix/flake-show.md b/subprojects/nix/flake-show.md
similarity index 100%
rename from src/nix/flake-show.md
rename to subprojects/nix/flake-show.md
diff --git a/src/nix/flake-update.md b/subprojects/nix/flake-update.md
similarity index 100%
rename from src/nix/flake-update.md
rename to subprojects/nix/flake-update.md
diff --git a/src/nix/flake.cc b/subprojects/nix/flake.cc
similarity index 100%
rename from src/nix/flake.cc
rename to subprojects/nix/flake.cc
diff --git a/src/nix/flake.md b/subprojects/nix/flake.md
similarity index 100%
rename from src/nix/flake.md
rename to subprojects/nix/flake.md
diff --git a/src/nix/fmt.cc b/subprojects/nix/fmt.cc
similarity index 100%
rename from src/nix/fmt.cc
rename to subprojects/nix/fmt.cc
diff --git a/src/nix/fmt.md b/subprojects/nix/fmt.md
similarity index 100%
rename from src/nix/fmt.md
rename to subprojects/nix/fmt.md
diff --git a/src/nix/get-env.sh b/subprojects/nix/get-env.sh
similarity index 100%
rename from src/nix/get-env.sh
rename to subprojects/nix/get-env.sh
diff --git a/src/nix/hash-convert.md b/subprojects/nix/hash-convert.md
similarity index 100%
rename from src/nix/hash-convert.md
rename to subprojects/nix/hash-convert.md
diff --git a/src/nix/hash.cc b/subprojects/nix/hash.cc
similarity index 100%
rename from src/nix/hash.cc
rename to subprojects/nix/hash.cc
diff --git a/src/nix/help-stores.md b/subprojects/nix/help-stores.md
similarity index 100%
rename from src/nix/help-stores.md
rename to subprojects/nix/help-stores.md
diff --git a/src/nix/help.md b/subprojects/nix/help.md
similarity index 100%
rename from src/nix/help.md
rename to subprojects/nix/help.md
diff --git a/src/nix/key-convert-secret-to-public.md b/subprojects/nix/key-convert-secret-to-public.md
similarity index 100%
rename from src/nix/key-convert-secret-to-public.md
rename to subprojects/nix/key-convert-secret-to-public.md
diff --git a/src/nix/key-generate-secret.md b/subprojects/nix/key-generate-secret.md
similarity index 100%
rename from src/nix/key-generate-secret.md
rename to subprojects/nix/key-generate-secret.md
diff --git a/src/nix/local.mk b/subprojects/nix/local.mk
similarity index 68%
rename from src/nix/local.mk
rename to subprojects/nix/local.mk
index b57f6b3e2..b40d7ec4b 100644
--- a/src/nix/local.mk
+++ b/subprojects/nix/local.mk
@@ -4,19 +4,19 @@ nix_DIR := $(d)
 
 nix_SOURCES := \
   $(wildcard $(d)/*.cc) \
-  $(wildcard src/nix-build/*.cc) \
-  $(wildcard src/nix-env/*.cc) \
-  $(wildcard src/nix-instantiate/*.cc) \
-  $(wildcard src/nix-store/*.cc)
+  $(wildcard subprojects/nix-build/*.cc) \
+  $(wildcard subprojects/nix-env/*.cc) \
+  $(wildcard subprojects/nix-instantiate/*.cc) \
+  $(wildcard subprojects/nix-store/*.cc)
 
 ifdef HOST_UNIX
 nix_SOURCES += \
   $(wildcard $(d)/unix/*.cc) \
-  $(wildcard src/build-remote/*.cc) \
-  $(wildcard src/nix-channel/*.cc) \
-  $(wildcard src/nix-collect-garbage/*.cc) \
-  $(wildcard src/nix-copy-closure/*.cc) \
-  $(wildcard src/nix-daemon/*.cc)
+  $(wildcard subprojects/build-remote/*.cc) \
+  $(wildcard subprojects/nix-channel/*.cc) \
+  $(wildcard subprojects/nix-collect-garbage/*.cc) \
+  $(wildcard subprojects/nix-copy-closure/*.cc) \
+  $(wildcard subprojects/nix-daemon/*.cc)
 endif
 
 INCLUDE_nix := -I $(d)
@@ -24,7 +24,7 @@ ifdef HOST_UNIX
   INCLUDE_nix += -I $(d)/unix
 endif
 
-nix_CXXFLAGS += $(INCLUDE_libutil) $(INCLUDE_libstore) $(INCLUDE_libfetchers) $(INCLUDE_libexpr) $(INCLUDE_libflake) $(INCLUDE_libmain) -I src/libcmd -I doc/manual $(INCLUDE_nix)
+nix_CXXFLAGS += $(INCLUDE_libutil) $(INCLUDE_libstore) $(INCLUDE_libfetchers) $(INCLUDE_libexpr) $(INCLUDE_libflake) $(INCLUDE_libmain) -I subprojects/libcmd -I doc/manual $(INCLUDE_nix)
 
 nix_CXXFLAGS += -DNIX_BIN_DIR=\"$(NIX_ROOT)$(bindir)\"
 
@@ -42,11 +42,11 @@ $(foreach name, \
   $(eval $(call install-symlink, nix, $(bindir)/$(name))))
 $(eval $(call install-symlink, $(bindir)/nix, $(libexecdir)/nix/build-remote))
 
-src/nix-env/user-env.cc: src/nix-env/buildenv.nix.gen.hh
+subprojects/nix-env/user-env.cc: subprojects/nix-env/buildenv.nix.gen.hh
 
 $(d)/develop.cc: $(d)/get-env.sh.gen.hh
 
-src/nix-channel/nix-channel.cc: src/nix-channel/unpack-channel.nix.gen.hh
+subprojects/nix-channel/nix-channel.cc: subprojects/nix-channel/unpack-channel.nix.gen.hh
 
 $(d)/main.cc: \
   doc/manual/generate-manpage.nix.gen.hh \
diff --git a/src/nix/log.cc b/subprojects/nix/log.cc
similarity index 100%
rename from src/nix/log.cc
rename to subprojects/nix/log.cc
diff --git a/src/nix/log.md b/subprojects/nix/log.md
similarity index 100%
rename from src/nix/log.md
rename to subprojects/nix/log.md
diff --git a/src/nix/ls.cc b/subprojects/nix/ls.cc
similarity index 100%
rename from src/nix/ls.cc
rename to subprojects/nix/ls.cc
diff --git a/src/nix/main.cc b/subprojects/nix/main.cc
similarity index 100%
rename from src/nix/main.cc
rename to subprojects/nix/main.cc
diff --git a/src/nix/make-content-addressed.cc b/subprojects/nix/make-content-addressed.cc
similarity index 100%
rename from src/nix/make-content-addressed.cc
rename to subprojects/nix/make-content-addressed.cc
diff --git a/src/nix/make-content-addressed.md b/subprojects/nix/make-content-addressed.md
similarity index 100%
rename from src/nix/make-content-addressed.md
rename to subprojects/nix/make-content-addressed.md
diff --git a/src/nix/meson.build b/subprojects/nix/meson.build
similarity index 100%
rename from src/nix/meson.build
rename to subprojects/nix/meson.build
diff --git a/src/nix/meson.options b/subprojects/nix/meson.options
similarity index 100%
rename from src/nix/meson.options
rename to subprojects/nix/meson.options
diff --git a/src/nix/misc b/subprojects/nix/misc
similarity index 100%
rename from src/nix/misc
rename to subprojects/nix/misc
diff --git a/src/nix/nar-cat.md b/subprojects/nix/nar-cat.md
similarity index 100%
rename from src/nix/nar-cat.md
rename to subprojects/nix/nar-cat.md
diff --git a/src/nix/nar-dump-path.md b/subprojects/nix/nar-dump-path.md
similarity index 100%
rename from src/nix/nar-dump-path.md
rename to subprojects/nix/nar-dump-path.md
diff --git a/src/nix/nar-ls.md b/subprojects/nix/nar-ls.md
similarity index 100%
rename from src/nix/nar-ls.md
rename to subprojects/nix/nar-ls.md
diff --git a/src/nix/nar.cc b/subprojects/nix/nar.cc
similarity index 100%
rename from src/nix/nar.cc
rename to subprojects/nix/nar.cc
diff --git a/src/nix/nar.md b/subprojects/nix/nar.md
similarity index 100%
rename from src/nix/nar.md
rename to subprojects/nix/nar.md
diff --git a/src/nix/nix-build b/subprojects/nix/nix-build
similarity index 100%
rename from src/nix/nix-build
rename to subprojects/nix/nix-build
diff --git a/src/nix/nix-channel b/subprojects/nix/nix-channel
similarity index 100%
rename from src/nix/nix-channel
rename to subprojects/nix/nix-channel
diff --git a/src/nix/nix-collect-garbage b/subprojects/nix/nix-collect-garbage
similarity index 100%
rename from src/nix/nix-collect-garbage
rename to subprojects/nix/nix-collect-garbage
diff --git a/src/nix/nix-copy-closure b/subprojects/nix/nix-copy-closure
similarity index 100%
rename from src/nix/nix-copy-closure
rename to subprojects/nix/nix-copy-closure
diff --git a/src/nix/nix-env b/subprojects/nix/nix-env
similarity index 100%
rename from src/nix/nix-env
rename to subprojects/nix/nix-env
diff --git a/src/nix/nix-instantiate b/subprojects/nix/nix-instantiate
similarity index 100%
rename from src/nix/nix-instantiate
rename to subprojects/nix/nix-instantiate
diff --git a/src/nix/nix-store b/subprojects/nix/nix-store
similarity index 100%
rename from src/nix/nix-store
rename to subprojects/nix/nix-store
diff --git a/src/nix/nix.md b/subprojects/nix/nix.md
similarity index 100%
rename from src/nix/nix.md
rename to subprojects/nix/nix.md
diff --git a/src/nix/optimise-store.cc b/subprojects/nix/optimise-store.cc
similarity index 100%
rename from src/nix/optimise-store.cc
rename to subprojects/nix/optimise-store.cc
diff --git a/src/nix/optimise-store.md b/subprojects/nix/optimise-store.md
similarity index 100%
rename from src/nix/optimise-store.md
rename to subprojects/nix/optimise-store.md
diff --git a/src/nix/package.nix b/subprojects/nix/package.nix
similarity index 100%
rename from src/nix/package.nix
rename to subprojects/nix/package.nix
diff --git a/src/nix/path-from-hash-part.cc b/subprojects/nix/path-from-hash-part.cc
similarity index 100%
rename from src/nix/path-from-hash-part.cc
rename to subprojects/nix/path-from-hash-part.cc
diff --git a/src/nix/path-from-hash-part.md b/subprojects/nix/path-from-hash-part.md
similarity index 100%
rename from src/nix/path-from-hash-part.md
rename to subprojects/nix/path-from-hash-part.md
diff --git a/src/nix/path-info.cc b/subprojects/nix/path-info.cc
similarity index 100%
rename from src/nix/path-info.cc
rename to subprojects/nix/path-info.cc
diff --git a/src/nix/path-info.md b/subprojects/nix/path-info.md
similarity index 100%
rename from src/nix/path-info.md
rename to subprojects/nix/path-info.md
diff --git a/src/nix/prefetch.cc b/subprojects/nix/prefetch.cc
similarity index 100%
rename from src/nix/prefetch.cc
rename to subprojects/nix/prefetch.cc
diff --git a/src/nix/print-dev-env.md b/subprojects/nix/print-dev-env.md
similarity index 100%
rename from src/nix/print-dev-env.md
rename to subprojects/nix/print-dev-env.md
diff --git a/src/nix/profile-diff-closures.md b/subprojects/nix/profile-diff-closures.md
similarity index 100%
rename from src/nix/profile-diff-closures.md
rename to subprojects/nix/profile-diff-closures.md
diff --git a/src/nix/profile-history.md b/subprojects/nix/profile-history.md
similarity index 100%
rename from src/nix/profile-history.md
rename to subprojects/nix/profile-history.md
diff --git a/src/nix/profile-install.md b/subprojects/nix/profile-install.md
similarity index 100%
rename from src/nix/profile-install.md
rename to subprojects/nix/profile-install.md
diff --git a/src/nix/profile-list.md b/subprojects/nix/profile-list.md
similarity index 100%
rename from src/nix/profile-list.md
rename to subprojects/nix/profile-list.md
diff --git a/src/nix/profile-remove.md b/subprojects/nix/profile-remove.md
similarity index 100%
rename from src/nix/profile-remove.md
rename to subprojects/nix/profile-remove.md
diff --git a/src/nix/profile-rollback.md b/subprojects/nix/profile-rollback.md
similarity index 100%
rename from src/nix/profile-rollback.md
rename to subprojects/nix/profile-rollback.md
diff --git a/src/nix/profile-upgrade.md b/subprojects/nix/profile-upgrade.md
similarity index 100%
rename from src/nix/profile-upgrade.md
rename to subprojects/nix/profile-upgrade.md
diff --git a/src/nix/profile-wipe-history.md b/subprojects/nix/profile-wipe-history.md
similarity index 100%
rename from src/nix/profile-wipe-history.md
rename to subprojects/nix/profile-wipe-history.md
diff --git a/src/nix/profile.cc b/subprojects/nix/profile.cc
similarity index 100%
rename from src/nix/profile.cc
rename to subprojects/nix/profile.cc
diff --git a/src/nix/profile.md b/subprojects/nix/profile.md
similarity index 100%
rename from src/nix/profile.md
rename to subprojects/nix/profile.md
diff --git a/src/nix/profiles.md b/subprojects/nix/profiles.md
similarity index 100%
rename from src/nix/profiles.md
rename to subprojects/nix/profiles.md
diff --git a/src/nix/realisation.cc b/subprojects/nix/realisation.cc
similarity index 100%
rename from src/nix/realisation.cc
rename to subprojects/nix/realisation.cc
diff --git a/src/nix/realisation/info.md b/subprojects/nix/realisation/info.md
similarity index 100%
rename from src/nix/realisation/info.md
rename to subprojects/nix/realisation/info.md
diff --git a/src/nix/registry-add.md b/subprojects/nix/registry-add.md
similarity index 100%
rename from src/nix/registry-add.md
rename to subprojects/nix/registry-add.md
diff --git a/src/nix/registry-list.md b/subprojects/nix/registry-list.md
similarity index 100%
rename from src/nix/registry-list.md
rename to subprojects/nix/registry-list.md
diff --git a/src/nix/registry-pin.md b/subprojects/nix/registry-pin.md
similarity index 100%
rename from src/nix/registry-pin.md
rename to subprojects/nix/registry-pin.md
diff --git a/src/nix/registry-remove.md b/subprojects/nix/registry-remove.md
similarity index 100%
rename from src/nix/registry-remove.md
rename to subprojects/nix/registry-remove.md
diff --git a/src/nix/registry.cc b/subprojects/nix/registry.cc
similarity index 100%
rename from src/nix/registry.cc
rename to subprojects/nix/registry.cc
diff --git a/src/nix/registry.md b/subprojects/nix/registry.md
similarity index 100%
rename from src/nix/registry.md
rename to subprojects/nix/registry.md
diff --git a/src/nix/repl.cc b/subprojects/nix/repl.cc
similarity index 100%
rename from src/nix/repl.cc
rename to subprojects/nix/repl.cc
diff --git a/src/nix/repl.md b/subprojects/nix/repl.md
similarity index 100%
rename from src/nix/repl.md
rename to subprojects/nix/repl.md
diff --git a/src/nix/run.cc b/subprojects/nix/run.cc
similarity index 100%
rename from src/nix/run.cc
rename to subprojects/nix/run.cc
diff --git a/src/nix/run.hh b/subprojects/nix/run.hh
similarity index 100%
rename from src/nix/run.hh
rename to subprojects/nix/run.hh
diff --git a/src/nix/run.md b/subprojects/nix/run.md
similarity index 100%
rename from src/nix/run.md
rename to subprojects/nix/run.md
diff --git a/src/nix/scripts b/subprojects/nix/scripts
similarity index 100%
rename from src/nix/scripts
rename to subprojects/nix/scripts
diff --git a/src/nix/search.cc b/subprojects/nix/search.cc
similarity index 100%
rename from src/nix/search.cc
rename to subprojects/nix/search.cc
diff --git a/src/nix/search.md b/subprojects/nix/search.md
similarity index 100%
rename from src/nix/search.md
rename to subprojects/nix/search.md
diff --git a/src/nix/self-exe.cc b/subprojects/nix/self-exe.cc
similarity index 100%
rename from src/nix/self-exe.cc
rename to subprojects/nix/self-exe.cc
diff --git a/src/nix/self-exe.hh b/subprojects/nix/self-exe.hh
similarity index 100%
rename from src/nix/self-exe.hh
rename to subprojects/nix/self-exe.hh
diff --git a/src/nix/shell.md b/subprojects/nix/shell.md
similarity index 100%
rename from src/nix/shell.md
rename to subprojects/nix/shell.md
diff --git a/src/nix/sigs.cc b/subprojects/nix/sigs.cc
similarity index 100%
rename from src/nix/sigs.cc
rename to subprojects/nix/sigs.cc
diff --git a/src/nix/store-cat.md b/subprojects/nix/store-cat.md
similarity index 100%
rename from src/nix/store-cat.md
rename to subprojects/nix/store-cat.md
diff --git a/src/nix/store-copy-log.cc b/subprojects/nix/store-copy-log.cc
similarity index 100%
rename from src/nix/store-copy-log.cc
rename to subprojects/nix/store-copy-log.cc
diff --git a/src/nix/store-copy-log.md b/subprojects/nix/store-copy-log.md
similarity index 100%
rename from src/nix/store-copy-log.md
rename to subprojects/nix/store-copy-log.md
diff --git a/src/nix/store-delete.cc b/subprojects/nix/store-delete.cc
similarity index 100%
rename from src/nix/store-delete.cc
rename to subprojects/nix/store-delete.cc
diff --git a/src/nix/store-delete.md b/subprojects/nix/store-delete.md
similarity index 100%
rename from src/nix/store-delete.md
rename to subprojects/nix/store-delete.md
diff --git a/src/nix/store-dump-path.md b/subprojects/nix/store-dump-path.md
similarity index 100%
rename from src/nix/store-dump-path.md
rename to subprojects/nix/store-dump-path.md
diff --git a/src/nix/store-gc.cc b/subprojects/nix/store-gc.cc
similarity index 100%
rename from src/nix/store-gc.cc
rename to subprojects/nix/store-gc.cc
diff --git a/src/nix/store-gc.md b/subprojects/nix/store-gc.md
similarity index 100%
rename from src/nix/store-gc.md
rename to subprojects/nix/store-gc.md
diff --git a/src/nix/store-info.cc b/subprojects/nix/store-info.cc
similarity index 100%
rename from src/nix/store-info.cc
rename to subprojects/nix/store-info.cc
diff --git a/src/nix/store-info.md b/subprojects/nix/store-info.md
similarity index 100%
rename from src/nix/store-info.md
rename to subprojects/nix/store-info.md
diff --git a/src/nix/store-ls.md b/subprojects/nix/store-ls.md
similarity index 100%
rename from src/nix/store-ls.md
rename to subprojects/nix/store-ls.md
diff --git a/src/nix/store-prefetch-file.md b/subprojects/nix/store-prefetch-file.md
similarity index 100%
rename from src/nix/store-prefetch-file.md
rename to subprojects/nix/store-prefetch-file.md
diff --git a/src/nix/store-repair.cc b/subprojects/nix/store-repair.cc
similarity index 100%
rename from src/nix/store-repair.cc
rename to subprojects/nix/store-repair.cc
diff --git a/src/nix/store-repair.md b/subprojects/nix/store-repair.md
similarity index 100%
rename from src/nix/store-repair.md
rename to subprojects/nix/store-repair.md
diff --git a/src/nix/store.cc b/subprojects/nix/store.cc
similarity index 100%
rename from src/nix/store.cc
rename to subprojects/nix/store.cc
diff --git a/src/nix/unix/daemon.cc b/subprojects/nix/unix/daemon.cc
similarity index 100%
rename from src/nix/unix/daemon.cc
rename to subprojects/nix/unix/daemon.cc
diff --git a/src/nix/unix/daemon.md b/subprojects/nix/unix/daemon.md
similarity index 100%
rename from src/nix/unix/daemon.md
rename to subprojects/nix/unix/daemon.md
diff --git a/src/nix/upgrade-nix.cc b/subprojects/nix/upgrade-nix.cc
similarity index 100%
rename from src/nix/upgrade-nix.cc
rename to subprojects/nix/upgrade-nix.cc
diff --git a/src/nix/upgrade-nix.md b/subprojects/nix/upgrade-nix.md
similarity index 100%
rename from src/nix/upgrade-nix.md
rename to subprojects/nix/upgrade-nix.md
diff --git a/src/nix/verify.cc b/subprojects/nix/verify.cc
similarity index 100%
rename from src/nix/verify.cc
rename to subprojects/nix/verify.cc
diff --git a/src/nix/verify.md b/subprojects/nix/verify.md
similarity index 100%
rename from src/nix/verify.md
rename to subprojects/nix/verify.md
diff --git a/src/nix/why-depends.cc b/subprojects/nix/why-depends.cc
similarity index 100%
rename from src/nix/why-depends.cc
rename to subprojects/nix/why-depends.cc
diff --git a/src/nix/why-depends.md b/subprojects/nix/why-depends.md
similarity index 100%
rename from src/nix/why-depends.md
rename to subprojects/nix/why-depends.md
diff --git a/src/perl/.version b/subprojects/perl/.version
similarity index 100%
rename from src/perl/.version
rename to subprojects/perl/.version
diff --git a/src/perl/.yath.rc.in b/subprojects/perl/.yath.rc.in
similarity index 100%
rename from src/perl/.yath.rc.in
rename to subprojects/perl/.yath.rc.in
diff --git a/src/perl/MANIFEST b/subprojects/perl/MANIFEST
similarity index 100%
rename from src/perl/MANIFEST
rename to subprojects/perl/MANIFEST
diff --git a/src/perl/lib/Nix/Config.pm.in b/subprojects/perl/lib/Nix/Config.pm.in
similarity index 100%
rename from src/perl/lib/Nix/Config.pm.in
rename to subprojects/perl/lib/Nix/Config.pm.in
diff --git a/src/perl/lib/Nix/CopyClosure.pm b/subprojects/perl/lib/Nix/CopyClosure.pm
similarity index 100%
rename from src/perl/lib/Nix/CopyClosure.pm
rename to subprojects/perl/lib/Nix/CopyClosure.pm
diff --git a/src/perl/lib/Nix/Manifest.pm b/subprojects/perl/lib/Nix/Manifest.pm
similarity index 100%
rename from src/perl/lib/Nix/Manifest.pm
rename to subprojects/perl/lib/Nix/Manifest.pm
diff --git a/src/perl/lib/Nix/SSH.pm b/subprojects/perl/lib/Nix/SSH.pm
similarity index 100%
rename from src/perl/lib/Nix/SSH.pm
rename to subprojects/perl/lib/Nix/SSH.pm
diff --git a/src/perl/lib/Nix/Store.pm b/subprojects/perl/lib/Nix/Store.pm
similarity index 100%
rename from src/perl/lib/Nix/Store.pm
rename to subprojects/perl/lib/Nix/Store.pm
diff --git a/src/perl/lib/Nix/Store.xs b/subprojects/perl/lib/Nix/Store.xs
similarity index 100%
rename from src/perl/lib/Nix/Store.xs
rename to subprojects/perl/lib/Nix/Store.xs
diff --git a/src/perl/lib/Nix/Utils.pm b/subprojects/perl/lib/Nix/Utils.pm
similarity index 100%
rename from src/perl/lib/Nix/Utils.pm
rename to subprojects/perl/lib/Nix/Utils.pm
diff --git a/src/perl/lib/Nix/meson.build b/subprojects/perl/lib/Nix/meson.build
similarity index 100%
rename from src/perl/lib/Nix/meson.build
rename to subprojects/perl/lib/Nix/meson.build
diff --git a/src/perl/meson.build b/subprojects/perl/meson.build
similarity index 100%
rename from src/perl/meson.build
rename to subprojects/perl/meson.build
diff --git a/src/perl/meson.options b/subprojects/perl/meson.options
similarity index 100%
rename from src/perl/meson.options
rename to subprojects/perl/meson.options
diff --git a/src/perl/package.nix b/subprojects/perl/package.nix
similarity index 100%
rename from src/perl/package.nix
rename to subprojects/perl/package.nix
diff --git a/src/perl/t/init.t b/subprojects/perl/t/init.t
similarity index 100%
rename from src/perl/t/init.t
rename to subprojects/perl/t/init.t
diff --git a/src/perl/t/meson.build b/subprojects/perl/t/meson.build
similarity index 100%
rename from src/perl/t/meson.build
rename to subprojects/perl/t/meson.build