diff --git a/docs/manual/tutorials/autodj.md b/docs/Tutorials/autodj.md
similarity index 100%
rename from docs/manual/tutorials/autodj.md
rename to docs/Tutorials/autodj.md
diff --git a/docs/manual/tutorials/build-schedule.md b/docs/Tutorials/build-schedule.md
similarity index 100%
rename from docs/manual/tutorials/build-schedule.md
rename to docs/Tutorials/build-schedule.md
diff --git a/docs/manual/tutorials/install-vps.md b/docs/Tutorials/install-vps.md
similarity index 100%
rename from docs/manual/tutorials/install-vps.md
rename to docs/Tutorials/install-vps.md
diff --git a/docs/manual/tutorials/intro-playlist.md b/docs/Tutorials/intro-playlist.md
similarity index 100%
rename from docs/manual/tutorials/intro-playlist.md
rename to docs/Tutorials/intro-playlist.md
diff --git a/docs/manual/tutorials/livestream.md b/docs/Tutorials/livestream.md
similarity index 100%
rename from docs/manual/tutorials/livestream.md
rename to docs/Tutorials/livestream.md
diff --git a/docs/manual/tutorials/outro-playlist.md b/docs/Tutorials/outro-playlist.md
similarity index 100%
rename from docs/manual/tutorials/outro-playlist.md
rename to docs/Tutorials/outro-playlist.md
diff --git a/docs/manual/tutorials/podcast.md b/docs/Tutorials/podcast.md
similarity index 100%
rename from docs/manual/tutorials/podcast.md
rename to docs/Tutorials/podcast.md
diff --git a/docs/manual/tutorials/stream-settings.md b/docs/Tutorials/stream-settings.md
similarity index 100%
rename from docs/manual/tutorials/stream-settings.md
rename to docs/Tutorials/stream-settings.md
diff --git a/docs/manual/tutorials/top-of-hour-id.md b/docs/Tutorials/top-of-hour-id.md
similarity index 100%
rename from docs/manual/tutorials/top-of-hour-id.md
rename to docs/Tutorials/top-of-hour-id.md
diff --git a/docs/manual/tutorials/track-types.md b/docs/Tutorials/track-types.md
similarity index 100%
rename from docs/manual/tutorials/track-types.md
rename to docs/Tutorials/track-types.md
diff --git a/docs/manual/tutorials/underwriting.md b/docs/Tutorials/underwriting.md
similarity index 100%
rename from docs/manual/tutorials/underwriting.md
rename to docs/Tutorials/underwriting.md
diff --git a/docs/manual/tutorials/upload-promo.md b/docs/Tutorials/upload-promo.md
similarity index 100%
rename from docs/manual/tutorials/upload-promo.md
rename to docs/Tutorials/upload-promo.md
diff --git a/docs/manual/tutorials/upload-tracks.md b/docs/Tutorials/upload-tracks.md
similarity index 100%
rename from docs/manual/tutorials/upload-tracks.md
rename to docs/Tutorials/upload-tracks.md
diff --git a/docs/manual/tutorials/webstream-link.md b/docs/Tutorials/webstream-link.md
similarity index 100%
rename from docs/manual/tutorials/webstream-link.md
rename to docs/Tutorials/webstream-link.md
diff --git a/docs/manual/tutorials/widgets.md b/docs/Tutorials/widgets.md
similarity index 100%
rename from docs/manual/tutorials/widgets.md
rename to docs/Tutorials/widgets.md
diff --git a/docs/_config.yml b/docs/_config.yml
index 8c73c4b64..f8b922cdc 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -12,11 +12,11 @@ navigation:
   url: install
 - text: Features
   url: features
-- text: Screenshots
-  url: screenshots
 - text: FAQ
   url: faq
 - text: Tutorials
-  subfolderitems:
-    - text: Auto DJ
-      url: manual/tutorials/autodj
\ No newline at end of file
+  url: tutorials
+- text: Docs
+  url: docstoc
+- text: On Air in 60 Seconds
+  url: on-air-in-60-seconds/index
\ No newline at end of file
diff --git a/docs/docstoc b/docs/docstoc
new file mode 100644
index 000000000..e69de29bb
diff --git a/docs/manual/on-air-in-60-seconds/index.md b/docs/on-air-in-60-seconds/index.md
similarity index 100%
rename from docs/manual/on-air-in-60-seconds/index.md
rename to docs/on-air-in-60-seconds/index.md
diff --git a/docs/manual/on-air-in-60-seconds/static/Screenshot558-Add_Show.png b/docs/on-air-in-60-seconds/static/Screenshot558-Add_Show.png
similarity index 100%
rename from docs/manual/on-air-in-60-seconds/static/Screenshot558-Add_Show.png
rename to docs/on-air-in-60-seconds/static/Screenshot558-Add_Show.png
diff --git a/docs/manual/on-air-in-60-seconds/static/Screenshot559-Log_in.png b/docs/on-air-in-60-seconds/static/Screenshot559-Log_in.png
similarity index 100%
rename from docs/manual/on-air-in-60-seconds/static/Screenshot559-Log_in.png
rename to docs/on-air-in-60-seconds/static/Screenshot559-Log_in.png
diff --git a/docs/manual/on-air-in-60-seconds/static/Screenshot560-Show_when.png b/docs/on-air-in-60-seconds/static/Screenshot560-Show_when.png
similarity index 100%
rename from docs/manual/on-air-in-60-seconds/static/Screenshot560-Show_when.png
rename to docs/on-air-in-60-seconds/static/Screenshot560-Show_when.png
diff --git a/docs/manual/on-air-in-60-seconds/static/Screenshot561-Add_show_content.png b/docs/on-air-in-60-seconds/static/Screenshot561-Add_show_content.png
similarity index 100%
rename from docs/manual/on-air-in-60-seconds/static/Screenshot561-Add_show_content.png
rename to docs/on-air-in-60-seconds/static/Screenshot561-Add_show_content.png
diff --git a/docs/manual/on-air-in-60-seconds/static/Screenshot562-Drag_show_content.png b/docs/on-air-in-60-seconds/static/Screenshot562-Drag_show_content.png
similarity index 100%
rename from docs/manual/on-air-in-60-seconds/static/Screenshot562-Drag_show_content.png
rename to docs/on-air-in-60-seconds/static/Screenshot562-Drag_show_content.png
diff --git a/docs/manual/on-air-in-60-seconds/static/Screenshot563-Listen.png b/docs/on-air-in-60-seconds/static/Screenshot563-Listen.png
similarity index 100%
rename from docs/manual/on-air-in-60-seconds/static/Screenshot563-Listen.png
rename to docs/on-air-in-60-seconds/static/Screenshot563-Listen.png
diff --git a/docs/manual/on-air-in-60-seconds/static/Select_files.png b/docs/on-air-in-60-seconds/static/Select_files.png
similarity index 100%
rename from docs/manual/on-air-in-60-seconds/static/Select_files.png
rename to docs/on-air-in-60-seconds/static/Select_files.png
diff --git a/docs/manual/tutorials/index.md b/docs/tutorials.md
similarity index 100%
rename from docs/manual/tutorials/index.md
rename to docs/tutorials.md