diff --git a/_config.yml b/_config.yml
index f3e563f9a..cb2abc796 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,4 +1,20 @@
 name: Git Developer Pages
 permalink: /rev_news/:year/:month/:day/:title/
 plugins:
-  - jekyll-redirect-from
\ No newline at end of file
+  - jekyll-redirect-from
+
+defaults:
+  - { scope: { path: "links/dev"                 } , values: { nb: "Git Development"    , permalink: "/:basename/"} }
+  - { scope: { path: "links/mentoring/common"    } , values: { nb: "Mentoring"          , permalink: "/:basename/"} }
+  - { scope: { path: "links/mentoring/soc"       } , values: { nb: "Mentoring-SoC"      , permalink: "/:basename/"} }
+  - { scope: { path: "links/mentoring/outreachy" } , values: { nb: "Mentoring-Outreachy", permalink: "/:basename/"} }
+  - { scope: { path: "rev_news"                  } , values: { nb: "Git Rev News"                                 } }
+  
+# this is used to display links in the right categories order
+# be sure to match default category names defined in site.defaults
+nb-order:
+  - "Git Development"
+  - "Git Rev News"
+  - "Mentoring"
+  - "Mentoring-SoC"
+  - "Mentoring-Outreachy"
\ No newline at end of file
diff --git a/_includes/navbar.html b/_includes/navbar.html
index d4dfe25bd..ce3d60bb6 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -1,10 +1,20 @@
 <div id="navbar" class="navbar">
-  <ul>
-    <li><a href="/">Home</a>
-    {% for node in site.pages reversed %}
-      {% if node.navbar != false and node.title %}
-      <li><a href="{{node.url}}">{{node.title}}</a>
-      {% endif %}
-    {% endfor %}
-  </ul>
-</div>
+  <a href="{{ '/' | relative_url }}">Home</a>
+
+  {% assign nb-groups = site.pages | group_by:"nb" %}
+  
+  {% comment %} We loop site.nb-order to sort categories in a defined order {% endcomment %}
+  {% for nb-value in site.nb-order %}
+    {% assign group    = nb-groups | where: "name", nb-value | first %}
+    {% assign nb-pages = group.items | sort: "order", "last" %}
+    
+    <h3>{{ nb-value }}</h3>
+    <ul>
+      {% for item in nb-pages %}
+        {% if item.navbar != false and item.title %}
+          <li><a href="{{ item.url | relative_url }}">{{ item.title }}</a></li>
+        {% endif %}
+      {% endfor %}
+    </ul>
+  {% endfor %}
+</div>
\ No newline at end of file
diff --git a/Hacking-Git.md b/links/dev/Hacking-Git.md
similarity index 100%
rename from Hacking-Git.md
rename to links/dev/Hacking-Git.md
diff --git a/General-Application-Information.md b/links/mentoring/common/General-Application-Information.md
similarity index 100%
rename from General-Application-Information.md
rename to links/mentoring/common/General-Application-Information.md
diff --git a/General-Microproject-Information.md b/links/mentoring/common/General-Microproject-Information.md
similarity index 100%
rename from General-Microproject-Information.md
rename to links/mentoring/common/General-Microproject-Information.md
diff --git a/Historical-SoC-Outreachy.md b/links/mentoring/common/Historical-SoC-Outreachy.md
similarity index 100%
rename from Historical-SoC-Outreachy.md
rename to links/mentoring/common/Historical-SoC-Outreachy.md
diff --git a/Mentoring-Program-Guide.md b/links/mentoring/common/Mentoring-Program-Guide.md
similarity index 100%
rename from Mentoring-Program-Guide.md
rename to links/mentoring/common/Mentoring-Program-Guide.md
diff --git a/Outreachy-12.md b/links/mentoring/outreachy/Outreachy-12.md
similarity index 100%
rename from Outreachy-12.md
rename to links/mentoring/outreachy/Outreachy-12.md
diff --git a/Outreachy-15.md b/links/mentoring/outreachy/Outreachy-15.md
similarity index 100%
rename from Outreachy-15.md
rename to links/mentoring/outreachy/Outreachy-15.md
diff --git a/Outreachy-17.md b/links/mentoring/outreachy/Outreachy-17.md
similarity index 100%
rename from Outreachy-17.md
rename to links/mentoring/outreachy/Outreachy-17.md
diff --git a/Outreachy-21-Microprojects.md b/links/mentoring/outreachy/Outreachy-21-Microprojects.md
similarity index 100%
rename from Outreachy-21-Microprojects.md
rename to links/mentoring/outreachy/Outreachy-21-Microprojects.md
diff --git a/Outreachy-23-Microprojects.md b/links/mentoring/outreachy/Outreachy-23-Microprojects.md
similarity index 100%
rename from Outreachy-23-Microprojects.md
rename to links/mentoring/outreachy/Outreachy-23-Microprojects.md
diff --git a/Outreachy-Participants.md b/links/mentoring/outreachy/Outreachy-Participants.md
similarity index 100%
rename from Outreachy-Participants.md
rename to links/mentoring/outreachy/Outreachy-Participants.md
diff --git a/SoC-2014-Ideas.md b/links/mentoring/soc/SoC-2014-Ideas.md
similarity index 100%
rename from SoC-2014-Ideas.md
rename to links/mentoring/soc/SoC-2014-Ideas.md
diff --git a/SoC-2014-Microprojects.md b/links/mentoring/soc/SoC-2014-Microprojects.md
similarity index 100%
rename from SoC-2014-Microprojects.md
rename to links/mentoring/soc/SoC-2014-Microprojects.md
diff --git a/SoC-2014-Org-Application.md b/links/mentoring/soc/SoC-2014-Org-Application.md
similarity index 100%
rename from SoC-2014-Org-Application.md
rename to links/mentoring/soc/SoC-2014-Org-Application.md
diff --git a/SoC-2015-Ideas.md b/links/mentoring/soc/SoC-2015-Ideas.md
similarity index 100%
rename from SoC-2015-Ideas.md
rename to links/mentoring/soc/SoC-2015-Ideas.md
diff --git a/SoC-2015-Microprojects.md b/links/mentoring/soc/SoC-2015-Microprojects.md
similarity index 100%
rename from SoC-2015-Microprojects.md
rename to links/mentoring/soc/SoC-2015-Microprojects.md
diff --git a/SoC-2015-Org-Application.md b/links/mentoring/soc/SoC-2015-Org-Application.md
similarity index 100%
rename from SoC-2015-Org-Application.md
rename to links/mentoring/soc/SoC-2015-Org-Application.md
diff --git a/SoC-2016-Ideas.md b/links/mentoring/soc/SoC-2016-Ideas.md
similarity index 100%
rename from SoC-2016-Ideas.md
rename to links/mentoring/soc/SoC-2016-Ideas.md
diff --git a/SoC-2016-Microprojects.md b/links/mentoring/soc/SoC-2016-Microprojects.md
similarity index 100%
rename from SoC-2016-Microprojects.md
rename to links/mentoring/soc/SoC-2016-Microprojects.md
diff --git a/SoC-2016-Org-Application.md b/links/mentoring/soc/SoC-2016-Org-Application.md
similarity index 100%
rename from SoC-2016-Org-Application.md
rename to links/mentoring/soc/SoC-2016-Org-Application.md
diff --git a/SoC-2017-Ideas.md b/links/mentoring/soc/SoC-2017-Ideas.md
similarity index 100%
rename from SoC-2017-Ideas.md
rename to links/mentoring/soc/SoC-2017-Ideas.md
diff --git a/SoC-2017-Microprojects.md b/links/mentoring/soc/SoC-2017-Microprojects.md
similarity index 100%
rename from SoC-2017-Microprojects.md
rename to links/mentoring/soc/SoC-2017-Microprojects.md
diff --git a/SoC-2017-Org-Application.md b/links/mentoring/soc/SoC-2017-Org-Application.md
similarity index 100%
rename from SoC-2017-Org-Application.md
rename to links/mentoring/soc/SoC-2017-Org-Application.md
diff --git a/SoC-2018-Ideas.md b/links/mentoring/soc/SoC-2018-Ideas.md
similarity index 100%
rename from SoC-2018-Ideas.md
rename to links/mentoring/soc/SoC-2018-Ideas.md
diff --git a/SoC-2018-Microprojects.md b/links/mentoring/soc/SoC-2018-Microprojects.md
similarity index 100%
rename from SoC-2018-Microprojects.md
rename to links/mentoring/soc/SoC-2018-Microprojects.md
diff --git a/SoC-2018-Org-Application.md b/links/mentoring/soc/SoC-2018-Org-Application.md
similarity index 100%
rename from SoC-2018-Org-Application.md
rename to links/mentoring/soc/SoC-2018-Org-Application.md
diff --git a/SoC-2019-Ideas.md b/links/mentoring/soc/SoC-2019-Ideas.md
similarity index 100%
rename from SoC-2019-Ideas.md
rename to links/mentoring/soc/SoC-2019-Ideas.md
diff --git a/SoC-2019-Microprojects.md b/links/mentoring/soc/SoC-2019-Microprojects.md
similarity index 100%
rename from SoC-2019-Microprojects.md
rename to links/mentoring/soc/SoC-2019-Microprojects.md
diff --git a/SoC-2019-Org-Application.md b/links/mentoring/soc/SoC-2019-Org-Application.md
similarity index 100%
rename from SoC-2019-Org-Application.md
rename to links/mentoring/soc/SoC-2019-Org-Application.md
diff --git a/SoC-2020-Ideas.md b/links/mentoring/soc/SoC-2020-Ideas.md
similarity index 100%
rename from SoC-2020-Ideas.md
rename to links/mentoring/soc/SoC-2020-Ideas.md
diff --git a/SoC-2020-Microprojects.md b/links/mentoring/soc/SoC-2020-Microprojects.md
similarity index 100%
rename from SoC-2020-Microprojects.md
rename to links/mentoring/soc/SoC-2020-Microprojects.md
diff --git a/SoC-2020-Org-Application.md b/links/mentoring/soc/SoC-2020-Org-Application.md
similarity index 100%
rename from SoC-2020-Org-Application.md
rename to links/mentoring/soc/SoC-2020-Org-Application.md
diff --git a/SoC-2021-Ideas.md b/links/mentoring/soc/SoC-2021-Ideas.md
similarity index 100%
rename from SoC-2021-Ideas.md
rename to links/mentoring/soc/SoC-2021-Ideas.md
diff --git a/SoC-2021-Org-Application.md b/links/mentoring/soc/SoC-2021-Org-Application.md
similarity index 100%
rename from SoC-2021-Org-Application.md
rename to links/mentoring/soc/SoC-2021-Org-Application.md
diff --git a/SoC-2022-Ideas.md b/links/mentoring/soc/SoC-2022-Ideas.md
similarity index 100%
rename from SoC-2022-Ideas.md
rename to links/mentoring/soc/SoC-2022-Ideas.md
diff --git a/SoC-2022-Microprojects.md b/links/mentoring/soc/SoC-2022-Microprojects.md
similarity index 100%
rename from SoC-2022-Microprojects.md
rename to links/mentoring/soc/SoC-2022-Microprojects.md
diff --git a/SoC-2022-Org-Application.md b/links/mentoring/soc/SoC-2022-Org-Application.md
similarity index 100%
rename from SoC-2022-Org-Application.md
rename to links/mentoring/soc/SoC-2022-Org-Application.md
diff --git a/SoC-2023-Ideas.md b/links/mentoring/soc/SoC-2023-Ideas.md
similarity index 100%
rename from SoC-2023-Ideas.md
rename to links/mentoring/soc/SoC-2023-Ideas.md
diff --git a/SoC-2024-Ideas.md b/links/mentoring/soc/SoC-2024-Ideas.md
similarity index 100%
rename from SoC-2024-Ideas.md
rename to links/mentoring/soc/SoC-2024-Ideas.md
diff --git a/SoC-2024-Microprojects.md b/links/mentoring/soc/SoC-2024-Microprojects.md
similarity index 100%
rename from SoC-2024-Microprojects.md
rename to links/mentoring/soc/SoC-2024-Microprojects.md
diff --git a/SoC-2025-Ideas.md b/links/mentoring/soc/SoC-2025-Ideas.md
similarity index 100%
rename from SoC-2025-Ideas.md
rename to links/mentoring/soc/SoC-2025-Ideas.md
diff --git a/SoC-2025-Microprojects.md b/links/mentoring/soc/SoC-2025-Microprojects.md
similarity index 100%
rename from SoC-2025-Microprojects.md
rename to links/mentoring/soc/SoC-2025-Microprojects.md
diff --git a/SoC-2026-Ideas.md b/links/mentoring/soc/SoC-2026-Ideas.md
similarity index 100%
rename from SoC-2026-Ideas.md
rename to links/mentoring/soc/SoC-2026-Ideas.md
diff --git a/SoC-2026-Microprojects.md b/links/mentoring/soc/SoC-2026-Microprojects.md
similarity index 100%
rename from SoC-2026-Microprojects.md
rename to links/mentoring/soc/SoC-2026-Microprojects.md
diff --git a/SoC-Participants.md b/links/mentoring/soc/SoC-Participants.md
similarity index 100%
rename from SoC-Participants.md
rename to links/mentoring/soc/SoC-Participants.md
diff --git a/rev_news/archive.md b/rev_news/archive.md
index 6a889690d..bd113725c 100644
--- a/rev_news/archive.md
+++ b/rev_news/archive.md
@@ -1,6 +1,7 @@
 ---
 layout: default
 title: Git Rev News Archive
+order: 3
 ---
 
 # Archive
diff --git a/rev_news/index.md b/rev_news/index.md
index 35353e4ee..6fe0320dd 100644
--- a/rev_news/index.md
+++ b/rev_news/index.md
@@ -1,6 +1,7 @@
 ---
 layout: default
-title: Git Rev News
+title: Git Rev News Latest edition
+order: 2
 ---
 
 # Latest edition
diff --git a/rev_news/news_sources.md b/rev_news/news_sources.md
index 00db881fc..38bfc3913 100644
--- a/rev_news/news_sources.md
+++ b/rev_news/news_sources.md
@@ -1,6 +1,7 @@
 ---
 layout: default
 title: Git Rev News Sources
+order: 4
 ---
 
 # Sources
diff --git a/rev_news/rev_news.md b/rev_news/rev_news.md
index 0d559192b..1e348c8a5 100644
--- a/rev_news/rev_news.md
+++ b/rev_news/rev_news.md
@@ -1,6 +1,7 @@
 ---
 layout: default
 title: About Git Rev News
+order: 1
 ---
 
 # About Git Rev News