diff --git a/src/building/new-target.md b/src/building/new-target.md
index 83973f2c9..ece81d405 100644
--- a/src/building/new-target.md
+++ b/src/building/new-target.md
@@ -86,7 +86,7 @@ unexpected because stage0 doesn't know about the new target specification and
 we pass `--check-cfg` in order to tell it to check.
 
 To fix the errors you will need to manually add the unexpected value to the
-`EXTRA_CHECK_CFGS` list in `src/bootstrap/lib.rs`. Here is an example for
+`EXTRA_CHECK_CFGS` list in `src/bootstrap/src/lib.rs`. Here is an example for
 adding `NEW_TARGET_OS` as `target_os`:
 ```diff
 - (Some(Mode::Std), "target_os", Some(&["watchos"])),
diff --git a/src/sanitizers.md b/src/sanitizers.md
index 27d40a11a..4dc4c868b 100644
--- a/src/sanitizers.md
+++ b/src/sanitizers.md
@@ -64,9 +64,9 @@ implementation:
    constructed by cargo `-Z build-std` or xargo.
 
 [compiler-rt]: https://github.com/llvm/llvm-project/tree/main/compiler-rt
-[sanitizer-build]: https://github.com/rust-lang/rust/blob/1.55.0/src/bootstrap/native.rs#L700-L765
-[sanitizer-targets]: https://github.com/rust-lang/rust/blob/1.55.0/src/bootstrap/native.rs#L806-L820
-[sanitizer-copy]: https://github.com/rust-lang/rust/blob/1.55.0/src/bootstrap/compile.rs#L376-L407
+[sanitizer-build]: https://github.com/rust-lang/rust/blob/1ead4761e9e2f056385768614c23ffa7acb6a19e/src/bootstrap/src/core/build_steps/llvm.rs#L958-L1031
+[sanitizer-targets]: https://github.com/rust-lang/rust/blob/1ead4761e9e2f056385768614c23ffa7acb6a19e/src/bootstrap/src/core/build_steps/llvm.rs#L1073-L1111
+[sanitizer-copy]: https://github.com/rust-lang/rust/blob/1ead4761e9e2f056385768614c23ffa7acb6a19e/src/bootstrap/src/core/build_steps/compile.rs#L637-L676
 [sanitizer-attribute]: https://github.com/rust-lang/rust/blob/1.55.0/compiler/rustc_codegen_llvm/src/attributes.rs#L42-L58
 [inline-mir]: https://github.com/rust-lang/rust/blob/1.55.0/compiler/rustc_mir/src/transform/inline.rs#L314-L316
 [inline-llvm]: https://github.com/rust-lang/llvm-project/blob/9330ec5a4c1df5fc1fa62f993ed6a04da68cb040/llvm/include/llvm/IR/Attributes.td#L225-L241
diff --git a/src/tests/running.md b/src/tests/running.md
index 7c68dd03f..a0c9fb7d0 100644
--- a/src/tests/running.md
+++ b/src/tests/running.md
@@ -307,7 +307,7 @@ libraries to the emulator, and running the tests within the emulator, and
 reading the results.  The Docker image is set up to launch
 `remote-test-server` and the build tools use `remote-test-client` to
 communicate with the server to coordinate running tests (see
-[src/bootstrap/test.rs]).
+[src/bootstrap/src/core/build_steps/test.rs]).
 
 > TODO:
 > Is there any support for using an iOS emulator?
@@ -318,7 +318,7 @@ communicate with the server to coordinate running tests (see
 [QEMU]: https://www.qemu.org/
 [remote-test-client]: https://github.com/rust-lang/rust/tree/master/src/tools/remote-test-client
 [remote-test-server]: https://github.com/rust-lang/rust/tree/master/src/tools/remote-test-server
-[src/bootstrap/test.rs]: https://github.com/rust-lang/rust/tree/master/src/bootstrap/test.rs
+[src/bootstrap/src/core/build_steps/test.rs]: https://github.com/rust-lang/rust/blob/master/src/bootstrap/src/core/build_steps/test.rs
 
 ## Running rustc_codegen_gcc tests
 
diff --git a/src/tests/suggest-tests.md b/src/tests/suggest-tests.md
index f6b6d1537..4ab945c0c 100644
--- a/src/tests/suggest-tests.md
+++ b/src/tests/suggest-tests.md
@@ -11,7 +11,7 @@ in scope, we are looking to expand this (contributions welcome!).
 
 The tool is defined in a separate crate ([`src/tools/suggest-tests`](https://github.com/rust-lang/rust/blob/master/src/tools/suggest-tests))
 which outputs suggestions which are parsed by a shim in bootstrap
-([`src/bootstrap/suggest.rs`](https://github.com/rust-lang/rust/blob/master/src/bootstrap/suggest.rs)).
+([`src/bootstrap/src/core/build_steps/suggest.rs`](https://github.com/rust-lang/rust/blob/master/src/bootstrap/src/core/build_steps/suggest.rs)).
 The only notable thing the bootstrap shim does is (when invoked with the
 `--run` flag) use bootstrap's internal mechanisms to create a new `Builder` and
 uses it to invoke the suggested commands. The `suggest-tests` crate is where the