diff --git a/docs/software_layer/adding_software.md b/docs/contributing_sw/adding_software.md
similarity index 100%
rename from docs/software_layer/adding_software.md
rename to docs/contributing_sw/adding_software.md
diff --git a/docs/software_layer/debugging_failed_builds.md b/docs/contributing_sw/debugging_failed_builds.md
similarity index 100%
rename from docs/software_layer/debugging_failed_builds.md
rename to docs/contributing_sw/debugging_failed_builds.md
diff --git a/mkdocs.yml b/mkdocs.yml
index dc37b29a4..9c839c79d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -25,8 +25,6 @@ nav:
     - Overview: software_layer.md
     - software_layer/cpu_targets.md
     - software_layer/build_nodes.md
-    - software_layer/adding_software.md
-    - software_layer/debugging_failed_builds.md
   - Test suite:
     - Overview: test-suite/index.md
     - Installation & configuration: test-suite/installation-configuration.md
@@ -42,6 +40,13 @@ nav:
     - using_eessi/setting_up_environment.md
     - using_eessi/basic_commands.md
     - using_eessi/eessi_demos.md
+  - Contributing software to EESSI:
+    # Todo: insert an overview page with a flowchart showing the high level process
+    # - Overview: contributing_sw/overview.md
+    - contributing_sw/adding_software.md
+    - contributing_sw/debugging_failed_builds.md
+  # Todo: write on how to contribute to the EESSI test suite
+  # - Contributing software tests to the EESSI test suite:
   - Getting support: support.md
   - Meetings:
       - Overview: meetings.md