diff --git a/.gitignore b/.gitignore
index ac695da16f8..bf975f92014 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,16 +10,10 @@ perf.data.old
 /build_sysroot/sysroot_src
 /build_sysroot/Cargo.lock
 /build_sysroot/test_target/Cargo.lock
-/rust
-/simple-raytracer
-/regex
-/rand
 gimple*
 *asm
 res
 test-backend
-gcc_path
-cross_gcc_path
 projects
 benchmarks
 tools/llvm-project
diff --git a/build_system/src/prepare.rs b/build_system/src/prepare.rs
index 979438d0415..1a3eb7d2e57 100644
--- a/build_system/src/prepare.rs
+++ b/build_system/src/prepare.rs
@@ -95,7 +95,7 @@ fn prepare_libcore(
     )?;
     if cross_compile {
         walk_dir(
-            "cross_patches",
+            "patches/cross_patches",
             |_| Ok(()),
             |file_path: &Path| {
                 patches.push(file_path.to_path_buf());
@@ -161,7 +161,7 @@ where
     run_command(&[&"git", &"checkout", &checkout_commit], Some(&repo_path))?;
     let filter = format!("-{}-", clone_result.repo_name);
     walk_dir(
-        "crate_patches",
+        "patches/crate_patches",
         |_| Ok(()),
         |file_path| {
             let patch = file_path.as_os_str().to_str().unwrap();
diff --git a/crate_patches/0002-rand-Disable-failing-test.patch b/patches/crate_patches/0002-rand-Disable-failing-test.patch
similarity index 100%
rename from crate_patches/0002-rand-Disable-failing-test.patch
rename to patches/crate_patches/0002-rand-Disable-failing-test.patch
diff --git a/cross_patches/0001-Disable-libstd-and-libtest-dylib.patch b/patches/cross_patches/0001-Disable-libstd-and-libtest-dylib.patch
similarity index 100%
rename from cross_patches/0001-Disable-libstd-and-libtest-dylib.patch
rename to patches/cross_patches/0001-Disable-libstd-and-libtest-dylib.patch