diff --git a/build/README.md b/builders/README.md
similarity index 100%
rename from build/README.md
rename to builders/README.md
diff --git a/build/build_builder b/builders/build_builder
similarity index 100%
rename from build/build_builder
rename to builders/build_builder
diff --git a/build/darwin.aarch64/Dockerfile b/builders/darwin.aarch64/Dockerfile
similarity index 100%
rename from build/darwin.aarch64/Dockerfile
rename to builders/darwin.aarch64/Dockerfile
diff --git a/build/darwin.aarch64/build b/builders/darwin.aarch64/build
similarity index 100%
rename from build/darwin.aarch64/build
rename to builders/darwin.aarch64/build
diff --git a/build/darwin.aarch64/tag b/builders/darwin.aarch64/tag
similarity index 100%
rename from build/darwin.aarch64/tag
rename to builders/darwin.aarch64/tag
diff --git a/build/darwin.x86_64/Dockerfile b/builders/darwin.x86_64/Dockerfile
similarity index 100%
rename from build/darwin.x86_64/Dockerfile
rename to builders/darwin.x86_64/Dockerfile
diff --git a/build/darwin.x86_64/build b/builders/darwin.x86_64/build
similarity index 100%
rename from build/darwin.x86_64/build
rename to builders/darwin.x86_64/build
diff --git a/build/darwin.x86_64/tag b/builders/darwin.x86_64/tag
similarity index 100%
rename from build/darwin.x86_64/tag
rename to builders/darwin.x86_64/tag
diff --git a/build/linux.aarch64/Dockerfile b/builders/linux.aarch64/Dockerfile
similarity index 100%
rename from build/linux.aarch64/Dockerfile
rename to builders/linux.aarch64/Dockerfile
diff --git a/build/linux.aarch64/build b/builders/linux.aarch64/build
similarity index 100%
rename from build/linux.aarch64/build
rename to builders/linux.aarch64/build
diff --git a/build/linux.aarch64/tag b/builders/linux.aarch64/tag
similarity index 100%
rename from build/linux.aarch64/tag
rename to builders/linux.aarch64/tag
diff --git a/build/linux.armv6hf/Dockerfile b/builders/linux.armv6hf/Dockerfile
similarity index 100%
rename from build/linux.armv6hf/Dockerfile
rename to builders/linux.armv6hf/Dockerfile
diff --git a/build/linux.armv6hf/build b/builders/linux.armv6hf/build
similarity index 100%
rename from build/linux.armv6hf/build
rename to builders/linux.armv6hf/build
diff --git a/build/linux.armv6hf/cabal.project.freeze b/builders/linux.armv6hf/cabal.project.freeze
similarity index 100%
rename from build/linux.armv6hf/cabal.project.freeze
rename to builders/linux.armv6hf/cabal.project.freeze
diff --git a/build/linux.armv6hf/scutil b/builders/linux.armv6hf/scutil
similarity index 100%
rename from build/linux.armv6hf/scutil
rename to builders/linux.armv6hf/scutil
diff --git a/build/linux.armv6hf/tag b/builders/linux.armv6hf/tag
similarity index 100%
rename from build/linux.armv6hf/tag
rename to builders/linux.armv6hf/tag
diff --git a/build/linux.riscv64/Dockerfile b/builders/linux.riscv64/Dockerfile
similarity index 100%
rename from build/linux.riscv64/Dockerfile
rename to builders/linux.riscv64/Dockerfile
diff --git a/build/linux.riscv64/build b/builders/linux.riscv64/build
similarity index 100%
rename from build/linux.riscv64/build
rename to builders/linux.riscv64/build
diff --git a/build/linux.riscv64/cabal.project.freeze b/builders/linux.riscv64/cabal.project.freeze
similarity index 100%
rename from build/linux.riscv64/cabal.project.freeze
rename to builders/linux.riscv64/cabal.project.freeze
diff --git a/build/linux.riscv64/tag b/builders/linux.riscv64/tag
similarity index 100%
rename from build/linux.riscv64/tag
rename to builders/linux.riscv64/tag
diff --git a/build/linux.x86_64/Dockerfile b/builders/linux.x86_64/Dockerfile
similarity index 100%
rename from build/linux.x86_64/Dockerfile
rename to builders/linux.x86_64/Dockerfile
diff --git a/build/linux.x86_64/build b/builders/linux.x86_64/build
similarity index 100%
rename from build/linux.x86_64/build
rename to builders/linux.x86_64/build
diff --git a/build/linux.x86_64/tag b/builders/linux.x86_64/tag
similarity index 100%
rename from build/linux.x86_64/tag
rename to builders/linux.x86_64/tag
diff --git a/build/run_builder b/builders/run_builder
similarity index 100%
rename from build/run_builder
rename to builders/run_builder
diff --git a/build/windows.x86_64/Dockerfile b/builders/windows.x86_64/Dockerfile
similarity index 100%
rename from build/windows.x86_64/Dockerfile
rename to builders/windows.x86_64/Dockerfile
diff --git a/build/windows.x86_64/build b/builders/windows.x86_64/build
similarity index 100%
rename from build/windows.x86_64/build
rename to builders/windows.x86_64/build
diff --git a/build/windows.x86_64/tag b/builders/windows.x86_64/tag
similarity index 100%
rename from build/windows.x86_64/tag
rename to builders/windows.x86_64/tag
diff --git a/test/check_release b/test/check_release
index f3ea9df..883d335 100755
--- a/test/check_release
+++ b/test/check_release
@@ -61,8 +61,8 @@ cat << EOF
 Manual Checklist
 
 $((i++)). Make sure none of the automated checks above failed
-$((i++)). Run \`build/build_builder build/*/\` to update all builder images.
-$((j++)). \`build/run_builder dist-newstyle/sdist/ShellCheck-*.tar.gz build/*/\` to verify that they work.
+$((i++)). Run \`builders/build_builder build/*/\` to update all builder images.
+$((j++)). \`builders/run_builder dist-newstyle/sdist/ShellCheck-*.tar.gz builders/*/\` to verify that they work.
 $((j++)). \`for f in \$(cat build/*/tag); do docker push "\$f"; done\` to upload them.
 $((i++)). Run test/distrotest to ensure that most distros can build OOTB.
 $((i++)). Make sure GitHub Build currently passes: https://github.com/koalaman/shellcheck/actions