diff --git a/docs/advanced/index.md b/docs/advanced/index.md
new file mode 100644
index 000000000..aab349c76
--- /dev/null
+++ b/docs/advanced/index.md
@@ -0,0 +1,20 @@
+---
+has_children: false
+nav_order: 3
+---
+
+# Advanced
+
+In this section we will add the documentation for all subjects that go beyond
+the beginner topics, but which are interesting for mission builders or power
+users.
+
+{: .note }
+> This documentation is WIP (work in progress) and it will take some time to
+> fill it with usefull and up to date informations. Please be patient and check
+> back here from time to time to see if there is anything new for you.
+
+If you cannot find the information you are looking for here in the new
+documentation, please take a look at the [archive].
+
+[archive]: ../archive/index.md
diff --git a/docs/archive/index.md b/docs/archive/index.md
index f97016ef3..2db95154e 100644
--- a/docs/archive/index.md
+++ b/docs/archive/index.md
@@ -1,7 +1,7 @@
 ---
 title: Archive
 has_children: true
-nav_order: 4
+nav_order: 99
 has_toc: false
 ---
 
diff --git a/docs/beginner/index.md b/docs/beginner/index.md
new file mode 100644
index 000000000..a637bcc37
--- /dev/null
+++ b/docs/beginner/index.md
@@ -0,0 +1,19 @@
+---
+has_children: false
+nav_order: 2
+---
+
+# Beginner
+
+In this section we will add all informations needed for your first steps using
+MOOSE.
+
+{: .note }
+> This documentation is WIP (work in progress) and it will take some time to
+> fill it with usefull and up to date informations. Please be patient and check
+> back here from time to time to see if there is anything new for you.
+
+If you cannot find the information you are looking for here in the new
+documentation, please take a look at the [archive].
+
+[archive]: ../archive/index.md
diff --git a/docs/buildsystem/build-docs.md b/docs/developer/buildsystem/build-docs.md
similarity index 99%
rename from docs/buildsystem/build-docs.md
rename to docs/developer/buildsystem/build-docs.md
index 3ad52c993..4857f6836 100644
--- a/docs/buildsystem/build-docs.md
+++ b/docs/developer/buildsystem/build-docs.md
@@ -1,5 +1,6 @@
 ---
 parent: Build system
+grand_parent: Developer
 nav_order: 2
 ---
 
diff --git a/docs/buildsystem/build-includes.md b/docs/developer/buildsystem/build-includes.md
similarity index 98%
rename from docs/buildsystem/build-includes.md
rename to docs/developer/buildsystem/build-includes.md
index bdd683a22..83c91a21c 100644
--- a/docs/buildsystem/build-includes.md
+++ b/docs/developer/buildsystem/build-includes.md
@@ -1,5 +1,6 @@
 ---
 parent: Build system
+grand_parent: Developer
 nav_order: 1
 ---
 
diff --git a/docs/buildsystem/gh-pages.md b/docs/developer/buildsystem/gh-pages.md
similarity index 98%
rename from docs/buildsystem/gh-pages.md
rename to docs/developer/buildsystem/gh-pages.md
index 94ed78fa9..4bfa70bfd 100644
--- a/docs/buildsystem/gh-pages.md
+++ b/docs/developer/buildsystem/gh-pages.md
@@ -1,5 +1,6 @@
 ---
 parent: Build system
+grand_parent: Developer
 nav_order: 3
 ---
 
diff --git a/docs/buildsystem/index.md b/docs/developer/buildsystem/index.md
similarity index 97%
rename from docs/buildsystem/index.md
rename to docs/developer/buildsystem/index.md
index 1dec95fed..5fd907069 100644
--- a/docs/buildsystem/index.md
+++ b/docs/developer/buildsystem/index.md
@@ -1,6 +1,9 @@
 ---
+layout: default
+title: Build system
+parent: Developer
 has_children: true
-nav_order: 3
+nav_order: 99
 ---
 
 # Build system
diff --git a/docs/buildsystem/local-test.md b/docs/developer/buildsystem/local-test.md
similarity index 98%
rename from docs/buildsystem/local-test.md
rename to docs/developer/buildsystem/local-test.md
index 98d39fc5a..9d940775a 100644
--- a/docs/buildsystem/local-test.md
+++ b/docs/developer/buildsystem/local-test.md
@@ -1,5 +1,6 @@
 ---
 parent: Build system
+grand_parent: Developer
 nav_order: 4
 ---
 
diff --git a/docs/developer/index.md b/docs/developer/index.md
new file mode 100644
index 000000000..12459047f
--- /dev/null
+++ b/docs/developer/index.md
@@ -0,0 +1,21 @@
+---
+title: Developer
+has_children: true
+nav_order: 4
+---
+
+# Developer
+
+All information in this section is primarily intended for developers who extend
+or maintain the Moose program code. Of course, this information may also be of
+interest to others who want to learn more about the background of MOOSE.
+
+{: .note }
+> This documentation is WIP (work in progress) and it will take some time to
+> fill it with usefull and up to date informations. Please be patient and check
+> back here from time to time to see if there is anything new for you.
+
+If you cannot find the information you are looking for here in the new
+documentation, please take a look at the [archive].
+
+[archive]: ../archive/index.md
diff --git a/docs/images/moosedoc.jpg b/docs/images/moosedoc.jpg
new file mode 100644
index 000000000..258286c89
Binary files /dev/null and b/docs/images/moosedoc.jpg differ
diff --git a/docs/repositories.md b/docs/repositories.md
index 59e2d053d..eb181e646 100644
--- a/docs/repositories.md
+++ b/docs/repositories.md
@@ -1,6 +1,6 @@
 ---
 title: Repositories
-nav_order: 2
+nav_order: 5
 ---
 
 # MOOSE Repositories