diff --git a/src/SUMMARY.md b/src/SUMMARY.md
index 56395b7..ced5985 100644
--- a/src/SUMMARY.md
+++ b/src/SUMMARY.md
@@ -1,98 +1,98 @@
 # The Rust Programming Language
 
-- [Introduction](introduction.md)
-    - [Installation](installation.md)
-    - [Hello, World!](hello-world.md)
-    - [The Design of Rust](design.md)
+- [Chapter 1 - Introduction](ch01-01-introduction.md)
+    - [Installation](ch01-02-installation.md)
+    - [Hello, World!](ch01-03-hello-world.md)
+    - [The Design of Rust](ch01-04-design.md)
 
-- [Tutorial]()
+- [Chapter 2 - Tutorial]()
 
-- [Up and Running](up-and-running.md)
-    - [Variable Bindings](variable-bindings.md)
-    - [Functions](functions.md)
-    - [Scalar Types](scalar-types.md)
-    - [Compound Types](compound-types.md)
-    - [Comments](comments.md)
-    - [Control flow with `if`](if.md)
-    - [Loops](loops.md)
+- [Chapter 3 - Up and Running](ch03-01-up-and-running.md)
+    - [Variable Bindings](ch03-02-variable-bindings.md)
+    - [Functions](ch03-03-functions.md)
+    - [Scalar Types](ch03-04-scalar-types.md)
+    - [Compound Types](ch03-05-compound-types.md)
+    - [Comments](ch03-06-comments.md)
+    - [Control flow with `if`](ch03-06-if.md)
+    - [Loops](ch03-07-loops.md)
 
-- [Understanding Ownership](understanding-ownership.md)
-    - [Ownership](ownership.md)
-    - [References & Borrowing](references-and-borrowing.md)
-    - [Slices](slices.md)
+- [Chapter 4 - Understanding Ownership](ch04-01-understanding-ownership.md)
+    - [Ownership](ch04-02-ownership.md)
+    - [References & Borrowing](ch04-03-references-and-borrowing.md)
+    - [Slices](ch04-04-slices.md)
 
-- [Structs](structs.md)
-    - [Method Syntax](method-syntax.md)
-    - [Generics](generics.md)
+- [Chapter 5 - Structs](ch05-01-structs.md)
+    - [Method Syntax](ch05-02-method-syntax.md)
+    - [Generics](ch05-03-generics.md)
     - [Advanced]()
 
-- [Enums](enums.md)
-    - [Option](option.md)
-    - [Match](match.md)
-    - [if let](if-let.md)
-    - [Patterns](patterns.md)
+- [Chapter 6 - Enums](ch06-01-enums.md)
+    - [Option](ch06-02-option.md)
+    - [Match](ch06-03-match.md)
+    - [if let](ch06-04-if-let.md)
+    - [Patterns](ch06-05-patterns.md)
 
-- [Crates & Modules]()
+- [Chapter 7 - Crates & Modules]()
 
-- [Error Handling]()
+- [Chapter 8 - Error Handling]()
 
-- [Basic Collections]()
+- [Chapter 9 - Basic Collections]()
     - [Vectors]()
     - [Strings]()
     - [`HashMap<K, V>`]()
 
-- [Lifetimes]()
+- [Chapter 10 - Lifetimes]()
 
-- [Traits]()
+- [Chapter 11 - Traits]()
 
-- [Closures]()
+- [Chapter 12 - Closures]()
 
-- [Iterators]()
+- [Chapter 13 - Iterators]()
 
-- [I/O]()
+- [Chapter 14 - I/O]()
     - [`Read` & `Write`]()
     - [`std::fs`]()
     - [`std::path`]()
     - [`std::env`]()
 
-- [Testing]()
+- [Chapter 15 - Testing]()
 
-- [Smart Pointers]()
+- [Chapter 16 - Smart Pointers]()
     - [`Deref`]()
     - [`Deref` coercions]()
     - [`Box<T>`]()
     - [`Rc<T>`]()
 
-- [Concurrency]()
+- [Chapter 17 - Concurrency]()
     - [Threads]()
     - [`Send` & `Sync`]()
     - [`Arc<T>`]()
     - [`Mutex<T>`]()
     - [`Channels`]()
 
-- [Unsafe Rust]()
+- [Chapter 18 - Unsafe Rust]()
     - [Raw Pointers]()
     - [transmute]()
 
-- [FFI]()
+- [Chapter 19 - FFI]()
     - [Conditional Compilation]()
     - [Bindings to C]()
     - [Using Rust from Other Languages]()
     - [`static`]()
 
-- [Cargo]()
+- [Chapter 20 - Cargo]()
     - [Crates.io]()
 
-- [Advanced Type System Features]()
+- [Chapter 21 - Advanced Type System Features]()
     - [Associated Types]()
     - [Trait Objects]()
     - [UFCS]()
     - [Coherence]()
 
-- [Interior mutability]()
+- [Chapter 22 - Interior mutability]()
     - [`Cell<T>`]()
     - [`RefCell<T>`]()
 
-- [Macros]()
+- [Chapter 23 - Macros]()
 
-- [Nightly Rust]()
+- [Chapter 24 - Nightly Rust]()
diff --git a/src/introduction.md b/src/ch01-01-introduction.md
similarity index 100%
rename from src/introduction.md
rename to src/ch01-01-introduction.md
diff --git a/src/installation.md b/src/ch01-02-installation.md
similarity index 100%
rename from src/installation.md
rename to src/ch01-02-installation.md
diff --git a/src/hello-world.md b/src/ch01-03-hello-world.md
similarity index 100%
rename from src/hello-world.md
rename to src/ch01-03-hello-world.md
diff --git a/src/design.md b/src/ch01-04-design.md
similarity index 100%
rename from src/design.md
rename to src/ch01-04-design.md
diff --git a/src/up-and-running.md b/src/ch03-01-up-and-running.md
similarity index 100%
rename from src/up-and-running.md
rename to src/ch03-01-up-and-running.md
diff --git a/src/variable-bindings.md b/src/ch03-02-variable-bindings.md
similarity index 100%
rename from src/variable-bindings.md
rename to src/ch03-02-variable-bindings.md
diff --git a/src/functions.md b/src/ch03-03-functions.md
similarity index 100%
rename from src/functions.md
rename to src/ch03-03-functions.md
diff --git a/src/scalar-types.md b/src/ch03-04-scalar-types.md
similarity index 100%
rename from src/scalar-types.md
rename to src/ch03-04-scalar-types.md
diff --git a/src/compound-types.md b/src/ch03-05-compound-types.md
similarity index 100%
rename from src/compound-types.md
rename to src/ch03-05-compound-types.md
diff --git a/src/comments.md b/src/ch03-06-comments.md
similarity index 100%
rename from src/comments.md
rename to src/ch03-06-comments.md
diff --git a/src/if.md b/src/ch03-06-if.md
similarity index 100%
rename from src/if.md
rename to src/ch03-06-if.md
diff --git a/src/loops.md b/src/ch03-07-loops.md
similarity index 100%
rename from src/loops.md
rename to src/ch03-07-loops.md
diff --git a/src/understanding-ownership.md b/src/ch04-01-understanding-ownership.md
similarity index 100%
rename from src/understanding-ownership.md
rename to src/ch04-01-understanding-ownership.md
diff --git a/src/ownership.md b/src/ch04-02-ownership.md
similarity index 100%
rename from src/ownership.md
rename to src/ch04-02-ownership.md
diff --git a/src/references-and-borrowing.md b/src/ch04-03-references-and-borrowing.md
similarity index 100%
rename from src/references-and-borrowing.md
rename to src/ch04-03-references-and-borrowing.md
diff --git a/src/slices.md b/src/ch04-04-slices.md
similarity index 100%
rename from src/slices.md
rename to src/ch04-04-slices.md
diff --git a/src/structs.md b/src/ch05-01-structs.md
similarity index 100%
rename from src/structs.md
rename to src/ch05-01-structs.md
diff --git a/src/method-syntax.md b/src/ch05-02-method-syntax.md
similarity index 100%
rename from src/method-syntax.md
rename to src/ch05-02-method-syntax.md
diff --git a/src/generics.md b/src/ch05-03-generics.md
similarity index 100%
rename from src/generics.md
rename to src/ch05-03-generics.md
diff --git a/src/enums.md b/src/ch06-01-enums.md
similarity index 100%
rename from src/enums.md
rename to src/ch06-01-enums.md
diff --git a/src/option.md b/src/ch06-02-option.md
similarity index 100%
rename from src/option.md
rename to src/ch06-02-option.md
diff --git a/src/match.md b/src/ch06-03-match.md
similarity index 100%
rename from src/match.md
rename to src/ch06-03-match.md
diff --git a/src/if-let.md b/src/ch06-04-match.md
similarity index 100%
rename from src/if-let.md
rename to src/ch06-04-match.md
diff --git a/src/patterns.md b/src/ch06-05-patterns.md
similarity index 100%
rename from src/patterns.md
rename to src/ch06-05-patterns.md