diff --git a/docs/README.md b/docs/README.md
index 38609c5850..c70176053d 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -9,18 +9,27 @@ NOTE: This documentation is a work-in-progress!
     - [Application Architecture](overview/apps.md) - Layers in the application architecture
 - [Install](install.md) - Install the library and example applications
 - [Core](core)
-    - [Messages](core/messages.md) - Messages contain the content of a transaction
-    - [Handlers](core/handlers.md) - Handlers are the workhorse of the app!
-    - [BaseApp](core/baseapp.md) - BaseApp is the base layer of the application
-    - [The MultiStore](core/multistore.md) - MultiStore is a rich Merkle database
-    - [Amino](core/amino.md) - Amino is the primary serialization library used in the SDK
-    - [Accounts](core/accounts.md) - Accounts are the prototypical object kept in the store
-    - [Transactions](core/transactions.md) - Transactions wrap messages and provide authentication
-    - [Keepers](core/keepers.md) - Keepers are the interfaces between handlers
-    - [Clients](core/clients.md) - Hook up your app to standard CLI and REST
-      interfaces for clients to use!
-    - [Advanced](core/advanced.md) - Trigger logic on a timer, use custom
-      serialization formats, advanced Merkle proofs, and more!
+    - [Introduction](core/intro.md) - Intro to the tutorial
+    - [App1 - The Basics](core/app1.md)
+        - [Messages](core/app1.md#messages) - Messages contain the content of a transaction
+        - [Handlers](core/app1.md#handlers) - Handlers are the workhorse of the app!
+        - [BaseApp](core/app1.md#baseapp) - BaseApp is the base layer of the application
+        - [The MultiStore](core/app1.md#multistore) - MultiStore is a rich Merkle database
+    - [App2 - Amino](core/app2.md)
+        - [Amino](core/app2.md#amino) - Amino is the primary serialization library used in the SDK
+    - [App3 - Authentication](core/app3.md)
+        - [Accounts](core/app3.md#accounts) - Accounts are the prototypical object kept in the store
+        - [Transactions](core/app3.md#transactions) - Transactions wrap messages and provide authentication
+    - [App4 - Modules and Keepers](core/app4.md)
+        - [Keepers](core/app4.md#keepers) - Keepers are the interfaces between handlers
+    - [App5 - Advanced](core/app5.md)
+        - [Validator Set Changes](core/app5.md#validators) - Change the
+          validator set 
+    - [App6 - Basecoin](core/app6.md) - 
+        - [Directory Structure](core/app6.md#directory-structure) - Keep your
+          application code organized
+        - [Clients](core/app6.md#clients) - Hook up your app to standard CLI and REST
+            interfaces for clients to use!
 
 - [Modules](modules)
     - [Bank](modules/bank.md)