diff --git a/src/doc/trpl/README.md b/src/doc/trpl/README.md
index 10b65b13f5a..eb9e2b24ac9 100644
--- a/src/doc/trpl/README.md
+++ b/src/doc/trpl/README.md
@@ -33,7 +33,3 @@ chapters focus on the most complex features, as well as some things that
 are only available in upcoming versions of Rust.
 
 After reading "Advanced," you'll be a Rust expert!
-
-<h2 class="section-header"><a href="internals.html">Internals</a></h2>
-
-This section is full of documentaion of compiler internals. Here be dragons.
diff --git a/src/doc/trpl/SUMMARY.md b/src/doc/trpl/SUMMARY.md
index a1212a94d8c..bfc1247dc3b 100644
--- a/src/doc/trpl/SUMMARY.md
+++ b/src/doc/trpl/SUMMARY.md
@@ -1,6 +1,6 @@
 # Summary
 
-* [The Basics](basic.md)
+* [I: The Basics](basic.md)
     * [Installing Rust](installing-rust.md)
     * [Hello, world!](hello-world.md)
     * [Hello, Cargo!](hello-cargo.md)
@@ -15,7 +15,7 @@
     * [Arrays, Vectors, and Slices](arrays-vectors-and-slices.md)
     * [Standard Input](standard-input.md)
     * [Guessing Game](guessing-game.md)
-* [Intermediate Rust](intermediate.md)
+* [II: Intermediate Rust](intermediate.md)
     * [More Strings](more-strings.md)
     * [Crates and Modules](crates-and-modules.md)
     * [Testing](testing.md)
@@ -31,16 +31,9 @@
     * [Concurrency](concurrency.md)
     * [Error Handling](error-handling.md)
     * [Documentation](documentation.md)
-* [Advanced Topics](advanced.md)
+* [III: Advanced Topics](advanced.md)
     * [FFI](ffi.md)
     * [Unsafe Code](unsafe.md)
     * [Macros](macros.md)
     * [Compiler Plugins](plugins.md)
-* [Compiler Internals](internals.md)
-    * [Borrow Checker](borrow-checker.md)
-    * [Trait Resolution](trait-resolution.md)
-    * [Inference](inference.md)
-    * [Higher Ranked Items](higher-ranked-items.md)
-    * [Region Inference](region-inference.md)
-    * [Method Lookup](method-lookup.md)
 * [Conclusion](conclusion.md)
diff --git a/src/doc/trpl/internals.md b/src/doc/trpl/internals.md
deleted file mode 100644
index f1914508658..00000000000
--- a/src/doc/trpl/internals.md
+++ /dev/null
@@ -1,4 +0,0 @@
-% Compiler Internals
-
-This section is full of stuff that's the most complex, and the most internal.
-Here be dragons.
diff --git a/src/doc/trpl/inference.md b/src/librustc/middle/infer/README.md
similarity index 100%
rename from src/doc/trpl/inference.md
rename to src/librustc/middle/infer/README.md
diff --git a/src/doc/trpl/higher-ranked-items.md b/src/librustc/middle/infer/higher_ranked/README.md
similarity index 100%
rename from src/doc/trpl/higher-ranked-items.md
rename to src/librustc/middle/infer/higher_ranked/README.md
diff --git a/src/librustc/middle/infer/mod.rs b/src/librustc/middle/infer/mod.rs
index 472bac40eee..f52da437c12 100644
--- a/src/librustc/middle/infer/mod.rs
+++ b/src/librustc/middle/infer/mod.rs
@@ -46,7 +46,6 @@ use self::unify::{UnificationTable, InferCtxtMethodsForSimplyUnifiableTypes};
 use self::error_reporting::ErrorReporting;
 
 pub mod combine;
-pub mod doc;
 pub mod equate;
 pub mod error_reporting;
 pub mod glb;
diff --git a/src/doc/trpl/region-inference.md b/src/librustc/middle/infer/region_inference/README.md
similarity index 100%
rename from src/doc/trpl/region-inference.md
rename to src/librustc/middle/infer/region_inference/README.md
diff --git a/src/doc/trpl/trait-resolution.md b/src/librustc/middle/traits/README.md
similarity index 100%
rename from src/doc/trpl/trait-resolution.md
rename to src/librustc/middle/traits/README.md
diff --git a/src/doc/trpl/borrow-checker.md b/src/librustc_borrowck/borrowck/README.md
similarity index 100%
rename from src/doc/trpl/borrow-checker.md
rename to src/librustc_borrowck/borrowck/README.md
diff --git a/src/librustc_borrowck/borrowck/mod.rs b/src/librustc_borrowck/borrowck/mod.rs
index 3bfb7ad40c5..10f32c76ebe 100644
--- a/src/librustc_borrowck/borrowck/mod.rs
+++ b/src/librustc_borrowck/borrowck/mod.rs
@@ -41,8 +41,6 @@ use syntax::visit;
 use syntax::visit::{Visitor, FnKind};
 use syntax::ast::{FnDecl, Block, NodeId};
 
-pub mod doc;
-
 pub mod check_loans;
 
 pub mod gather_loans;
diff --git a/src/doc/trpl/method-lookup.md b/src/librustc_typeck/check/method/README.md
similarity index 100%
rename from src/doc/trpl/method-lookup.md
rename to src/librustc_typeck/check/method/README.md