diff --git a/latest/contributing.html b/latest/contributing.html
index 9a9454ff..80c0d03e 100644
--- a/latest/contributing.html
+++ b/latest/contributing.html
@@ -48,19 +48,26 @@ Home
           </a>
         </li>
         <li>
-          <a class="toctext" href="manual/basics.html">
+          <span class="toctext">
+Building Models
+          </span>
+          <ul>
+            <li>
+              <a class="toctext" href="models/basics.html">
 First Steps
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="manual/recurrent.html">
+              </a>
+            </li>
+            <li>
+              <a class="toctext" href="models/recurrent.html">
 Recurrence
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="manual/debugging.html">
+              </a>
+            </li>
+            <li>
+              <a class="toctext" href="models/debugging.html">
 Debugging
-          </a>
+              </a>
+            </li>
+          </ul>
         </li>
         <li>
           <span class="toctext">
@@ -97,7 +104,7 @@ Contributing &amp; Help
               </a>
             </li>
           </ul>
-          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/2b25491e40f2d595f063497a32f52227bca84f12/docs/src/contributing.md">
+          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/d6bc10e3be6f43cec501ff6720cc2386284d0963/docs/src/contributing.md">
             <span class="fa">
 
             </span>
diff --git a/latest/examples/logreg.html b/latest/examples/logreg.html
index 7c12f1ab..f4e95dfc 100644
--- a/latest/examples/logreg.html
+++ b/latest/examples/logreg.html
@@ -48,19 +48,26 @@ Home
           </a>
         </li>
         <li>
-          <a class="toctext" href="../manual/basics.html">
+          <span class="toctext">
+Building Models
+          </span>
+          <ul>
+            <li>
+              <a class="toctext" href="../models/basics.html">
 First Steps
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="../manual/recurrent.html">
+              </a>
+            </li>
+            <li>
+              <a class="toctext" href="../models/recurrent.html">
 Recurrence
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="../manual/debugging.html">
+              </a>
+            </li>
+            <li>
+              <a class="toctext" href="../models/debugging.html">
 Debugging
-          </a>
+              </a>
+            </li>
+          </ul>
         </li>
         <li>
           <span class="toctext">
@@ -100,7 +107,7 @@ Logistic Regression
               </a>
             </li>
           </ul>
-          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/2b25491e40f2d595f063497a32f52227bca84f12/docs/src/examples/logreg.md">
+          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/d6bc10e3be6f43cec501ff6720cc2386284d0963/docs/src/examples/logreg.md">
             <span class="fa">
 
             </span>
@@ -119,7 +126,7 @@ Logistic Regression with MNIST
       </p>
       <footer>
         <hr/>
-        <a class="previous" href="../manual/debugging.html">
+        <a class="previous" href="../models/debugging.html">
           <span class="direction">
 Previous
           </span>
diff --git a/latest/index.html b/latest/index.html
index 904c655a..85376783 100644
--- a/latest/index.html
+++ b/latest/index.html
@@ -49,19 +49,26 @@ Home
           <ul class="internal"></ul>
         </li>
         <li>
-          <a class="toctext" href="manual/basics.html">
+          <span class="toctext">
+Building Models
+          </span>
+          <ul>
+            <li>
+              <a class="toctext" href="models/basics.html">
 First Steps
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="manual/recurrent.html">
+              </a>
+            </li>
+            <li>
+              <a class="toctext" href="models/recurrent.html">
 Recurrence
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="manual/debugging.html">
+              </a>
+            </li>
+            <li>
+              <a class="toctext" href="models/debugging.html">
 Debugging
-          </a>
+              </a>
+            </li>
+          </ul>
         </li>
         <li>
           <span class="toctext">
@@ -97,7 +104,7 @@ Home
               </a>
             </li>
           </ul>
-          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/2b25491e40f2d595f063497a32f52227bca84f12/docs/src/index.md">
+          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/d6bc10e3be6f43cec501ff6720cc2386284d0963/docs/src/index.md">
             <span class="fa">
 
             </span>
@@ -129,7 +136,7 @@ does
       </p>
       <footer>
         <hr/>
-        <a class="next" href="manual/basics.html">
+        <a class="next" href="models/basics.html">
           <span class="direction">
 Next
           </span>
diff --git a/latest/internals.html b/latest/internals.html
index c73eeae6..a65e02b1 100644
--- a/latest/internals.html
+++ b/latest/internals.html
@@ -48,19 +48,26 @@ Home
           </a>
         </li>
         <li>
-          <a class="toctext" href="manual/basics.html">
+          <span class="toctext">
+Building Models
+          </span>
+          <ul>
+            <li>
+              <a class="toctext" href="models/basics.html">
 First Steps
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="manual/recurrent.html">
+              </a>
+            </li>
+            <li>
+              <a class="toctext" href="models/recurrent.html">
 Recurrence
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="manual/debugging.html">
+              </a>
+            </li>
+            <li>
+              <a class="toctext" href="models/debugging.html">
 Debugging
-          </a>
+              </a>
+            </li>
+          </ul>
         </li>
         <li>
           <span class="toctext">
@@ -97,7 +104,7 @@ Internals
               </a>
             </li>
           </ul>
-          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/2b25491e40f2d595f063497a32f52227bca84f12/docs/src/internals.md">
+          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/d6bc10e3be6f43cec501ff6720cc2386284d0963/docs/src/internals.md">
             <span class="fa">
 
             </span>
diff --git a/latest/manual/basics.html b/latest/models/basics.html
similarity index 89%
rename from latest/manual/basics.html
rename to latest/models/basics.html
index bc25f778..25cedcf8 100644
--- a/latest/manual/basics.html
+++ b/latest/models/basics.html
@@ -47,48 +47,55 @@ Version
 Home
           </a>
         </li>
-        <li class="current">
-          <a class="toctext" href="basics.html">
+        <li>
+          <span class="toctext">
+Building Models
+          </span>
+          <ul>
+            <li class="current">
+              <a class="toctext" href="basics.html">
 First Steps
-          </a>
-          <ul class="internal">
-            <li>
-              <a class="toctext" href="#Installation-1">
+              </a>
+              <ul class="internal">
+                <li>
+                  <a class="toctext" href="#Installation-1">
 Installation
-              </a>
-            </li>
-            <li>
-              <a class="toctext" href="#The-Model-1">
+                  </a>
+                </li>
+                <li>
+                  <a class="toctext" href="#The-Model-1">
 The Model
-              </a>
-            </li>
-            <li>
-              <a class="toctext" href="#Combining-Models-1">
+                  </a>
+                </li>
+                <li>
+                  <a class="toctext" href="#Combining-Models-1">
 Combining Models
-              </a>
-            </li>
-            <li>
-              <a class="toctext" href="#A-Function-in-Model's-Clothing-1">
+                  </a>
+                </li>
+                <li>
+                  <a class="toctext" href="#A-Function-in-Model's-Clothing-1">
 A Function in Model&#39;s Clothing
+                  </a>
+                </li>
+                <li>
+                  <a class="toctext" href="#The-Template-1">
+The Template
+                  </a>
+                </li>
+              </ul>
+            </li>
+            <li>
+              <a class="toctext" href="recurrent.html">
+Recurrence
               </a>
             </li>
             <li>
-              <a class="toctext" href="#The-Template-1">
-The Template
+              <a class="toctext" href="debugging.html">
+Debugging
               </a>
             </li>
           </ul>
         </li>
-        <li>
-          <a class="toctext" href="recurrent.html">
-Recurrence
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="debugging.html">
-Debugging
-          </a>
-        </li>
         <li>
           <span class="toctext">
 In Action
@@ -118,12 +125,15 @@ Internals
         <nav>
           <ul>
             <li>
+Building Models
+            </li>
+            <li>
               <a href="basics.html">
 First Steps
               </a>
             </li>
           </ul>
-          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/2b25491e40f2d595f063497a32f52227bca84f12/docs/src/manual/basics.md">
+          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/d6bc10e3be6f43cec501ff6720cc2386284d0963/docs/src/models/basics.md">
             <span class="fa">
 
             </span>
diff --git a/latest/manual/debugging.html b/latest/models/debugging.html
similarity index 85%
rename from latest/manual/debugging.html
rename to latest/models/debugging.html
index 762d0acb..4d9d063e 100644
--- a/latest/manual/debugging.html
+++ b/latest/models/debugging.html
@@ -48,20 +48,27 @@ Home
           </a>
         </li>
         <li>
-          <a class="toctext" href="basics.html">
+          <span class="toctext">
+Building Models
+          </span>
+          <ul>
+            <li>
+              <a class="toctext" href="basics.html">
 First Steps
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="recurrent.html">
+              </a>
+            </li>
+            <li>
+              <a class="toctext" href="recurrent.html">
 Recurrence
-          </a>
-        </li>
-        <li class="current">
-          <a class="toctext" href="debugging.html">
+              </a>
+            </li>
+            <li class="current">
+              <a class="toctext" href="debugging.html">
 Debugging
-          </a>
-          <ul class="internal"></ul>
+              </a>
+              <ul class="internal"></ul>
+            </li>
+          </ul>
         </li>
         <li>
           <span class="toctext">
@@ -92,12 +99,15 @@ Internals
         <nav>
           <ul>
             <li>
+Building Models
+            </li>
+            <li>
               <a href="debugging.html">
 Debugging
               </a>
             </li>
           </ul>
-          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/2b25491e40f2d595f063497a32f52227bca84f12/docs/src/manual/debugging.md">
+          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/d6bc10e3be6f43cec501ff6720cc2386284d0963/docs/src/models/debugging.md">
             <span class="fa">
 
             </span>
diff --git a/latest/manual/recurrent.html b/latest/models/recurrent.html
similarity index 85%
rename from latest/manual/recurrent.html
rename to latest/models/recurrent.html
index 98fc8679..799ceceb 100644
--- a/latest/manual/recurrent.html
+++ b/latest/models/recurrent.html
@@ -48,20 +48,27 @@ Home
           </a>
         </li>
         <li>
-          <a class="toctext" href="basics.html">
+          <span class="toctext">
+Building Models
+          </span>
+          <ul>
+            <li>
+              <a class="toctext" href="basics.html">
 First Steps
-          </a>
-        </li>
-        <li class="current">
-          <a class="toctext" href="recurrent.html">
+              </a>
+            </li>
+            <li class="current">
+              <a class="toctext" href="recurrent.html">
 Recurrence
-          </a>
-          <ul class="internal"></ul>
-        </li>
-        <li>
-          <a class="toctext" href="debugging.html">
+              </a>
+              <ul class="internal"></ul>
+            </li>
+            <li>
+              <a class="toctext" href="debugging.html">
 Debugging
-          </a>
+              </a>
+            </li>
+          </ul>
         </li>
         <li>
           <span class="toctext">
@@ -92,12 +99,15 @@ Internals
         <nav>
           <ul>
             <li>
+Building Models
+            </li>
+            <li>
               <a href="recurrent.html">
 Recurrence
               </a>
             </li>
           </ul>
-          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/2b25491e40f2d595f063497a32f52227bca84f12/docs/src/manual/recurrent.md">
+          <a class="edit-page" href="https://github.com/MikeInnes/Flux.jl/tree/d6bc10e3be6f43cec501ff6720cc2386284d0963/docs/src/models/recurrent.md">
             <span class="fa">
 
             </span>
diff --git a/latest/search.html b/latest/search.html
index 63be5398..b7f17283 100644
--- a/latest/search.html
+++ b/latest/search.html
@@ -48,19 +48,26 @@ Home
           </a>
         </li>
         <li>
-          <a class="toctext" href="manual/basics.html">
+          <span class="toctext">
+Building Models
+          </span>
+          <ul>
+            <li>
+              <a class="toctext" href="models/basics.html">
 First Steps
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="manual/recurrent.html">
+              </a>
+            </li>
+            <li>
+              <a class="toctext" href="models/recurrent.html">
 Recurrence
-          </a>
-        </li>
-        <li>
-          <a class="toctext" href="manual/debugging.html">
+              </a>
+            </li>
+            <li>
+              <a class="toctext" href="models/debugging.html">
 Debugging
-          </a>
+              </a>
+            </li>
+          </ul>
         </li>
         <li>
           <span class="toctext">
diff --git a/latest/search_index.js b/latest/search_index.js
index c3a38704..f742e47e 100644
--- a/latest/search_index.js
+++ b/latest/search_index.js
@@ -17,7 +17,7 @@ var documenterSearchIndex = {"docs": [
 },
 
 {
-    "location": "manual/basics.html#",
+    "location": "models/basics.html#",
     "page": "First Steps",
     "title": "First Steps",
     "category": "page",
@@ -25,7 +25,7 @@ var documenterSearchIndex = {"docs": [
 },
 
 {
-    "location": "manual/basics.html#First-Steps-1",
+    "location": "models/basics.html#First-Steps-1",
     "page": "First Steps",
     "title": "First Steps",
     "category": "section",
@@ -33,7 +33,7 @@ var documenterSearchIndex = {"docs": [
 },
 
 {
-    "location": "manual/basics.html#Installation-1",
+    "location": "models/basics.html#Installation-1",
     "page": "First Steps",
     "title": "Installation",
     "category": "section",
@@ -41,7 +41,7 @@ var documenterSearchIndex = {"docs": [
 },
 
 {
-    "location": "manual/basics.html#The-Model-1",
+    "location": "models/basics.html#The-Model-1",
     "page": "First Steps",
     "title": "The Model",
     "category": "section",
@@ -49,7 +49,7 @@ var documenterSearchIndex = {"docs": [
 },
 
 {
-    "location": "manual/basics.html#Combining-Models-1",
+    "location": "models/basics.html#Combining-Models-1",
     "page": "First Steps",
     "title": "Combining Models",
     "category": "section",
@@ -57,7 +57,7 @@ var documenterSearchIndex = {"docs": [
 },
 
 {
-    "location": "manual/basics.html#A-Function-in-Model's-Clothing-1",
+    "location": "models/basics.html#A-Function-in-Model's-Clothing-1",
     "page": "First Steps",
     "title": "A Function in Model's Clothing",
     "category": "section",
@@ -65,7 +65,7 @@ var documenterSearchIndex = {"docs": [
 },
 
 {
-    "location": "manual/basics.html#The-Template-1",
+    "location": "models/basics.html#The-Template-1",
     "page": "First Steps",
     "title": "The Template",
     "category": "section",
@@ -73,7 +73,7 @@ var documenterSearchIndex = {"docs": [
 },
 
 {
-    "location": "manual/recurrent.html#",
+    "location": "models/recurrent.html#",
     "page": "Recurrence",
     "title": "Recurrence",
     "category": "page",
@@ -81,7 +81,7 @@ var documenterSearchIndex = {"docs": [
 },
 
 {
-    "location": "manual/recurrent.html#Recurrent-Models-1",
+    "location": "models/recurrent.html#Recurrent-Models-1",
     "page": "Recurrence",
     "title": "Recurrent Models",
     "category": "section",
@@ -89,7 +89,7 @@ var documenterSearchIndex = {"docs": [
 },
 
 {
-    "location": "manual/debugging.html#",
+    "location": "models/debugging.html#",
     "page": "Debugging",
     "title": "Debugging",
     "category": "page",
@@ -97,7 +97,7 @@ var documenterSearchIndex = {"docs": [
 },
 
 {
-    "location": "manual/debugging.html#Debugging-Models-1",
+    "location": "models/debugging.html#Debugging-Models-1",
     "page": "Debugging",
     "title": "Debugging Models",
     "category": "section",