diff --git a/testing/cargo/build b/extra/cargo/build
similarity index 100%
rename from testing/cargo/build
rename to extra/cargo/build
diff --git a/testing/cargo/checksums b/extra/cargo/checksums
similarity index 100%
rename from testing/cargo/checksums
rename to extra/cargo/checksums
diff --git a/testing/cargo/depends b/extra/cargo/depends
similarity index 100%
rename from testing/cargo/depends
rename to extra/cargo/depends
diff --git a/testing/cargo/sources b/extra/cargo/sources
similarity index 100%
rename from testing/cargo/sources
rename to extra/cargo/sources
diff --git a/testing/cargo/version b/extra/cargo/version
similarity index 100%
rename from testing/cargo/version
rename to extra/cargo/version
diff --git a/testing/cbindgen/build b/extra/cbindgen/build
similarity index 100%
rename from testing/cbindgen/build
rename to extra/cbindgen/build
diff --git a/testing/cbindgen/checksums b/extra/cbindgen/checksums
similarity index 100%
rename from testing/cbindgen/checksums
rename to extra/cbindgen/checksums
diff --git a/testing/cbindgen/depends b/extra/cbindgen/depends
similarity index 100%
rename from testing/cbindgen/depends
rename to extra/cbindgen/depends
diff --git a/testing/cbindgen/sources b/extra/cbindgen/sources
similarity index 100%
rename from testing/cbindgen/sources
rename to extra/cbindgen/sources
diff --git a/testing/cbindgen/version b/extra/cbindgen/version
similarity index 100%
rename from testing/cbindgen/version
rename to extra/cbindgen/version
diff --git a/testing/rust/build b/extra/rust/build
similarity index 100%
rename from testing/rust/build
rename to extra/rust/build
diff --git a/testing/rust/checksums b/extra/rust/checksums
similarity index 100%
rename from testing/rust/checksums
rename to extra/rust/checksums
diff --git a/testing/rust/depends b/extra/rust/depends
similarity index 100%
rename from testing/rust/depends
rename to extra/rust/depends
diff --git a/testing/rust/patches/0002-Fix-LLVM-build.patch b/extra/rust/patches/0002-Fix-LLVM-build.patch
similarity index 100%
rename from testing/rust/patches/0002-Fix-LLVM-build.patch
rename to extra/rust/patches/0002-Fix-LLVM-build.patch
diff --git a/testing/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch b/extra/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
similarity index 100%
rename from testing/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
rename to extra/rust/patches/0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
diff --git a/testing/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch b/extra/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch
similarity index 100%
rename from testing/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch
rename to extra/rust/patches/0004-Require-static-native-libraries-when-linking-static-.patch
diff --git a/testing/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/extra/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
similarity index 100%
rename from testing/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
rename to extra/rust/patches/0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
diff --git a/testing/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch b/extra/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
similarity index 100%
rename from testing/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
rename to extra/rust/patches/0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
diff --git a/testing/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch b/extra/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
similarity index 100%
rename from testing/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
rename to extra/rust/patches/0007-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
diff --git a/testing/rust/patches/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/extra/rust/patches/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch
similarity index 100%
rename from testing/rust/patches/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch
rename to extra/rust/patches/0008-test-use-extern-for-plugins-Don-t-assume-multilib.patch
diff --git a/testing/rust/patches/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/extra/rust/patches/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
similarity index 100%
rename from testing/rust/patches/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
rename to extra/rust/patches/0009-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
diff --git a/testing/rust/patches/0010-Ignore-broken-and-non-applicable-tests.patch b/extra/rust/patches/0010-Ignore-broken-and-non-applicable-tests.patch
similarity index 100%
rename from testing/rust/patches/0010-Ignore-broken-and-non-applicable-tests.patch
rename to extra/rust/patches/0010-Ignore-broken-and-non-applicable-tests.patch
diff --git a/testing/rust/patches/0011-Link-stage-2-tools-dynamically-to-libstd.patch b/extra/rust/patches/0011-Link-stage-2-tools-dynamically-to-libstd.patch
similarity index 100%
rename from testing/rust/patches/0011-Link-stage-2-tools-dynamically-to-libstd.patch
rename to extra/rust/patches/0011-Link-stage-2-tools-dynamically-to-libstd.patch
diff --git a/testing/rust/patches/0012-Move-debugger-scripts-to-usr-share-rust.patch b/extra/rust/patches/0012-Move-debugger-scripts-to-usr-share-rust.patch
similarity index 100%
rename from testing/rust/patches/0012-Move-debugger-scripts-to-usr-share-rust.patch
rename to extra/rust/patches/0012-Move-debugger-scripts-to-usr-share-rust.patch
diff --git a/testing/rust/patches/0029-musl-dont-use-crt-static.patch b/extra/rust/patches/0029-musl-dont-use-crt-static.patch
similarity index 100%
rename from testing/rust/patches/0029-musl-dont-use-crt-static.patch
rename to extra/rust/patches/0029-musl-dont-use-crt-static.patch
diff --git a/testing/rust/patches/0030-libc-linkage.patch b/extra/rust/patches/0030-libc-linkage.patch
similarity index 100%
rename from testing/rust/patches/0030-libc-linkage.patch
rename to extra/rust/patches/0030-libc-linkage.patch
diff --git a/testing/rust/patches/0031-typenum-pmmx.patch b/extra/rust/patches/0031-typenum-pmmx.patch
similarity index 100%
rename from testing/rust/patches/0031-typenum-pmmx.patch
rename to extra/rust/patches/0031-typenum-pmmx.patch
diff --git a/testing/rust/patches/0091-lzma-sys-cross-ldflags.patch b/extra/rust/patches/0091-lzma-sys-cross-ldflags.patch
similarity index 100%
rename from testing/rust/patches/0091-lzma-sys-cross-ldflags.patch
rename to extra/rust/patches/0091-lzma-sys-cross-ldflags.patch
diff --git a/testing/rust/patches/0092-use-correct-llvm-cross.patch b/extra/rust/patches/0092-use-correct-llvm-cross.patch
similarity index 100%
rename from testing/rust/patches/0092-use-correct-llvm-cross.patch
rename to extra/rust/patches/0092-use-correct-llvm-cross.patch
diff --git a/testing/rust/patches/0093-use-elfv2-everywhere.patch b/extra/rust/patches/0093-use-elfv2-everywhere.patch
similarity index 100%
rename from testing/rust/patches/0093-use-elfv2-everywhere.patch
rename to extra/rust/patches/0093-use-elfv2-everywhere.patch
diff --git a/testing/rust/patches/llvm-with-dependencies.patch b/extra/rust/patches/llvm-with-dependencies.patch
similarity index 100%
rename from testing/rust/patches/llvm-with-dependencies.patch
rename to extra/rust/patches/llvm-with-dependencies.patch
diff --git a/testing/rust/sources b/extra/rust/sources
similarity index 100%
rename from testing/rust/sources
rename to extra/rust/sources
diff --git a/testing/rust/version b/extra/rust/version
similarity index 100%
rename from testing/rust/version
rename to extra/rust/version