diff --git a/docs/manual/adapting-existing.md b/docs/adapting-existing.md
similarity index 99%
rename from docs/manual/adapting-existing.md
rename to docs/adapting-existing.md
index 3a1b8d69..cc4b76d2 100644
--- a/docs/manual/adapting-existing.md
+++ b/docs/adapting-existing.md
@@ -1,4 +1,12 @@
+---
+nav_order: 6
+---
+
 # Adapting existing mainstream distributions
+{: .no_toc }
+
+1. TOC
+{:toc}
 
 ## System layout
 
diff --git a/docs/manual/atomic-upgrades.md b/docs/atomic-upgrades.md
similarity index 99%
rename from docs/manual/atomic-upgrades.md
rename to docs/atomic-upgrades.md
index f2c01cc1..3ddd8b40 100644
--- a/docs/manual/atomic-upgrades.md
+++ b/docs/atomic-upgrades.md
@@ -1,4 +1,12 @@
+---
+nav_order: 5
+---
+
 # Atomic Upgrades
+{: .no_toc }
+
+1. TOC
+{:toc}
 
 ## You can turn off the power anytime you want...
 
diff --git a/docs/manual/buildsystem-and-repos.md b/docs/buildsystem-and-repos.md
similarity index 99%
rename from docs/manual/buildsystem-and-repos.md
rename to docs/buildsystem-and-repos.md
index fbae0322..6d506b4e 100644
--- a/docs/manual/buildsystem-and-repos.md
+++ b/docs/buildsystem-and-repos.md
@@ -1,4 +1,12 @@
+---
+nav_order: 8
+---
+
 # Writing a buildsystem and managing repositories
+{: .no_toc }
+
+1. TOC
+{:toc}
 
 OSTree is not a package system.  It does not directly support building
 source code.  Rather, it is a tool for transporting and managing
diff --git a/docs/manual/deployment.md b/docs/deployment.md
similarity index 99%
rename from docs/manual/deployment.md
rename to docs/deployment.md
index afbcbabb..1ea7ea46 100644
--- a/docs/manual/deployment.md
+++ b/docs/deployment.md
@@ -1,4 +1,12 @@
+---
+nav_order: 4
+---
+
 # Deployments
+{: .no_toc }
+
+1. TOC
+{:toc}
 
 ## Overview
 
diff --git a/docs/manual/formats.md b/docs/formats.md
similarity index 99%
rename from docs/manual/formats.md
rename to docs/formats.md
index 884b1b5e..36d395bd 100644
--- a/docs/manual/formats.md
+++ b/docs/formats.md
@@ -1,4 +1,12 @@
+---
+nav_order: 7
+---
+
 # OSTree data formats
+{: .no_toc }
+
+1. TOC
+{:toc}
 
 ## On the topic of "smart servers"
 
diff --git a/docs/manual/introduction.md b/docs/introduction.md
similarity index 99%
rename from docs/manual/introduction.md
rename to docs/introduction.md
index c0113f5d..a6fa2252 100644
--- a/docs/manual/introduction.md
+++ b/docs/introduction.md
@@ -1,4 +1,12 @@
+---
+nav_order: 2
+---
+
 # OSTree Overview
+{: .no_toc }
+
+1. TOC
+{:toc}
 
 ## Introduction
 
diff --git a/docs/manual/related-projects.md b/docs/related-projects.md
similarity index 99%
rename from docs/manual/related-projects.md
rename to docs/related-projects.md
index 429b46b9..7ddf043f 100644
--- a/docs/manual/related-projects.md
+++ b/docs/related-projects.md
@@ -1,4 +1,12 @@
+---
+nav_order: 10
+---
+
 # Related Projects
+{: .no_toc }
+
+1. TOC
+{:toc}
 
 OSTree is in many ways very evolutionary.  It builds on concepts and
 ideas introduced from many different projects such as
diff --git a/docs/manual/repo.md b/docs/repo.md
similarity index 99%
rename from docs/manual/repo.md
rename to docs/repo.md
index 8746163e..5cc59bf1 100644
--- a/docs/manual/repo.md
+++ b/docs/repo.md
@@ -1,4 +1,12 @@
+---
+nav_order: 3
+---
+
 # Anatomy of an OSTree repository
+{: .no_toc }
+
+1. TOC
+{:toc}
 
 ## Core object types and data model
 
diff --git a/docs/manual/repository-management.md b/docs/repository-management.md
similarity index 99%
rename from docs/manual/repository-management.md
rename to docs/repository-management.md
index 77519fb9..11fe2f40 100644
--- a/docs/manual/repository-management.md
+++ b/docs/repository-management.md
@@ -1,4 +1,12 @@
+---
+nav_order: 9
+---
+
 # Managing content in OSTree repositories
+{: .no_toc }
+
+1. TOC
+{:toc}
 
 Once you have a build system going, if you actually want client
 systems to retrieve the content, you will quickly feel a need for