diff --git a/pages/merlin6/code-of-conduct.md b/pages/merlin6/01 introduction/code-of-conduct.md
similarity index 100%
rename from pages/merlin6/code-of-conduct.md
rename to pages/merlin6/01 introduction/code-of-conduct.md
diff --git a/pages/merlin6/hardware-and-software-description.md b/pages/merlin6/01 introduction/hardware-and-software-description.md
similarity index 100%
rename from pages/merlin6/hardware-and-software-description.md
rename to pages/merlin6/01 introduction/hardware-and-software-description.md
diff --git a/pages/merlin6/introduction.md b/pages/merlin6/01 introduction/introduction.md
similarity index 100%
rename from pages/merlin6/introduction.md
rename to pages/merlin6/01 introduction/introduction.md
diff --git a/pages/merlin6/accessing-merlin6/accessing-interactive-nodes.md b/pages/merlin6/02 accessing-merlin6/accessing-interactive-nodes.md
similarity index 100%
rename from pages/merlin6/accessing-merlin6/accessing-interactive-nodes.md
rename to pages/merlin6/02 accessing-merlin6/accessing-interactive-nodes.md
diff --git a/pages/merlin6/accessing-merlin6/accessing-slurm.md b/pages/merlin6/02 accessing-merlin6/accessing-slurm.md
similarity index 100%
rename from pages/merlin6/accessing-merlin6/accessing-slurm.md
rename to pages/merlin6/02 accessing-merlin6/accessing-slurm.md
diff --git a/pages/merlin6/accessing-merlin6/merlin6-directories.md b/pages/merlin6/02 accessing-merlin6/merlin6-directories.md
similarity index 100%
rename from pages/merlin6/accessing-merlin6/merlin6-directories.md
rename to pages/merlin6/02 accessing-merlin6/merlin6-directories.md
diff --git a/pages/merlin6/accessing-merlin6/nomachine.md b/pages/merlin6/02 accessing-merlin6/nomachine.md
similarity index 100%
rename from pages/merlin6/accessing-merlin6/nomachine.md
rename to pages/merlin6/02 accessing-merlin6/nomachine.md
diff --git a/pages/merlin6/accessing-merlin6/requesting-accounts.md b/pages/merlin6/02 accessing-merlin6/requesting-accounts.md
similarity index 100%
rename from pages/merlin6/accessing-merlin6/requesting-accounts.md
rename to pages/merlin6/02 accessing-merlin6/requesting-accounts.md
diff --git a/pages/merlin6/accessing-merlin6/requesting-projects.md b/pages/merlin6/02 accessing-merlin6/requesting-projects.md
similarity index 100%
rename from pages/merlin6/accessing-merlin6/requesting-projects.md
rename to pages/merlin6/02 accessing-merlin6/requesting-projects.md
diff --git a/pages/merlin6/accessing-merlin6/transfer-data.md b/pages/merlin6/02 accessing-merlin6/transfer-data.md
similarity index 100%
rename from pages/merlin6/accessing-merlin6/transfer-data.md
rename to pages/merlin6/02 accessing-merlin6/transfer-data.md
diff --git a/pages/merlin6/merlin6-slurm/running-jobs.md b/pages/merlin6/03 merlin6-slurm/running-jobs.md
similarity index 100%
rename from pages/merlin6/merlin6-slurm/running-jobs.md
rename to pages/merlin6/03 merlin6-slurm/running-jobs.md
diff --git a/pages/merlin6/merlin6-slurm/slurm-basic-commands.md b/pages/merlin6/03 merlin6-slurm/slurm-basic-commands.md
similarity index 100%
rename from pages/merlin6/merlin6-slurm/slurm-basic-commands.md
rename to pages/merlin6/03 merlin6-slurm/slurm-basic-commands.md
diff --git a/pages/merlin6/merlin6-slurm/slurm-configuration.md b/pages/merlin6/03 merlin6-slurm/slurm-configuration.md
similarity index 100%
rename from pages/merlin6/merlin6-slurm/slurm-configuration.md
rename to pages/merlin6/03 merlin6-slurm/slurm-configuration.md
diff --git a/pages/merlin6/merlin6-slurm/slurm-examples.md b/pages/merlin6/03 merlin6-slurm/slurm-examples.md
similarity index 100%
rename from pages/merlin6/merlin6-slurm/slurm-examples.md
rename to pages/merlin6/03 merlin6-slurm/slurm-examples.md
diff --git a/pages/merlin6/merlin6-slurm/using-modules.md b/pages/merlin6/03 merlin6-slurm/using-modules.md
similarity index 100%
rename from pages/merlin6/merlin6-slurm/using-modules.md
rename to pages/merlin6/03 merlin6-slurm/using-modules.md
diff --git a/pages/merlin6/jupyterhub/jupyterhub.md b/pages/merlin6/04 jupyterhub/jupyterhub.md
similarity index 100%
rename from pages/merlin6/jupyterhub/jupyterhub.md
rename to pages/merlin6/04 jupyterhub/jupyterhub.md
diff --git a/pages/merlin6/announcements/downtimes.md b/pages/merlin6/05 announcements/downtimes.md
similarity index 100%
rename from pages/merlin6/announcements/downtimes.md
rename to pages/merlin6/05 announcements/downtimes.md
diff --git a/pages/merlin6/contact.md b/pages/merlin6/06 support/contact.md
similarity index 100%
rename from pages/merlin6/contact.md
rename to pages/merlin6/06 support/contact.md
diff --git a/pages/merlin6/known-problems.md b/pages/merlin6/06 support/known-problems.md
similarity index 100%
rename from pages/merlin6/known-problems.md
rename to pages/merlin6/06 support/known-problems.md
diff --git a/pages/merlin6/migration-from-merlin5.md b/pages/merlin6/06 support/migration-from-merlin5.md
similarity index 100%
rename from pages/merlin6/migration-from-merlin5.md
rename to pages/merlin6/06 support/migration-from-merlin5.md
diff --git a/pages/merlin6/troubleshooting.md b/pages/merlin6/06 support/troubleshooting.md
similarity index 100%
rename from pages/merlin6/troubleshooting.md
rename to pages/merlin6/06 support/troubleshooting.md
diff --git a/pages/merlin6/merlin6-user-guide.md b/pages/merlin6/merlin6-user-guide.md
deleted file mode 100644
index c47b02a..0000000
--- a/pages/merlin6/merlin6-user-guide.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: Merlin6 User Guide
-#tags:
-#keywords:
-last_updated: 13 June 2019
-#summary: "Merlin 6 cluster overview"
-sidebar: merlin6_sidebar
-permalink: /merlin6/user-guide.html
----
-
-# Merlin6 User Guide
-
-Wellcome to the PSI Merlin6 Cluster.
diff --git a/siteinfo.md b/siteinfo.md
index 3c2039a..5711d8e 100644
--- a/siteinfo.md
+++ b/siteinfo.md
@@ -6,6 +6,8 @@ permalink: siteinfo.html
 
 ## Site
 
+Some information about this jekyll site (for debugging):
+
 - site.port: {{site.port}}
 - site.host: {{site.host}}
 - site.url: {{site.url}}
@@ -24,27 +26,27 @@ Link processing in Jekyll
 
 Code | Result | Baseurl
 ---- | ------ | -------
-`{%raw%}[Normal link to source]{%endraw%}{%raw%}(/pages/merlin6/introduction.md){%endraw%}`   | [Normal link to source](/pages/merlin6/introduction.md)                 | ✅
+`{%raw%}[Normal link to source]{%endraw%}{%raw%}(/pages/merlin6/01 introduction/introduction.md){%endraw%}`   | [Normal link to source](/pages/merlin6/01 introduction/introduction.md)                 | ✅
 `{%raw%}[Normal link to result](/merlin6/introduction.html){%endraw%}`                        | [Normal link to result](/merlin6/introduction.html)                     | ❌
-`{%raw%}[Invalid Escaped link to source]({{"/pages/merlin6/introduction.md"}}){%endraw%}`     | [Invalid Escaped link to source]({{"/pages/merlin6/introduction.md"}})  | ❌❗
+`{%raw%}[Invalid Escaped link to source]({{"/pages/merlin6/01 introduction/introduction.md"}}){%endraw%}`     | [Invalid Escaped link to source]({{"/pages/merlin6/01 introduction/introduction.md"}})  | ❌❗
 `{%raw%}[Escaped link to result]({{"/merlin6/introduction.html"}}){%endraw%}`                 | [Escaped link to result]({{"/merlin6/introduction.html"}})              | ❌
 `{%raw%}[Reference link to source](srcRef){%endraw%}`                                         | [Reference link to source][srcRef]                                      | ✅
 `{%raw%}[Reference link to result](dstRef){%endraw%}`                                         | [Reference link to result][dstRef]                                      | ❌
-`{%raw%}[Liquid Link]({% link pages/merlin6/introduction.md %}){%endraw%}`                    | [Liquid Link]({% link pages/merlin6/introduction.md %})                 | ❌
+`{%raw%}[Liquid Link]({% link pages/merlin6/01 introduction/introduction.md %}){%endraw%}`                    | [Liquid Link]({% link pages/merlin6/01 introduction/introduction.md %})                 | ❌
 `{%raw%}![PSI Logo](/images/psi-logo.png){%endraw%}`                                          | ![PSI Logo](/images/psi-logo.png)                                       | ✅
 `{%raw%}![Escaped PSI Logo]({{ "/images/psi-logo.png" }}){%endraw%}`                          | ![PSI Logo from liquid]({{ "/images/psi-logo.png" }})                   | ❌
 `{%raw%}{% include inline_image.html file="psi-logo.png" alt="Included PSI Logo" %}{%endraw%}`          | {% include inline_image.html file="psi-logo.png" alt="Included PSI Logo" -%} | | ❌
-`{%raw%}{{ "/pages/merlin6/introduction.md" | relative_url }}{%endraw%}`                      | {{ "/pages/merlin6/introduction.md" | relative_url }}                   | ✅❗
+`{%raw%}{{ "/pages/merlin6/01 introduction/introduction.md" | relative_url }}{%endraw%}`                      | {{ "/pages/merlin6/01 introduction/introduction.md" | relative_url }}                   | ✅❗
 `{%raw%}{{ "/merlin6/introduction.html" | relative_url }}{%endraw%}`                          | {{ "/merlin6/introduction.html" | relative_url }}                       | ✅
-`{%raw%}{% link pages/merlin6/introduction.md %}{%endraw%}`                                   | {% link pages/merlin6/introduction.md %}                                | ✅
+`{%raw%}{% link pages/merlin6/01 introduction/introduction.md %}{%endraw%}`                                   | {% link pages/merlin6/01 introduction/introduction.md %}                                | ✅
 
-[srcRef]: /pages/merlin6/introduction.md
+[srcRef]: /pages/merlin6/01 introduction/introduction.md
 [dstRef]: /merlin6/introduction.html
 
 Key:
-- ✅ Baseurl prepended
-- ❌ No baseurl
-- ❗ Source not converted to result
+- ✅ Baseurl gets prepended to the URL
+- ❌ No baseurl in URL
+- ❗ Source not expected to be converted to the result URL
 
 ### Conclusions: