diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
index 2af87848c34ef3ef3b83ad7e3734ad2e923e7d4d..1b666e09e0f577c97b77a884a66fdd354ea3edf4 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html' %}
+ {% include 'rki_bundeslaender/navigation/rki_bundeslaender_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
index 48b6b4c4a57b6b82e640c21f3df2ce3e8d7a7c2d..b62f99707cecd0a16169ac998eb132d4362a9006 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html' %}
+ {% include 'rki_bundeslaender/navigation/rki_bundeslaender_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_test.html b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_test.html
index 44d1d01572cec034da69bca433ad7d3387a80e4e..c87ce9cea521ed8f4500a3f717e45bf44fa71ef3 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_test.html
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_test.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html' %}
+ {% include 'rki_bundeslaender/navigation/rki_bundeslaender_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html
index 0b4202bf6d3f37fb57cc81f3e0f4fd4db9598607..c7eac47102eb2f4d1c8e5c43b31466bc969a55a6 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html
+++ b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
-{% include 'rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html' %}
+{% include 'rki_landkreise/navigation/rki_landkreise_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html
index fa4e012a5d6c3ce06b97fb6bd7034681e3386701..4b00cd59c248de82a973b2cabca5bbeb3a0f9397 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html
+++ b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_info.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html' %}
+ {% include 'rki_landkreise/navigation/rki_landkreise_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_tasks.html b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_tasks.html
index 82dbfb2d0ad90c2c7735ab198a53d54f8d217b7c..d8dc6b7d45481f330e263c3fdb354f48cdca506f 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_tasks.html
+++ b/src/covid19/blueprints/rki/rki_landkreise/templates/rki_landkreise/rki_landkreise_tasks.html
@@ -2,7 +2,7 @@
{% block content %}
{{super()}}
- {% include 'rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html' %}
+ {% include 'rki_landkreise/navigation/rki_landkreise_navtabs.html' %}
<div class="container">
<div class="row">
diff --git a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
index c93b94cc8081f8885e0a31f52d8af3bd77a2e2be..9c89afac0a56a34081126bebed83372fdec7ced7 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
+++ b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
@@ -45,7 +45,7 @@ def url_vaccination_imported(page=1):
page_info = ApplicationPage('Vaccination', "Data: Germany Timeline imported")
page_data = RkiVaccinationImport.get_all_as_page(page)
return render_template(
- 'rki_vaccination/rki_vaccination_imported.html',
+ 'rki_vaccination/imported/rki_vaccination_imported.html',
page_data=page_data,
page_info=page_info)
@@ -56,7 +56,7 @@ def url_vaccination_data(page=1):
page_info = ApplicationPage('Vaccination', "Data: Germany Timeline")
page_data = RkiVaccinationData.get_all_as_page(page)
return render_template(
- 'rki_vaccination/rki_vaccination_data.html',
+ 'rki_vaccination/data/rki_vaccination_data.html',
page_data=page_data,
page_info=page_info)
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html
similarity index 61%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html
index 184c9dae4b0b67ae5505b35a8032a5f652965b91..7faa0cb69b5c267506b5ba20f6da571390650517 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
+++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html
@@ -7,17 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_pagination.html' %}
+ {% include 'rki_vaccination/data/rki_vaccination_data_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table.html' %}
+ {% include 'rki_vaccination/data/rki_vaccination_data_table.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_pagination.html' %}
+ {% include 'rki_vaccination/data/rki_vaccination_data_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_pagination.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_pagination.html
similarity index 97%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_pagination.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_pagination.html
index fc3c7babc55ea45da6958c025102b030b6b20142..70b84e0198e0a69952db6c19082ed0ea7e614fb8 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_pagination.html
+++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_pagination.html
@@ -1,4 +1,4 @@
-{% if page_data.pages > 1 %}
+ {% if page_data.pages > 1 %}
<!-- previous page -->
<ul class="pagination">
{% if page_data.has_prev %}
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table.html
similarity index 92%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table.html
index b9a65f41a3cd88322e8e9afb04c0e2d11ac098ec..a0ad34151b02b66fa6c045dc02c1bcacf93294c4 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table.html
+++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table.html
@@ -2,7 +2,7 @@
<div class="table-responsive">
<table class="table table-hover table-striped table-sm table-bordered">
<thead>
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html' %}
+ {% include 'rki_vaccination/data/rki_vaccination_data_table_head.html' %}
</thead>
<tbody>
{% for data_item in page_data.items %}
@@ -40,7 +40,7 @@
{% endfor %}
</tbody>
<tfoot>
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html' %}
+ {% include 'rki_vaccination/data/rki_vaccination_data_table_head.html' %}
</tfoot>
</table>
</div>
\ No newline at end of file
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table_head.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data_table_head.html
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_imported.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/fragment_rki_vaccination_data_table_imported.html
similarity index 92%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_imported.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/fragment_rki_vaccination_data_table_imported.html
index 30e4e391682eeee6973372d5b060ed1319f95873..3cc74ead3fbc2030ed9b2bb920a8a499eebe9a22 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_imported.html
+++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/fragment_rki_vaccination_data_table_imported.html
@@ -2,7 +2,7 @@
<div class="table-responsive">
<table class="table table-hover table-striped table-sm table-bordered">
<thead>
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html' %}
+ {% include 'rki_vaccination/fragments/../data/rki_vaccination_data_table_head.html' %}
</thead>
<tbody>
{% for data_item in page_data.items %}
@@ -40,7 +40,7 @@
{% endfor %}
</tbody>
<tfoot>
- {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html' %}
+ {% include 'rki_vaccination/fragments/../data/rki_vaccination_data_table_head.html' %}
</tfoot>
</table>
</div>
\ No newline at end of file
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_imported_pagination.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/fragment_rki_vaccination_imported_pagination.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_imported_pagination.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/fragment_rki_vaccination_imported_pagination.html
diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_imported.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html
similarity index 100%
rename from src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_imported.html
rename to src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html