diff --git a/src/rust-2018/control-flow/index.md b/src/rust-2018/control-flow/index.md
index a274d788..7ed71b0c 100644
--- a/src/rust-2018/control-flow/index.md
+++ b/src/rust-2018/control-flow/index.md
@@ -1,6 +1,6 @@
 # Control flow
 
-[async_await]: rust-2018/control-flow/async-await-for-easier-concurrency.html
+[async_await]: async-await-for-easier-concurrency.html
 
 In this chapter of the guide, we discuss a few improvements to control flow.
-The most notable of these *will* be [`async` and `await`][async_await].
\ No newline at end of file
+The most notable of these *will* be [`async` and `await`][async_await].
diff --git a/src/rust-2018/data-types/index.md b/src/rust-2018/data-types/index.md
index 369680bd..8a81aeb0 100644
--- a/src/rust-2018/data-types/index.md
+++ b/src/rust-2018/data-types/index.md
@@ -1,6 +1,6 @@
 # Data types
 
-[fis]: rust-2018/data-types/field-init-shorthand.html
+[fis]: field-init-shorthand.html
 
 In this chapter of the guide, we discuss a few improvements to data types.
-One of these are [field-init-shorthand][fis].
\ No newline at end of file
+One of these are [field-init-shorthand][fis].
diff --git a/src/rust-2018/documentation/index.md b/src/rust-2018/documentation/index.md
index 60726060..b9bf78ed 100644
--- a/src/rust-2018/documentation/index.md
+++ b/src/rust-2018/documentation/index.md
@@ -1,6 +1,6 @@
 # Documentation
 
-[sec_ed]: rust-2018/documentation/new-editions-of-the-book.html
+[sec_ed]: new-editions-of-the-book.html
 
 In this chapter of the guide, we discuss a few improvements to documentation.
-A notable addition here is the [second edition of "the book"][sec_ed].
\ No newline at end of file
+A notable addition here is the [second edition of "the book"][sec_ed].
diff --git a/src/rust-2018/error-handling-and-panics/index.md b/src/rust-2018/error-handling-and-panics/index.md
index f9792db7..1c229fa6 100644
--- a/src/rust-2018/error-handling-and-panics/index.md
+++ b/src/rust-2018/error-handling-and-panics/index.md
@@ -1,6 +1,6 @@
 # Error handling and Panics
 
-[qop]: rust-2018/error-handling-and-panics/the-question-mark-operator-for-easier-error-handling.html
+[qop]: the-question-mark-operator-for-easier-error-handling.html
 
 In this chapter of the guide, we discuss a few improvements to error handling
-in Rust. The most notable of these is [the introduction of the `?` operator][qop].
\ No newline at end of file
+in Rust. The most notable of these is [the introduction of the `?` operator][qop].
diff --git a/src/rust-2018/macros/index.md b/src/rust-2018/macros/index.md
index 3a37a270..2f978dbf 100644
--- a/src/rust-2018/macros/index.md
+++ b/src/rust-2018/macros/index.md
@@ -1,6 +1,6 @@
 # Macros
 
-[custom-derive]: rust-2018/macros/custom-derive.html
+[custom-derive]: custom-derive.html
 
 In this chapter of the guide, we discuss a few improvements to the macro system.
-A notable addition here is the introduction of [custom derive macros][custom-derive].
\ No newline at end of file
+A notable addition here is the introduction of [custom derive macros][custom-derive].
diff --git a/src/rust-2018/module-system/index.md b/src/rust-2018/module-system/index.md
index 79a1b66a..f4653b49 100644
--- a/src/rust-2018/module-system/index.md
+++ b/src/rust-2018/module-system/index.md
@@ -1,6 +1,6 @@
 # Module system
 
-[path clarity changes]: rust-2018/module-system/path-clarity.html
+[path clarity changes]: path-clarity.html
 
 In this chapter of the guide, we discuss a few changes to the module system.
-The most notable of these are the [path clarity changes].
\ No newline at end of file
+The most notable of these are the [path clarity changes].
diff --git a/src/rust-2018/module-system/path-clarity.md b/src/rust-2018/module-system/path-clarity.md
index 7a5b4793..87e75b40 100644
--- a/src/rust-2018/module-system/path-clarity.md
+++ b/src/rust-2018/module-system/path-clarity.md
@@ -93,7 +93,7 @@ Finally, on nightly, you'll need it for crates like:
 #### Macros
 
 One other use for `extern crate` was to import macros; that's no longer needed.
-Check [the macro section](rust-2018/macros/macro-changes.html) for more.
+Check [the macro section](../macros/macro-changes.html) for more.
 
 If you've been using `as` to rename your crate like this:
 
diff --git a/src/rust-2018/ownership-and-lifetimes/index.md b/src/rust-2018/ownership-and-lifetimes/index.md
index a8cfb0fa..168f7d8a 100644
--- a/src/rust-2018/ownership-and-lifetimes/index.md
+++ b/src/rust-2018/ownership-and-lifetimes/index.md
@@ -1,6 +1,6 @@
 # Ownership and lifetimes
 
-[dmbm]: rust-2018/ownership-and-lifetimes/default-match-bindings.html
+[dmbm]: default-match-bindings.html
 
 In this chapter of the guide, we discuss a few improvements to ownership and lifetimes.
 One of the most notable of these is [default match binding modes][dmbm].
diff --git a/src/rust-2018/ownership-and-lifetimes/lifetime-elision-in-impl.md b/src/rust-2018/ownership-and-lifetimes/lifetime-elision-in-impl.md
index a3a45ced..0708b8d0 100644
--- a/src/rust-2018/ownership-and-lifetimes/lifetime-elision-in-impl.md
+++ b/src/rust-2018/ownership-and-lifetimes/lifetime-elision-in-impl.md
@@ -72,4 +72,4 @@ impl<T> Drop for SetOnDrop<'_, T> {
 }
 ```
 
-[the anonymous lifetime]: rust-2018/ownership-and-lifetimes/the-anonymous-lifetime.html
\ No newline at end of file
+[the anonymous lifetime]: the-anonymous-lifetime.html
diff --git a/src/rust-2018/platform-and-target-support/index.md b/src/rust-2018/platform-and-target-support/index.md
index 2efae82c..fa6ae0ed 100644
--- a/src/rust-2018/platform-and-target-support/index.md
+++ b/src/rust-2018/platform-and-target-support/index.md
@@ -1,6 +1,6 @@
 # Platform and target support
 
-[libcore]: rust-2018/platform-and-target-support/libcore-for-low-level-rust.html
+[libcore]: libcore-for-low-level-rust.html
 
 In this chapter of the guide, we discuss a few improvements to platform and target support.
-A notable addition to it was [that the `libcore` library now works on stable Rust][libcore].
\ No newline at end of file
+A notable addition to it was [that the `libcore` library now works on stable Rust][libcore].
diff --git a/src/rust-2018/rustdoc/index.md b/src/rust-2018/rustdoc/index.md
index 200fb59c..9f9554d2 100644
--- a/src/rust-2018/rustdoc/index.md
+++ b/src/rust-2018/rustdoc/index.md
@@ -1,6 +1,6 @@
 # `rustdoc`
 
-[cf]: rust-2018/rustdoc/documentation-tests-can-now-compile-fail.html
+[cf]: documentation-tests-can-now-compile-fail.html
 
 In this chapter of the guide, we discuss a few improvements to `rustdoc`.
-A notable addition to it was [that documentation tests can now compile-fail][cf].
\ No newline at end of file
+A notable addition to it was [that documentation tests can now compile-fail][cf].
diff --git a/src/rust-2018/the-compiler/index.md b/src/rust-2018/the-compiler/index.md
index fe9b8168..82f76eb7 100644
--- a/src/rust-2018/the-compiler/index.md
+++ b/src/rust-2018/the-compiler/index.md
@@ -1,6 +1,6 @@
 # The compiler
 
-[errors]: rust-2018/the-compiler/improved-error-messages.html
+[errors]: improved-error-messages.html
 
 In this chapter of the guide, we discuss a few improvements to the compiler.
-A notable addition here is our new and [improved error messages][errors].
\ No newline at end of file
+A notable addition here is our new and [improved error messages][errors].
diff --git a/src/rust-2018/trait-system/dyn-trait-for-trait-objects.md b/src/rust-2018/trait-system/dyn-trait-for-trait-objects.md
index c76f0c55..d43e2e18 100644
--- a/src/rust-2018/trait-system/dyn-trait-for-trait-objects.md
+++ b/src/rust-2018/trait-system/dyn-trait-for-trait-objects.md
@@ -36,7 +36,7 @@ is sometimes slower, and often cannot be used at all when its alternatives can.
 
 Furthermore, with `impl Trait` arriving, "`impl Trait` vs `dyn Trait`" is much
 more symmetric, and therefore a bit nicer, than "`impl Trait` vs `Trait`".
-`impl Trait` is explained [here](rust-2018/trait-system/impl-trait-for-returning-complex-types-with-ease.html)
+`impl Trait` is explained [here](impl-trait-for-returning-complex-types-with-ease.html)
 
 In the new edition, you should therefore prefer `dyn Trait` to just `Trait`
-where you need a trait object.
\ No newline at end of file
+where you need a trait object.
diff --git a/src/rust-2018/trait-system/index.md b/src/rust-2018/trait-system/index.md
index 722506ca..e6d48e35 100644
--- a/src/rust-2018/trait-system/index.md
+++ b/src/rust-2018/trait-system/index.md
@@ -1,6 +1,6 @@
 # Trait system
 
-[impl_trait]: rust-2018/trait-system/impl-trait-for-returning-complex-types-with-ease.html
+[impl_trait]: impl-trait-for-returning-complex-types-with-ease.html
 
 In this chapter of the guide, we discuss a few improvements to the trait system.
-The most notable of these is [`impl Trait`][impl_trait].
\ No newline at end of file
+The most notable of these is [`impl Trait`][impl_trait].