diff --git a/src/covid19/blueprints/application/templates/application/fragments/fragment_navbar.html b/src/covid19/blueprints/application/templates/application/navigation/navbar.html
similarity index 57%
rename from src/covid19/blueprints/application/templates/application/fragments/fragment_navbar.html
rename to src/covid19/blueprints/application/templates/application/navigation/navbar.html
index f917e1be06ce9e08fb7a83b39382ac919cb6a3b2..338c39e432c463e65701e266833173d07b10cd38 100644
--- a/src/covid19/blueprints/application/templates/application/fragments/fragment_navbar.html
+++ b/src/covid19/blueprints/application/templates/application/navigation/navbar.html
@@ -14,19 +14,19 @@
                         <a class="nav-link" href="{{ url_for( 'url_home') }}">Home</a>
                     </li>
 
-                    {% include 'who/fragments/fragment_who_navbar_dropdown.html' %}
+                    {% include 'who/navigation/who_navbar_dropdown.html' %}
 
-                    {% include 'ecdc/fragments/fragment_ecdc_navbar_dropdown.html' %}
+                    {% include 'ecdc/navigation/ecdc_navbar_dropdown.html' %}
 
-                    {% include 'owid/fragments/fragment_owid_navbar_dropdown.html' %}
+                    {% include 'owid/navigation/owid_navbar_dropdown.html' %}
 
-                    {% include 'rki_vaccination/fragments/fragment_rki_vaccination_navbar_dropdown.html' %}
+                    {% include 'rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html' %}
 
-                    {% include 'rki_bundeslaender/fragments/fragment_rki_bundeslaender_navbar_dropdown.html' %}
+                    {% include 'rki_bundeslaender/navigation/rki_bundeslaender_navbar_dropdown.html' %}
 
-                    {% include 'rki_landkreise/fragments/fragment_rki_landkreise_navbar_dropdown.html' %}
+                    {% include 'rki_landkreise/navigation/rki_landkreise_navbar_dropdown.html' %}
 
-                    {% include 'admin/fragments/fragment_admin_navbar_dropdown.html' %}
+                    {% include 'admin/navigation/admin_navbar_dropdown.html' %}
 
                 </ul>
             </div>
diff --git a/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html b/src/covid19/blueprints/application/templates/application/navigation/navtabs.html
similarity index 100%
rename from src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html
rename to src/covid19/blueprints/application/templates/application/navigation/navtabs.html
diff --git a/src/covid19/blueprints/application/templates/application/page_layout.html b/src/covid19/blueprints/application/templates/application/page_layout.html
index 1475376b52718a3cc6882fc014690162f2ab7eb8..79c786279765d0c5646b8feac2ea545ce5a7f941 100644
--- a/src/covid19/blueprints/application/templates/application/page_layout.html
+++ b/src/covid19/blueprints/application/templates/application/page_layout.html
@@ -14,7 +14,7 @@
 
 
 {% block navbar %}
-  {% include 'application/fragments/fragment_navbar.html' %}
+  {% include 'application/navigation/navbar.html' %}
 {% endblock %}
 
 {% block content %}
@@ -27,7 +27,7 @@
                 {% include 'application/fragments/fragment_flashed_messages.html' %}
             </div>
             <div class="row-cols-1">
-                {% include 'application/fragments/fragment_navtabs.html' %}
+                {% include 'application/navigation/navtabs.html' %}
             </div>
     </div>
 {% endblock %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navbar_dropdown.html b/src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navbar_dropdown.html
rename to src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navbar_dropdown.html
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html b/src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html
rename to src/covid19/blueprints/ecdc/templates/ecdc/navigation/ecdc_navtabs.html
diff --git a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navbar_dropdown.html b/src/covid19/blueprints/owid/templates/owid/navigation/owid_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navbar_dropdown.html
rename to src/covid19/blueprints/owid/templates/owid/navigation/owid_navbar_dropdown.html
diff --git a/src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navtabs.html b/src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/owid/templates/owid/fragments/fragment_owid_navtabs.html
rename to src/covid19/blueprints/owid/templates/owid/navigation/owid_navtabs.html
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navbar_dropdown.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/navigation/rki_bundeslaender_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navbar_dropdown.html
rename to src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/navigation/rki_bundeslaender_navbar_dropdown.html
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/navigation/rki_bundeslaender_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html
rename to src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/navigation/rki_bundeslaender_navtabs.html
diff --git a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navbar_dropdown.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/navigation/rki_landkreise_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navbar_dropdown.html
rename to src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/navigation/rki_landkreise_navbar_dropdown.html
diff --git a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/navigation/rki_landkreise_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html
rename to src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/navigation/rki_landkreise_navtabs.html
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navbar_dropdown.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navbar_dropdown.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navbar_dropdown.html
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/navigation/rki_vaccination_navtabs.html
diff --git a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html b/src/covid19/blueprints/who/templates/who/navigation/who_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/who/templates/who/fragments/fragment_who_navbar_dropdown.html
rename to src/covid19/blueprints/who/templates/who/navigation/who_navbar_dropdown.html
diff --git a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html b/src/covid19/blueprints/who/templates/who/navigation/who_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/who/templates/who/fragments/fragment_who_navtabs.html
rename to src/covid19/blueprints/who/templates/who/navigation/who_navtabs.html