diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_views.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_views.py
index fac176d8f768e3a9b0752f34df8935302cfa528b..9ea7c67d987e88111cf7fa1f9fe992ba38eb89c3 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_views.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_views.py
@@ -62,7 +62,7 @@ def url_ecdc_date_reported_all(page=1):
     page_info = WebPageContent('Europe', "date_reported")
     page_data = EcdcDateReported.get_all_as_page(page)
     return render_template(
-        'ecdc/date_reported/ecdc_date_reported_all.html',
+        'ecdc/date_reported/all/ecdc_date_reported_all.html',
         page_data=page_data,
         page_info=page_info)
 
@@ -76,7 +76,7 @@ def url_ecdc_date_reported_one_notification_rate(europe_date_reported_id, page=1
     europe_date_reported = EcdcDateReported.get_by_id(europe_date_reported_id)
     page_data = EcdcData.find_by_date_reported_notification_rate(europe_date_reported, page)
     return render_template(
-        'ecdc/date_reported/ecdc_date_reported_one_notification_rate.html',
+        'ecdc/date_reported/notification/ecdc_date_reported_one_notification_rate.html',
         europe_date_reported=europe_date_reported,
         page_data=page_data,
         page_info=page_info)
@@ -89,7 +89,7 @@ def url_ecdc_date_reported_one_deaths_weekly(europe_date_reported_id, page=1):
     europe_date_reported = EcdcDateReported.get_by_id(europe_date_reported_id)
     page_data = EcdcData.find_by_date_reported_deaths_weekly(europe_date_reported, page)
     return render_template(
-        'ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html',
+        'ecdc/date_reported/deaths/ecdc_date_reported_one_deaths_weekly.html',
         europe_date_reported=europe_date_reported,
         page_data=page_data,
         page_info=page_info)
@@ -102,7 +102,7 @@ def url_ecdc_date_reported_one_cases_weekly(europe_date_reported_id, page=1):
     europe_date_reported = EcdcDateReported.get_by_id(europe_date_reported_id)
     page_data = EcdcData.find_by_date_reported_cases_weekly(europe_date_reported, page)
     return render_template(
-        'ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html',
+        'ecdc/date_reported/cases/ecdc_date_reported_one_cases_weekly.html',
         europe_date_reported=europe_date_reported,
         page_data=page_data,
         page_info=page_info)
@@ -114,7 +114,7 @@ def url_ecdc_continent_all(page=1):
     page_info = WebPageContent('Europe', "continent")
     page_data = EcdcContinent.get_all_as_page(page)
     return render_template(
-        'ecdc/continent/ecdc_continent_all.html',
+        'ecdc/continent/all/ecdc_continent_all.html',
         page_data=page_data,
         page_info=page_info)
 
@@ -126,7 +126,7 @@ def url_ecdc_continent_one(continent_id, page=1):
     continent = EcdcContinent.get_by_id(continent_id)
     page_data = EcdcCountry.find_by_continent(continent, page)
     return render_template(
-        'ecdc/continent/ecdc_continent_one.html',
+        'ecdc/continent/one/ecdc_continent_one.html',
         continent=continent,
         page_data=page_data,
         page_info=page_info)
@@ -138,7 +138,7 @@ def url_ecdc_country_all(page=1):
     page_info = WebPageContent('Europe', "country")
     page_data = EcdcCountry.get_all_as_page(page)
     return render_template(
-        'ecdc/country/ecdc_country_all.html',
+        'ecdc/country/all/ecdc_country_all.html',
         page_data=page_data,
         page_info=page_info)
 
@@ -150,7 +150,7 @@ def url_ecdc_country_one(country_id, page=1):
     europe_country = EcdcCountry.get_by_id(country_id)
     page_data = EcdcData.find_by_country(europe_country, page)
     return render_template(
-        'ecdc/country/ecdc_country_one.html',
+        'ecdc/country/one/ecdc_country_one.html',
         europe_country=europe_country,
         page_data=page_data,
         page_info=page_info)
@@ -166,7 +166,7 @@ def url_ecdc_country_germany(page=1):
         return redirect(url_for('ecdc.url_ecdc_tasks'))
     page_data = EcdcData.find_by_country(europe_country, page)
     return render_template(
-        'ecdc/country/ecdc_country_germany.html',
+        'ecdc/country/germany/ecdc_country_germany.html',
         europe_country=europe_country,
         page_data=page_data,
         page_info=page_info)
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/all/ecdc_continent_all.html
similarity index 70%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/all/ecdc_continent_all.html
index b981ae215c3bb07bf7b96c0909e7848a5c0943da..6df9b85df27e24690476237ab803322a9269fd21 100644
--- a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
+++ b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/all/ecdc_continent_all.html
@@ -7,20 +7,21 @@
     <div class="container">
         <div class="row">
             <div class="col">
-                {% include 'ecdc/date_reported/ecdc_date_reported_all_pagination.html' %}
+                {% include 'ecdc/continent/all/ecdc_continent_all_pagination.html' %}
             </div>
         </div>
         <div class="row">
             <div class="col">
-                {% include 'ecdc/date_reported/ecdc_date_reported_all_table.html' %}
+                {% include 'ecdc/continent/all/ecdc_continent_all_table.html' %}
             </div>
         </div>
         <div class="row">
             <div class="col">
-                {% include 'ecdc/date_reported/ecdc_date_reported_all_pagination.html' %}
+                {% include 'ecdc/continent/all/ecdc_continent_all_pagination.html' %}
             </div>
         </div>
     </div>
+
 {% endblock %}
 
 
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_all_pagination.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/all/ecdc_continent_all_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_all_pagination.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/all/ecdc_continent_all_pagination.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_all_table.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/all/ecdc_continent_all_table.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_all_table.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/all/ecdc_continent_all_table.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_one.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/one/ecdc_continent_one.html
similarity index 71%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_one.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/one/ecdc_continent_one.html
index 9d018625b1c881a63081f856d0a053cf339cddff..6aa62e11de61671abdd23e0d9715ac3b0c359582 100644
--- a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_one.html
+++ b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/one/ecdc_continent_one.html
@@ -7,17 +7,17 @@
     <div class="container">
         <div class="row">
             <div class="col">
-                {% include 'ecdc/continent/ecdc_continent_one_pagination.html' %}
+                {% include 'ecdc/continent/one/ecdc_continent_one_pagination.html' %}
             </div>
         </div>
         <div class="row">
             <div class="col">
-                {% include 'ecdc/country/ecdc_country_all_table.html' %}
+                {% include 'ecdc/country/all/ecdc_country_all_table.html' %}
             </div>
         </div>
         <div class="row">
             <div class="col">
-                {% include 'ecdc/continent/ecdc_continent_one_pagination.html' %}
+                {% include 'ecdc/continent/one/ecdc_continent_one_pagination.html' %}
             </div>
         </div>
     </div>
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_one_pagination.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/one/ecdc_continent_one_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_one_pagination.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/one/ecdc_continent_one_pagination.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_all.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/all/ecdc_country_all.html
similarity index 74%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_all.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/all/ecdc_country_all.html
index 4b766bb190bef5fa4524ee6f45e622f7dce5d230..43d979933930c21fd04a90084def06a73112986a 100644
--- a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/continent/ecdc_continent_all.html
+++ b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/all/ecdc_country_all.html
@@ -7,17 +7,17 @@
     <div class="container">
         <div class="row">
             <div class="col">
-                {% include 'ecdc/continent/ecdc_continent_all_pagination.html' %}
+                {% include 'ecdc/country/all/ecdc_country_all_pagination.html' %}
             </div>
         </div>
         <div class="row">
             <div class="col">
-                {% include 'ecdc/continent/ecdc_continent_all_table.html' %}
+                {% include 'ecdc/country/all/ecdc_country_all_table.html' %}
             </div>
-        </div>
+        </div>ecdc_country_all_
         <div class="row">
             <div class="col">
-                {% include 'ecdc/continent/ecdc_continent_all_pagination.html' %}
+                {% include 'ecdc/country/all/ecdc_country_all_pagination.html' %}
             </div>
         </div>
     </div>
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_all_pagination.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/all/ecdc_country_all_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_all_pagination.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/all/ecdc_country_all_pagination.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_all_table.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/all/ecdc_country_all_table.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_all_table.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/all/ecdc_country_all_table.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_all.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_all.html
deleted file mode 100644
index 6efea371afcf9564eb7020573218d2c8c90cfdc5..0000000000000000000000000000000000000000
--- a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_all.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends 'app_application/layout/page_layout.html' %}
-
-{% block content %}
-    {{super()}}
-    {% include 'ecdc/navigation/ecdc_navtabs.html' %}
-
-    <div class="container">
-        <div class="row">
-            <div class="col">
-                {% include 'ecdc/country/ecdc_country_all_pagination.html' %}
-            </div>
-        </div>
-        <div class="row">
-            <div class="col">
-                {% include 'ecdc/country/ecdc_country_all_table.html' %}
-            </div>
-        </div>ecdc_country_all_
-        <div class="row">
-            <div class="col">
-                {% include 'ecdc/country/ecdc_country_all_pagination.html' %}
-            </div>
-        </div>
-    </div>
-
-{% endblock %}
-
-
-{% block footer_container %}
-    <div>
-        {% for error in errors %}
-            <h4>{{ error }}</h4>
-        {% endfor %}
-    </div>
-{% endblock %}
\ No newline at end of file
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_germany.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/germany/ecdc_country_germany.html
similarity index 79%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_germany.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/germany/ecdc_country_germany.html
index 3f8ff339c2434ddc82171cec0fbf90075bb676da..04b06b1a485842ad8dfa78c5ee9c99236ace0245 100644
--- a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_germany.html
+++ b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/germany/ecdc_country_germany.html
@@ -7,7 +7,7 @@
     <div class="container">
         <div class="row">
             <div class="col">
-                {% include 'ecdc/country/ecdc_country_germany_pagination.html' %}
+                {% include 'ecdc/country/germany/ecdc_country_germany_pagination.html' %}
             </div>
         </div>
         <div class="row">
@@ -17,7 +17,7 @@
         </div>
         <div class="row">
             <div class="col">
-                {% include 'ecdc/country/ecdc_country_germany_pagination.html' %}
+                {% include 'ecdc/country/germany/ecdc_country_germany_pagination.html' %}
             </div>
         </div>
     </div>
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_germany_pagination.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/germany/ecdc_country_germany_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_germany_pagination.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/germany/ecdc_country_germany_pagination.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_one.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/one/ecdc_country_one.html
similarity index 80%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_one.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/one/ecdc_country_one.html
index bea38ab46eb1c548c9191dff72369f9fe1d81254..27a9f8e9afd1ec7e924ca196ddce927d0795118d 100644
--- a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_one.html
+++ b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/one/ecdc_country_one.html
@@ -7,7 +7,7 @@
     <div class="container">
         <div class="row">
             <div class="col">
-                {% include 'ecdc/country/ecdc_country_one_pagination.html' %}
+                {% include 'ecdc/country/one/ecdc_country_one_pagination.html' %}
             </div>
         </div>
         <div class="row">
@@ -17,7 +17,7 @@
         </div>
         <div class="row">
             <div class="col">
-                {% include 'ecdc/country/ecdc_country_one_pagination.html' %}
+                {% include 'ecdc/country/one/ecdc_country_one_pagination.html' %}
             </div>
         </div>
     </div>
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_one_pagination.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/one/ecdc_country_one_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/ecdc_country_one_pagination.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/country/one/ecdc_country_one_pagination.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/all/ecdc_date_reported_all.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/all/ecdc_date_reported_all.html
new file mode 100644
index 0000000000000000000000000000000000000000..cd1737a88850a5734ee57ba89fcf5953a54d7c90
--- /dev/null
+++ b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/all/ecdc_date_reported_all.html
@@ -0,0 +1,33 @@
+{% extends 'app_application/layout/page_layout.html' %}
+
+{% block content %}
+    {{super()}}
+    {% include 'ecdc/navigation/ecdc_navtabs.html' %}
+
+    <div class="container">
+        <div class="row">
+            <div class="col">
+                {% include 'ecdc/date_reported/all/ecdc_date_reported_all_pagination.html' %}
+            </div>
+        </div>
+        <div class="row">
+            <div class="col">
+                {% include 'ecdc/date_reported/all/ecdc_date_reported_all_table.html' %}
+            </div>
+        </div>
+        <div class="row">
+            <div class="col">
+                {% include 'ecdc/date_reported/all/ecdc_date_reported_all_pagination.html' %}
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+
+{% block footer_container %}
+    <div>
+        {% for error in errors %}
+            <h4>{{ error }}</h4>
+        {% endfor %}
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_pagination.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/all/ecdc_date_reported_all_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_pagination.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/all/ecdc_date_reported_all_pagination.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_table.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/all/ecdc_date_reported_all_table.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_all_table.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/all/ecdc_date_reported_all_table.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/cases/ecdc_date_reported_one_cases_weekly.html
similarity index 76%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/cases/ecdc_date_reported_one_cases_weekly.html
index 6ea3c5e1c30b0ffeeb69dd2d263083c2f572a17e..594707a9679f819b4ae507811bcce8ef9e6aed2d 100644
--- a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
+++ b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/cases/ecdc_date_reported_one_cases_weekly.html
@@ -7,7 +7,7 @@
     <div class="container">
         <div class="row">
             <div class="col">
-                {% include 'ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html' %}
+                {% include 'ecdc/date_reported/cases/ecdc_date_reported_one_cases_weekly_pagination.html' %}
             </div>
         </div>
         <div class="row">
@@ -17,7 +17,7 @@
         </div>
         <div class="row">
             <div class="col">
-                {% include 'ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html' %}
+                {% include 'ecdc/date_reported/cases/ecdc_date_reported_one_cases_weekly_pagination.html' %}
             </div>
         </div>
     </div>
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/cases/ecdc_date_reported_one_cases_weekly_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly_pagination.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/cases/ecdc_date_reported_one_cases_weekly_pagination.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/deaths/ecdc_date_reported_one_deaths_weekly.html
similarity index 75%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/deaths/ecdc_date_reported_one_deaths_weekly.html
index 2396d9222a9262f85ddebf4784af372e1eda215a..cbddd8eef6dedf772a711814512d1924d0aff53b 100644
--- a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
+++ b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/deaths/ecdc_date_reported_one_deaths_weekly.html
@@ -7,7 +7,7 @@
     <div class="container">
         <div class="row">
             <div class="col">
-                {% include 'ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html' %}
+                {% include 'ecdc/date_reported/deaths/ecdc_date_reported_one_deaths_weekly_pagination.html' %}
             </div>
         </div>
         <div class="row">
@@ -17,7 +17,7 @@
         </div>
         <div class="row">
             <div class="col">
-                {% include 'ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html' %}
+                {% include 'ecdc/date_reported/deaths/ecdc_date_reported_one_deaths_weekly_pagination.html' %}
             </div>
         </div>
     </div>
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/deaths/ecdc_date_reported_one_deaths_weekly_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly_pagination.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/deaths/ecdc_date_reported_one_deaths_weekly_pagination.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/notification/ecdc_date_reported_one_notification_rate.html
similarity index 74%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/notification/ecdc_date_reported_one_notification_rate.html
index c7e13294b7f2d8e0681eea5c413dffe219bc9fa8..1dcc6c0c6ec1c9ce6e03c88f738f6687c5fdea87 100644
--- a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
+++ b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/notification/ecdc_date_reported_one_notification_rate.html
@@ -7,7 +7,7 @@
     <div class="container">
         <div class="row">
             <div class="col">
-                {% include 'ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html' %}
+                {% include 'ecdc/date_reported/notification/ecdc_date_reported_one_notification_rate_pagination.html' %}
             </div>
         </div>
         <div class="row">
@@ -17,7 +17,7 @@
         </div>
         <div class="row">
             <div class="col">
-                {% include 'ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html' %}
+                {% include 'ecdc/date_reported/notification/ecdc_date_reported_one_notification_rate_pagination.html' %}
             </div>
         </div>
     </div>
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/notification/ecdc_date_reported_one_notification_rate_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate_pagination.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/notification/ecdc_date_reported_one_notification_rate_pagination.html
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/one/ecdc_date_reported_one.html
similarity index 78%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/one/ecdc_date_reported_one.html
index 3eaf7d49672fe0ecef468ebfa89ec9dfad490afe..5e07037ea0b5b46ce6dde03fc27ff8776adb1826 100644
--- a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
+++ b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/one/ecdc_date_reported_one.html
@@ -7,7 +7,7 @@
     <div class="container">
         <div class="row">
             <div class="col">
-                {% include 'ecdc/date_reported/ecdc_date_reported_one_pagination.html' %}
+                {% include 'ecdc/date_reported/one/ecdc_date_reported_one_pagination.html' %}
             </div>
         </div>
         <div class="row">
@@ -17,7 +17,7 @@
         </div>
         <div class="row">
             <div class="col">
-                {% include 'ecdc/date_reported/ecdc_date_reported_one_pagination.html' %}
+                {% include 'ecdc/date_reported/one/ecdc_date_reported_one_pagination.html' %}
             </div>
         </div>
     </div>
diff --git a/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_pagination.html b/src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/one/ecdc_date_reported_one_pagination.html
similarity index 100%
rename from src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_pagination.html
rename to src/flask_covid19/blueprints/data_ecdc/templates/ecdc/date_reported/one/ecdc_date_reported_one_pagination.html