diff --git a/build/Targets/Settings.targets b/build/Targets/Settings.targets
index ca3ba6033dd9078e9bc88d93d8b98174e7672aa1..c7c8d5eb4f535204740771961c7d80bf9cdf8e31 100644
--- a/build/Targets/Settings.targets
+++ b/build/Targets/Settings.targets
@@ -69,7 +69,7 @@
        to all unix compilations. This shouldn't present a problem as it's impossible to
        fully sign on unix at the moment anyway. Tracked by #7756. -->
   <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
-      <CompilerResponseFile>$(MSBuildThisFileDirectory)..\scripts\extra_unix_args.rsp</CompilerResponseFile>
+      <CompilerResponseFile>$(MSBuildThisFileDirectory)..\unix\extra_unix_args.rsp</CompilerResponseFile>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/build/bootstrap/README.md b/build/bootstrap/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..f642069431e54620549d303769d89d6da1471125
--- /dev/null
+++ b/build/bootstrap/README.md
@@ -0,0 +1,7 @@
+## Bootstrap Files
+
+This directory contains the set of files necessary to run the bootstrap compiler.  These are not produced as a part of normal build because they are not correct for standard insertions.  This directory should be copied in its entirety whenever a bootstrap compiler is deployed.
+
+
+
+
diff --git a/build/scripts/VBCSCompiler.exe.config b/build/bootstrap/VBCSCompiler.exe.config
similarity index 100%
rename from build/scripts/VBCSCompiler.exe.config
rename to build/bootstrap/VBCSCompiler.exe.config
diff --git a/build/scripts/csc.cmd b/build/bootstrap/csc.cmd
similarity index 100%
rename from build/scripts/csc.cmd
rename to build/bootstrap/csc.cmd
diff --git a/build/scripts/csc.exe.config b/build/bootstrap/csc.exe.config
similarity index 100%
rename from build/scripts/csc.exe.config
rename to build/bootstrap/csc.exe.config
diff --git a/build/scripts/vbc.cmd b/build/bootstrap/vbc.cmd
similarity index 100%
rename from build/scripts/vbc.cmd
rename to build/bootstrap/vbc.cmd
diff --git a/build/scripts/vbc.exe.config b/build/bootstrap/vbc.exe.config
similarity index 100%
rename from build/scripts/vbc.exe.config
rename to build/bootstrap/vbc.exe.config
diff --git a/build/scripts/README.md b/build/scripts/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..6c6d9cf93e649daa6f5b3e5bc588ad7e181149f4
--- /dev/null
+++ b/build/scripts/README.md
@@ -0,0 +1,7 @@
+## Script files
+
+This directory contains scripts, and supporting files, that are used by the build process.  
+
+
+
+
diff --git a/build/scripts/extra_unix_args.rsp b/build/unix/extra_unix_args.rsp
similarity index 100%
rename from build/scripts/extra_unix_args.rsp
rename to build/unix/extra_unix_args.rsp
diff --git a/cibuild.cmd b/cibuild.cmd
index bb5c137d03fc39a3a6a51eda2adb404b7e35c8b1..9b1987954ec82d93d0635ab61da56fc22db00e61 100644
--- a/cibuild.cmd
+++ b/cibuild.cmd
@@ -44,7 +44,7 @@ powershell -noprofile -executionPolicy RemoteSigned -file "%RoslynRoot%\build\sc
 
 if not exist "%bindir%\Bootstrap" mkdir "%bindir%\Bootstrap" || goto :BuildFailed
 move "Binaries\%BuildConfiguration%\*" "%bindir%\Bootstrap" || goto :BuildFailed
-copy "build\scripts\*" "%bindir%\Bootstrap" || goto :BuildFailed
+copy "build\bootstrap\*" "%bindir%\Bootstrap" || goto :BuildFailed
 
 REM Clean the previous build
 msbuild %MSBuildAdditionalCommandLineArgs% /t:Clean build/Toolset.sln /p:Configuration=%BuildConfiguration%  /fileloggerparameters:LogFile="%bindir%\BootstrapClean.log" || goto :BuildFailed