diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_all.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_all.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_all_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all_table.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_all_table.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_all_table.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_germany.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_germany.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_germany.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_germany.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_germany_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_germany_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_germany_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_germany_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_one.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_one.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_cases_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_cumulative.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_cases_cumulative.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_cumulative.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_cases_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_cumulative_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_cases_cumulative_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_cumulative_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_cases_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_new.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_cases_new.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_new.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_new_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_cases_new_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_cases_new_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_deaths_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_cumulative.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_deaths_cumulative.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_cumulative.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_cumulative_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_deaths_cumulative_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_cumulative_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_new.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_deaths_new.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_new.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_deaths_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_new_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_deaths_new_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_deaths_new_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_table.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/country/who_country_one_table.html
rename to src/covid19/blueprints/intensivregister/templates/divi/country/who_country_one_table.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_all.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_all.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_all_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_all_table.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_table.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_cases_new.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_cases_new.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_cases_new.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_cases_new.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_cases_new_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_cases_new_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_cumulative.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_cumulative.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_cumulative_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_cumulative_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_new.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_deaths_new.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_deaths_new.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_table.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/date_reported/who_date_reported_one_table.html
rename to src/covid19/blueprints/intensivregister/templates/divi/date_reported/who_date_reported_one_table.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/who_imported.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/who_imported.html
rename to src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/who_info.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/who_info.html
rename to src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/who_tasks.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/who_tasks.html
rename to src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/fragments/fragment_who_imported_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_imported_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/fragments/fragment_who_imported_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_imported_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/fragments/fragment_who_imported_table.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_imported_table.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/fragments/fragment_who_imported_table.html
rename to src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_imported_table.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/fragments/fragment_who_table_global_data.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_table_global_data.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/fragments/fragment_who_table_global_data.html
rename to src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_who_table_global_data.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/navigation/who_navbar_dropdown.html b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/navigation/who_navbar_dropdown.html
rename to src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navbar_dropdown.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/navigation/who_navtabs.html b/src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/navigation/who_navtabs.html
rename to src/covid19/blueprints/intensivregister/templates/divi/navigation/divi_navtabs.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/region/who_region_all.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/region/who_region_all.html
rename to src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/region/who_region_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/region/who_region_all_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/region/who_region_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/region/who_region_all_table.html
rename to src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_table.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/region/who_region_one.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/region/who_region_one.html
rename to src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html
diff --git a/src/covid19/blueprints/intensivregister/templates/who/region/who_region_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html
similarity index 100%
rename from src/covid19/blueprints/intensivregister/templates/who/region/who_region_one_pagination.html
rename to src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html