diff --git a/src/covid19/blueprints/app_admin/admin_service.py b/src/covid19/blueprints/app_admin/app_admin_service.py
similarity index 100%
rename from src/covid19/blueprints/app_admin/admin_service.py
rename to src/covid19/blueprints/app_admin/app_admin_service.py
diff --git a/src/covid19/blueprints/app_admin/app_admin_views.py b/src/covid19/blueprints/app_admin/app_admin_views.py
new file mode 100644
index 0000000000000000000000000000000000000000..f903d077488a9537b622fbbc4b436fac76b9d68c
--- /dev/null
+++ b/src/covid19/blueprints/app_admin/app_admin_views.py
@@ -0,0 +1,411 @@
+from flask import render_template, redirect, url_for, flash, Blueprint
+from celery import states
+from celery.utils.log import get_task_logger
+
+from database import app
+from covid19.blueprints.app_all.application_services import who_service, ecdc_service, rki_vaccination_service
+from covid19.blueprints.app_all.application_services import rki_service
+from covid19.blueprints.app_all.application_services import admin_service, owid_service, divi_service
+from covid19.blueprints.app_application.application_workers import celery
+from covid19.blueprints.app_application.application_model_transient import ApplicationPage
+
+drop_and_create_data_again = True
+
+app_admin = Blueprint('app_admin', __name__, template_folder='templates', url_prefix='/admin')
+
+
+# ---------------------------------------------------------------------------------------------------------------
+#  Url Routes Frontend
+# ---------------------------------------------------------------------------------------------------------------
+
+@app_admin.route('/')
+def url_admin_index():
+    page_info = ApplicationPage('Admin', "Covid19 Admin")
+    return render_template(
+        'app_admin/index.html',
+        page_info=page_info)
+
+
+@app_admin.route('/tasks')
+def url_admin_tasks():
+    page_info = ApplicationPage('Admin', "Tasks")
+    return render_template(
+        'app_admin/admin_tasks.html',
+        page_info=page_info)
+
+
+@app_admin.route('/system/tasks')
+def url_system_tasks():
+    page_info = ApplicationPage('Admin', "System Tasks")
+    return render_template(
+        'app_admin/system_tasks.html',
+        page_info=page_info)
+
+
+@app_admin.route('/info')
+def url_admin_info():
+    page_info = ApplicationPage('Admin', "Info")
+    return render_template(
+        'app_admin/admin_info.html',
+        page_info=page_info)
+
+
+# ----------------------------------------------------------------------------------------------------------------
+#  Celery TASKS
+# ----------------------------------------------------------------------------------------------------------------
+
+
+@celery.task(bind=True)
+def task_admin_alive_message(self):
+    logger = get_task_logger(__name__)
+    self.update_state(state=states.STARTED)
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_alive_message [received] ")
+    logger.info("------------------------------------------------------------")
+    self.update_state(state=states.SUCCESS)
+    result = "OK (task_admin_alive_message)"
+    return result
+
+
+@celery.task(bind=True)
+def task_admin_database_drop_create(self):
+    logger = get_task_logger(__name__)
+    self.update_state(state=states.STARTED)
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_database_drop_create [start] ")
+    logger.info("------------------------------------------------------------")
+    who_service.task_database_drop_create()
+    # divi_service.task_database_drop_create()
+    ecdc_service.task_database_drop_create()
+    owid_service.task_database_drop_create()
+    rki_vaccination_service.task_database_drop_create()
+    # rki_service_bundeslaender.task_database_drop_create()
+    # rki_service_landkreise.task_database_drop_create()
+    admin_service.task_database_drop_create()
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_database_drop_create [done] ")
+    logger.info("------------------------------------------------------------")
+    self.update_state(state=states.SUCCESS)
+    result = "OK (task_admin_database_drop_create)"
+    return result
+
+
+@celery.task(bind=True)
+def task_admin_import_all_files(self):
+    logger = get_task_logger(__name__)
+    self.update_state(state=states.STARTED)
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_import_all_files [start] ")
+    logger.info("------------------------------------------------------------")
+    who_service.task_admin_import_all_files()
+    # divi_service.task_admin_import_all_files()
+    ecdc_service.task_admin_import_all_files()
+    owid_service.task_admin_import_all_files()
+    rki_vaccination_service.task_admin_import_all_files()
+    # rki_service_bundeslaender.task_admin_import_all_files()
+    # rki_service_landkreise.task_admin_import_all_files()
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_import_all_files [done] ")
+    logger.info("------------------------------------------------------------")
+    self.update_state(state=states.SUCCESS)
+    result = "OK (task_admin_import_all_files)"
+    return result
+
+
+@celery.task(bind=True)
+def task_admin_update_full_dimension_tables(self):
+    logger = get_task_logger(__name__)
+    self.update_state(state=states.STARTED)
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_full_dimension_tables [start] ")
+    logger.info("------------------------------------------------------------")
+    who_service.task_admin_update_full_dimension_tables()
+    # divi_service.full_update_dimension_tables()
+    ecdc_service.task_admin_update_full_dimension_tables()
+    owid_service.task_admin_update_full_dimension_tables()
+    rki_vaccination_service.task_admin_update_full_dimension_tables()
+    # rki_service_bundeslaender.full_update_dimension_tables()
+    # rki_service_landkreise.full_update_dimension_tables()
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_full_dimension_tables [done] ")
+    logger.info("------------------------------------------------------------")
+    self.update_state(state=states.SUCCESS)
+    result = "OK (task_admin_update_full_dimension_tables)"
+    return result
+
+
+@celery.task(bind=True)
+def task_admin_update_dimension_tables(self):
+    logger = get_task_logger(__name__)
+    self.update_state(state=states.STARTED)
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_dimension_tables_only [start] ")
+    logger.info("------------------------------------------------------------")
+    who_service.task_admin_update_dimension_tables()
+    # divi_service.update_dimension_tables_only()
+    ecdc_service.task_admin_update_dimension_tables()
+    owid_service.task_admin_update_dimension_tables()
+    rki_vaccination_service.task_admin_update_dimension_tables()
+    # rki_service_bundeslaender.update_dimension_tables_only()
+    # rki_service_landkreise.update_dimension_tables_only()
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_dimension_tables_only [done] ")
+    logger.info("------------------------------------------------------------")
+    self.update_state(state=states.SUCCESS)
+    result = "OK (task_admin_update_dimension_tables_only)"
+    return result
+
+
+@celery.task(bind=True)
+def task_admin_full_update_fact_table(self):
+    logger = get_task_logger(__name__)
+    self.update_state(state=states.STARTED)
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_fact_table_initial_only [start] ")
+    logger.info("------------------------------------------------------------")
+    who_service.task_admin_full_update_fact_table()
+    # divi_service.full_update_fact_table()
+    ecdc_service.task_admin_full_update_fact_table()
+    owid_service.task_admin_full_update_fact_table()
+    rki_vaccination_service.task_admin_full_update_fact_table()
+    # rki_service_bundeslaender.update_fact_table_initial_only()
+    # rki_service_landkreise.update_fact_table_initial_only()
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_fact_table_initial_only [done] ")
+    logger.info("------------------------------------------------------------")
+    self.update_state(state=states.SUCCESS)
+    result = "OK (task_admin_update_fact_table_initial_only)"
+    return result
+
+
+@celery.task(bind=True)
+def task_admin_update_fact_table(self):
+    logger = get_task_logger(__name__)
+    self.update_state(state=states.STARTED)
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_fact_table_incremental_only [start] ")
+    logger.info("------------------------------------------------------------")
+    who_service.task_admin_update_fact_table()
+    # divi_service.task_admin_update_fact_table()
+    ecdc_service.task_admin_update_fact_table()
+    owid_service.task_admin_update_fact_table()
+    rki_vaccination_service.task_admin_update_fact_table()
+    # rki_service_bundeslaender.task_admin_update_fact_table()
+    # rki_service_landkreise.task_admin_update_fact_table()
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_fact_table_incremental_only [done] ")
+    logger.info("------------------------------------------------------------")
+    self.update_state(state=states.SUCCESS)
+    result = "OK (task_admin_update_fact_table_incremental_only)"
+    return result
+
+
+@celery.task(bind=True)
+def task_admin_full_update_star_schema(self):
+    logger = get_task_logger(__name__)
+    self.update_state(state=states.STARTED)
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_star_schema_initial [start] ")
+    logger.info("------------------------------------------------------------")
+    who_service.task_admin_full_update_star_schema()
+    # divi_service.task_admin_full_update_star_schema()
+    ecdc_service.task_admin_full_update_star_schema()
+    owid_service.task_admin_full_update_star_schema()
+    rki_vaccination_service.task_admin_full_update_star_schema()
+    # rki_service_bundeslaender.task_admin_full_update_star_schema()
+    # rki_service_landkreise.task_admin_full_update_star_schema()
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_star_schema_initial [done] ")
+    logger.info("------------------------------------------------------------")
+    self.update_state(state=states.SUCCESS)
+    result = "OK (task_admin_update_star_schema_initial)"
+    return result
+
+
+@celery.task(bind=True)
+def task_admin_update_star_schema(self):
+    logger = get_task_logger(__name__)
+    self.update_state(state=states.STARTED)
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_star_schema_incremental [start] ")
+    logger.info("------------------------------------------------------------")
+    who_service.task_admin_update_star_schema()
+    # divi_service.task_admin_update_star_schema()
+    ecdc_service.task_admin_update_star_schema()
+    owid_service.task_admin_update_star_schema()
+    rki_vaccination_service.task_admin_update_star_schema()
+    # rki_service_bundeslaender.task_admin_update_star_schema()
+    # rki_service_landkreise.task_admin_update_star_schema()
+    logger.info("------------------------------------------------------------")
+    logger.info(" task_admin_update_star_schema_incremental [done] ")
+    logger.info("------------------------------------------------------------")
+    self.update_state(state=states.SUCCESS)
+    result = "OK (task_admin_update_star_schema_incremental)"
+    return result
+
+# ----------------------------------------------------------------------------------------------------------------
+#  URL Routes for Celery TASKS
+# ----------------------------------------------------------------------------------------------------------------
+
+
+@app_admin.route('/task/alive_message')
+def url_task_admin_alive_message():
+    app.logger.info("url_task_admin_message_start [start]")
+    task_admin_alive_message.apply_async()
+    flash("alive_message_task started")
+    app.logger.info("url_task_admin_message_start [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/database/dump')
+def url_task_admin_database_dump():
+    app.logger.info("url_task_admin_database_dump [start]")
+    admin_service.run_admin_database_dump()
+    flash("admin_service.run_admin_database_dump started")
+    app.logger.info("url_task_admin_database_dump [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/database/reimport')
+def url_task_admin_database_dump_reimport():
+    app.logger.info("url_task_admin_database_dump_reimport [start]")
+    admin_service.run_admin_database_dump_reimport()
+    flash("admin_service.run_admin_database_import started")
+    app.logger.info("url_task_admin_database_dump_reimport [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/database/drop_create')
+def url_task_admin_database_dropcreate():
+    app.logger.info("url_task_admin_database_dropcreate [start]")
+    admin_service.run_admin_database_drop_and_create()
+    flash("admin_service.run_admin_database_drop started")
+    app.logger.info("url_task_admin_database_dropcreate [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/database/drop')
+def url_task_admin_database_drop():
+    flash("url_task_admin_database_drop [start]")
+    app.logger.info("admin_service.run_admin_database_drop_and_create [start]")
+    admin_service.run_admin_database_drop_and_create()
+    flash("admin_service.run_admin_database_drop_and_create() [done]")
+    app.logger.info("admin_service.run_admin_database_drop_and_create() [done]")
+    if drop_and_create_data_again:
+        who_service.pretask_database_drop_create()
+        # divi_service.pretask_database_drop_create()
+        ecdc_service.pretask_database_drop_create()
+        owid_service.pretask_database_drop_create()
+        rki_vaccination_service.pretask_database_drop_create()
+        # rki_service_bundeslaender.pretask_database_drop_create()
+        # rki_service_landkreise.pretask_database_drop_create()
+        task_admin_database_drop_create.apply_async()
+        flash(message="async task_admin_database_drop_create [start]", category="warning")
+        app.logger.warn("async task_admin_database_drop_create [start]")
+    app.logger.info("url_task_admin_database_drop [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/files/all/download')
+def url_task_admin_download_all_files():
+    app.logger.info("url_task_admin_download_all_files [start]")
+    who_service.download_all_files()
+    divi_service.download_all_files()
+    ecdc_service.download_all_files()
+    owid_service.download_all_files()
+    rki_vaccination_service.download_all_files()
+    rki_service.download_all_files()
+    app.logger.info("url_task_admin_download_all_files [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/files/all/import')
+def url_task_admin_import_all_files():
+    app.logger.info("url_task_admin_import_all_files [start]")
+    task_admin_import_all_files.apply_async()
+    flash(message="async url_task_admin_import_all_files [start]", category="warning")
+    app.logger.warn("async url_task_admin_import_all_files [start]")
+    app.logger.info("url_task_admin_import_all_files [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/update/all/dimension_tables')
+def url_task_admin_update_dimension_tables():
+    app.logger.info("url_task_admin_update_dimension_tables [start]")
+    task_admin_update_dimension_tables.apply_async()
+    flash(message="async task_admin_update_dimension_tables [start]", category="warning")
+    app.logger.warn("async task_admin_update_dimension_tables [start]")
+    app.logger.info("url_task_admin_update_dimension_tables [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/full/update/all/dimension_tables')
+def url_task_admin_update_full_dimension_tables():
+    app.logger.info("url_task_admin_update_full_dimension_tables [start]")
+    task_admin_update_full_dimension_tables.apply_async()
+    flash(message="async task_admin_update_full_dimension_tables [start]", category="warning")
+    app.logger.warn("async task_admin_update_full_dimension_tables [start]")
+    app.logger.info("url_task_admin_update_full_dimension_tables [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/full/update/all/fact_tables')
+def url_task_admin_full_update_fact_table():
+    app.logger.info("url_task_admin_full_update_fact_table [start]")
+    task_admin_full_update_fact_table.apply_async()
+    flash(message="async task_admin_full_update_fact_table [start]", category="warning")
+    app.logger.warn("async task_admin_full_update_fact_table [start]")
+    app.logger.info("url_task_admin_full_update_fact_table [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/update/all/fact_tables')
+def url_task_admin_update_fact_table():
+    app.logger.info("url_task_admin_update_fact_table [start]")
+    task_admin_update_fact_table.apply_async()
+    flash(message="async task_admin_update_fact_table [start]", category="warning")
+    app.logger.warn("async task_admin_update_fact_table [start]")
+    app.logger.info("url_task_admin_update_fact_table [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/full/update/star_schema')
+def url_task_admin_full_update_star_schema():
+    app.logger.info("url_task_admin_full_update_star_schema [start]")
+    task_admin_full_update_star_schema.apply_async()
+    flash(message="async task_admin_full_update_star_schema [start]", category="warning")
+    app.logger.warn("async task_admin_full_update_star_schema [start]")
+    app.logger.info("url_task_admin_full_update_star_schema [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/update/star_schema')
+def url_task_admin_update_star_schema():
+    app.logger.info("url_task_admin_update_star_schema [start]")
+    task_admin_update_star_schema.apply_async()
+    flash(message="async task_admin_update_star_schema [start]", category="warning")
+    app.logger.warn("async task_admin_update_star_schema [start]")
+    app.logger.info("url_task_admin_update_star_schema [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
+
+
+@app_admin.route('/task/full/update/do/all')
+def url_task_admin_full_update_do_all():
+    app.logger.info("url_task_admin_full_update_do_all [start]")
+    who_service.download_files()
+    flash("who_service.download_files() [done]")
+    # divi_service.download_files()
+    flash("divi_service.download_files() [done]")
+    ecdc_service.download_all_files()
+    flash("ecdc_service.download_all_files() [done]")
+    owid_service.download_all_files()
+    flash("owid_service.download_all_files() [done]")
+    rki_vaccination_service.download_all_files()
+    flash("rki_vaccination_service.download_all_files() [done]")
+    rki_service.download_all_files()
+    flash("rki_service_bundeslaender.download_all_files() [done]")
+    task_admin_full_update_star_schema.apply_async()
+    flash(message="async task_admin_full_update_star_schema [start]", category="warning")
+    app.logger.warn("async task_admin_full_update_star_schema [start]")
+    app.logger.info("url_task_admin_full_update_do_all [done]")
+    return redirect(url_for('app_admin.url_admin_tasks'))
diff --git a/src/covid19/blueprints/app_admin/templates/admin/admin_info.html b/src/covid19/blueprints/app_admin/templates/app_admin/admin_info.html
similarity index 52%
rename from src/covid19/blueprints/app_admin/templates/admin/admin_info.html
rename to src/covid19/blueprints/app_admin/templates/app_admin/admin_info.html
index f534ae42f07c9765836f658c785660554d7581e7..013f4ab5afecef9396542dd42e9db88b9954ab54 100644
--- a/src/covid19/blueprints/app_admin/templates/admin/admin_info.html
+++ b/src/covid19/blueprints/app_admin/templates/app_admin/admin_info.html
@@ -1,8 +1,8 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
-    {% include 'admin/navigation/admin_navtabs.html' %}
+    {% include 'app_admin/navigation/app_admin_navtabs.html' %}
 
     <div class="container">
         <div class="row">
diff --git a/src/covid19/blueprints/app_admin/templates/admin/system_tasks.html b/src/covid19/blueprints/app_admin/templates/app_admin/admin_tasks.html
similarity index 95%
rename from src/covid19/blueprints/app_admin/templates/admin/system_tasks.html
rename to src/covid19/blueprints/app_admin/templates/app_admin/admin_tasks.html
index a1c56d40c0a0cd6b716091f842ea98115abbf4f5..837bc4a3e34a84a6163e59b50578a9d15099036f 100644
--- a/src/covid19/blueprints/app_admin/templates/admin/system_tasks.html
+++ b/src/covid19/blueprints/app_admin/templates/app_admin/admin_tasks.html
@@ -1,8 +1,8 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
-    {% include 'admin/navigation/admin_navtabs.html' %}
+    {% include 'app_admin/navigation/app_admin_navtabs.html' %}
 
     <div class="container">
         <div class="row">
diff --git a/src/covid19/blueprints/app_admin/templates/admin/index.html b/src/covid19/blueprints/app_admin/templates/app_admin/index.html
similarity index 93%
rename from src/covid19/blueprints/app_admin/templates/admin/index.html
rename to src/covid19/blueprints/app_admin/templates/app_admin/index.html
index 62c36d7fcea13a64a4629d9eb6edaa590d8bfcb3..dade2a1eb63d17c00ee7662b96f8d77a304ada3e 100644
--- a/src/covid19/blueprints/app_admin/templates/admin/index.html
+++ b/src/covid19/blueprints/app_admin/templates/app_admin/index.html
@@ -1,6 +1,6 @@
-{% extends 'admin/master.html' %}
+{% extends 'app_admin/master.html' %}
 
-    {% include 'admin/navigation/admin_navtabs.html' %}
+    {% include 'app_admin/navigation/app_admin_navtabs.html' %}
     <div class="container">
         <div class="row">
             <div class="col">
diff --git a/src/covid19/blueprints/app_admin/templates/admin/navigation/admin_navbar_dropdown.html b/src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/app_admin/templates/admin/navigation/admin_navbar_dropdown.html
rename to src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navbar_dropdown.html
diff --git a/src/covid19/blueprints/app_admin/templates/admin/navigation/admin_navtabs.html b/src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/app_admin/templates/admin/navigation/admin_navtabs.html
rename to src/covid19/blueprints/app_admin/templates/app_admin/navigation/app_admin_navtabs.html
diff --git a/src/covid19/blueprints/app_application/application_service_config.py b/src/covid19/blueprints/app_all/app_all_service_config.py
similarity index 100%
rename from src/covid19/blueprints/app_application/application_service_config.py
rename to src/covid19/blueprints/app_all/app_all_service_config.py
diff --git a/src/covid19/blueprints/app_application/application_services.py b/src/covid19/blueprints/app_all/app_all_services.py
similarity index 92%
rename from src/covid19/blueprints/app_application/application_services.py
rename to src/covid19/blueprints/app_all/app_all_services.py
index 8e16a67b909b5fde4dd6445e01512ccb7b7f4cb2..a92d58a1ec8ef76acb385a70eb4e3cf7d3e38f94 100644
--- a/src/covid19/blueprints/app_application/application_services.py
+++ b/src/covid19/blueprints/app_all/app_all_services.py
@@ -1,6 +1,6 @@
 from database import db
 
-from covid19.blueprints.app_admin.admin_service import AdminService
+from covid19.blueprints.app_admin.app_admin_service import AdminService
 from covid19.blueprints.app_user.user_service import UserService
 from covid19.blueprints.ecdc.ecdc_service import EcdcService
 from covid19.blueprints.owid.owid_service import OwidService
diff --git a/src/covid19/blueprints/app_admin/admin_views.py b/src/covid19/blueprints/app_all/app_all_views.py
similarity index 97%
rename from src/covid19/blueprints/app_admin/admin_views.py
rename to src/covid19/blueprints/app_all/app_all_views.py
index 60fb8f2069beb46b4c7771a7354d2ed50751103a..3d560be0cbfc81f1f27ce45c5875d6e96042d400 100644
--- a/src/covid19/blueprints/app_admin/admin_views.py
+++ b/src/covid19/blueprints/app_all/app_all_views.py
@@ -3,11 +3,11 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-from covid19.blueprints.application.application_services import who_service, ecdc_service, rki_vaccination_service
-from covid19.blueprints.application.application_services import rki_service
-from covid19.blueprints.application.application_services import admin_service, owid_service, divi_service
-from covid19.blueprints.application.application_workers import celery
-from covid19.blueprints.application.application_model_transient import ApplicationPage
+from covid19.blueprints.app_all.app_all_services import who_service, ecdc_service, rki_vaccination_service
+from covid19.blueprints.app_all.app_all_services import rki_service
+from covid19.blueprints.app_all.app_all_services import admin_service, owid_service, divi_service
+from covid19.blueprints.app_application.application_workers import celery
+from covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 drop_and_create_data_again = True
 
@@ -22,7 +22,7 @@ app_admin = Blueprint('app_admin', __name__, template_folder='templates', url_pr
 def url_admin_index():
     page_info = ApplicationPage('Admin', "Covid19 Admin")
     return render_template(
-        'admin/index.html',
+        'app_admin/index.html',
         page_info=page_info)
 
 
@@ -30,7 +30,7 @@ def url_admin_index():
 def url_admin_tasks():
     page_info = ApplicationPage('Admin', "Tasks")
     return render_template(
-        'admin/admin_tasks.html',
+        'app_admin/admin_tasks.html',
         page_info=page_info)
 
 
@@ -38,7 +38,7 @@ def url_admin_tasks():
 def url_system_tasks():
     page_info = ApplicationPage('Admin', "System Tasks")
     return render_template(
-        'admin/system_tasks.html',
+        'app_admin/system_tasks.html',
         page_info=page_info)
 
 
@@ -46,7 +46,7 @@ def url_system_tasks():
 def url_admin_info():
     page_info = ApplicationPage('Admin', "Info")
     return render_template(
-        'admin/admin_info.html',
+        'app_admin/admin_info.html',
         page_info=page_info)
 
 
diff --git a/src/covid19/blueprints/app_all/templates/__init__.py b/src/covid19/blueprints/app_all/templates/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/covid19/blueprints/app_admin/templates/admin/admin_tasks.html b/src/covid19/blueprints/app_all/templates/app_all/app_all_tasks.html
similarity index 97%
rename from src/covid19/blueprints/app_admin/templates/admin/admin_tasks.html
rename to src/covid19/blueprints/app_all/templates/app_all/app_all_tasks.html
index f584470fc5db8f85dd742c617f72665b42c0b211..6af792e782828ba247cd767f730d95b0e05e9bc1 100644
--- a/src/covid19/blueprints/app_admin/templates/admin/admin_tasks.html
+++ b/src/covid19/blueprints/app_all/templates/app_all/app_all_tasks.html
@@ -1,8 +1,8 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
-    {% include 'admin/navigation/admin_navtabs.html' %}
+    {% include 'app_admin/navigation/admin_navtabs.html' %}
 
     <div class="container">
         <div class="row">
diff --git a/src/covid19/blueprints/app_application/templates/application/fragments/fragment_flashed_messages.html b/src/covid19/blueprints/app_all/templates/app_all/fragments/fragment_flashed_messages.html
similarity index 100%
rename from src/covid19/blueprints/app_application/templates/application/fragments/fragment_flashed_messages.html
rename to src/covid19/blueprints/app_all/templates/app_all/fragments/fragment_flashed_messages.html
diff --git a/src/covid19/blueprints/app_application/templates/application/fragments/fragment_pagination.html b/src/covid19/blueprints/app_all/templates/app_all/fragments/fragment_pagination.html
similarity index 100%
rename from src/covid19/blueprints/app_application/templates/application/fragments/fragment_pagination.html
rename to src/covid19/blueprints/app_all/templates/app_all/fragments/fragment_pagination.html
diff --git a/src/covid19/blueprints/app_application/templates/application/page_layout.html b/src/covid19/blueprints/app_all/templates/app_all/layout/page_layout.html
similarity index 78%
rename from src/covid19/blueprints/app_application/templates/application/page_layout.html
rename to src/covid19/blueprints/app_all/templates/app_all/layout/page_layout.html
index 61c45d80fb01d662a2569db288a8968235337af9..9df897c13b28ca911c0f78ef8b680cc65be041b7 100644
--- a/src/covid19/blueprints/app_application/templates/application/page_layout.html
+++ b/src/covid19/blueprints/app_all/templates/app_all/layout/page_layout.html
@@ -13,7 +13,7 @@
 
 
 {% block navbar %}
-  {% include 'application/navigation/navbar.html' %}
+  {% include 'app_application/navigation/navbar.html' %}
 {% endblock %}
 
 {% block content %}
@@ -23,10 +23,10 @@
                 <h1 class="display-3">{{page_info.title}} | <small class="display-4">{{page_info.subtitle}}</small></h1>
             </div>
             <div class="row-cols-1">
-                {% include 'application/fragments/fragment_flashed_messages.html' %}
+                {% include 'app_application/fragments/fragment_flashed_messages.html' %}
             </div>
             <div class="row-cols-1">
-                {% include 'application/navigation/navtabs.html' %}
+                {% include 'app_application/navigation/navtabs.html' %}
             </div>
     </div>
 {% endblock %}
diff --git a/src/covid19/blueprints/app_application/templates/application/page_layout_old.html b/src/covid19/blueprints/app_all/templates/app_all/layout/page_layout_old.html
similarity index 85%
rename from src/covid19/blueprints/app_application/templates/application/page_layout_old.html
rename to src/covid19/blueprints/app_all/templates/app_all/layout/page_layout_old.html
index 7737bfc1ae97091ac3af7abfcfd2faec0b7f5fe8..28d8cd9205a4db400d8cf7a99bcf7b18be404297 100644
--- a/src/covid19/blueprints/app_application/templates/application/page_layout_old.html
+++ b/src/covid19/blueprints/app_all/templates/app_all/layout/page_layout_old.html
@@ -11,13 +11,13 @@
 
     <header>
         <div class="container tw_padding">
-            {% include 'application/fragments/fragment_navbar.html' %}
+            {% include 'app_application/fragments/fragment_navbar.html' %}
         </div>
     </header>
 
     <section>
         <div class="container tw_padding">
-            {% include 'application/fragments/fragment_navtabs.html' %}
+            {% include 'app_application/fragments/fragment_navtabs.html' %}
         </div>
         <div class="container">
             {% block navigation_navtabs %}{% endblock %}
@@ -29,7 +29,7 @@
 
     <main>
         <div class="container tw_padding">
-            {% include 'application/fragments/fragment_flashed_messages.html' %}
+            {% include 'app_application/fragments/fragment_flashed_messages.html' %}
         </div>
         <div class="container tw_padding">
             {% block main_container %}{% endblock %}
diff --git a/src/covid19/blueprints/app_application/application_service_download.py b/src/covid19/blueprints/app_application/application_service_download.py
index 475a5bcc40e1b6e4d50949b0b54ce9111d26c5c0..36f7e1ece4619ea0c4f1ac770b58e3550e961f41 100644
--- a/src/covid19/blueprints/app_application/application_service_download.py
+++ b/src/covid19/blueprints/app_application/application_service_download.py
@@ -2,7 +2,7 @@ import os
 import wget
 import subprocess
 from database import app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.app_all_service_config import ApplicationServiceConfig
 
 
 class ApplicationServiceDownload:
diff --git a/src/covid19/blueprints/app_application/application_views.py b/src/covid19/blueprints/app_application/application_views.py
index f6ebe5f224356bb6850d7efd218b32d4370f00a7..eeeef57ec71d6e9a2b14374cac58567e0bd5a433 100644
--- a/src/covid19/blueprints/app_application/application_views.py
+++ b/src/covid19/blueprints/app_application/application_views.py
@@ -5,7 +5,7 @@ from covid19.blueprints.app_application.application_model_transient import Appli
 
 
 from covid19.blueprints.app_user.user_views import app_user
-from covid19.blueprints.app_admin.admin_views import app_admin
+from covid19.blueprints.app_admin.app_admin_views import app_admin
 
 from covid19.blueprints.who.who_views import app_who
 from covid19.blueprints.owid.owid_views import app_owid
@@ -50,7 +50,7 @@ app.register_blueprint(app_divi_test, url_prefix='/divi/test')
 def url_home():
     page_info = ApplicationPage('Home', "Covid19 Data")
     return render_template(
-        'application/page_home.html',
+        'app_application/page_home.html',
         page_info=page_info)
 
 
diff --git a/src/covid19/blueprints/app_application/application_workers.py b/src/covid19/blueprints/app_application/application_workers.py
index 7271b868e19d21cac27e63f1ac4f68f277e3cde9..64fd1c7485c89002b1136d8bcf194943a565edcc 100644
--- a/src/covid19/blueprints/app_application/application_workers.py
+++ b/src/covid19/blueprints/app_application/application_workers.py
@@ -1,7 +1,7 @@
 import sys
 from covid19 import app
 from database import create_celery, db
-from covid19.blueprints.app_application.application_services import user_service
+from covid19.blueprints.app_all.application_services import user_service
 from covid19.blueprints.app_application.application_service import ApplicationService
 
 
diff --git a/src/covid19/blueprints/app_application/templates/application/navigation/navbar.html b/src/covid19/blueprints/app_application/templates/app_application/navigation/navbar.html
similarity index 94%
rename from src/covid19/blueprints/app_application/templates/application/navigation/navbar.html
rename to src/covid19/blueprints/app_application/templates/app_application/navigation/navbar.html
index 4543ec38f999dc0503e2ff23b7528867d66e645a..a0885f59d1afb1adb547cb1a2058c5524fb6f936 100644
--- a/src/covid19/blueprints/app_application/templates/application/navigation/navbar.html
+++ b/src/covid19/blueprints/app_application/templates/app_application/navigation/navbar.html
@@ -28,7 +28,7 @@
 
                     {% include 'usr/navigation/usr_navbar_dropdown.html' %}
 
-                    {% include 'admin/navigation/admin_navbar_dropdown.html' %}
+                    {% include 'app_admin/navigation/admin_navbar_dropdown.html' %}
 
                 </ul>
             </div>
diff --git a/src/covid19/blueprints/app_application/templates/application/navigation/navtabs.html b/src/covid19/blueprints/app_application/templates/app_application/navigation/navtabs.html
similarity index 100%
rename from src/covid19/blueprints/app_application/templates/application/navigation/navtabs.html
rename to src/covid19/blueprints/app_application/templates/app_application/navigation/navtabs.html
diff --git a/src/covid19/blueprints/app_application/templates/application/page_home.html b/src/covid19/blueprints/app_application/templates/app_application/page_home.html
similarity index 77%
rename from src/covid19/blueprints/app_application/templates/application/page_home.html
rename to src/covid19/blueprints/app_application/templates/app_application/page_home.html
index 2c42f67b0b8c021db72aca405c195dd1d48b9368..aba6ed362bad5ca1ffcf489567450ef541c1edf1 100644
--- a/src/covid19/blueprints/app_application/templates/application/page_home.html
+++ b/src/covid19/blueprints/app_application/templates/app_application/page_home.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/app_user/templates/usr/login.html b/src/covid19/blueprints/app_user/templates/usr/login.html
index cba0f3dcb4429d10a5e0e6e0a395c68eb178ca69..e6573c294f6e25299711ac3735aa49822017d5f6 100644
--- a/src/covid19/blueprints/app_user/templates/usr/login.html
+++ b/src/covid19/blueprints/app_user/templates/usr/login.html
@@ -1,5 +1,4 @@
-{% extends 'application/page_layout.html' %}
-
+{% extends 'app_all/layout/page_layout.html' %}
 {% block content %}
     {{super()}}
     {% include 'usr/navigation/usr_navtabs.html' %}
diff --git a/src/covid19/blueprints/app_user/templates/usr/profile.html b/src/covid19/blueprints/app_user/templates/usr/profile.html
index dbcf3c5165a09426f7200495e7a30dab070d1e52..202fa8fa04565c52f84cfaf7aca45cfd7cc666f2 100644
--- a/src/covid19/blueprints/app_user/templates/usr/profile.html
+++ b/src/covid19/blueprints/app_user/templates/usr/profile.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/app_user/templates/usr/user_info.html b/src/covid19/blueprints/app_user/templates/usr/user_info.html
index 66af388f4d8a1701e59594d7915efdef1d187a72..6bf18411f42acd9c07f73e6be8bb53e48020e46a 100644
--- a/src/covid19/blueprints/app_user/templates/usr/user_info.html
+++ b/src/covid19/blueprints/app_user/templates/usr/user_info.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/app_user/templates/usr/user_tasks.html b/src/covid19/blueprints/app_user/templates/usr/user_tasks.html
index 868afa3cc2450d7681c83b58815b2e5422e8dec0..55d5a8d7725d35d98420952dd7bea09e986cbf2d 100644
--- a/src/covid19/blueprints/app_user/templates/usr/user_tasks.html
+++ b/src/covid19/blueprints/app_user/templates/usr/user_tasks.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/ecdc_service.py b/src/covid19/blueprints/ecdc/ecdc_service.py
index b7fff19f8037175db86b423bed7e58f397c4dfa3..8502de8ec62a83237c8e95e965c3120473ab1193 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service.py
@@ -1,7 +1,5 @@
-from flask import flash
-
 from database import app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.app_application.application_service_download import ApplicationServiceDownload
 from covid19.blueprints.ecdc.ecdc_service_import import EcdcServiceImport
 from covid19.blueprints.ecdc.ecdc_service_update import EcdcServiceUpdate, EcdcServiceUpdateFull
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_import.py b/src/covid19/blueprints/ecdc/ecdc_service_import.py
index e94e57fc280b4fde4aa48dd16d4392c8e6c397d3..c96d0edd2dcb2fe685b7eee28030f36b291702af 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_import.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_import.py
@@ -2,7 +2,7 @@ import csv
 import psycopg2
 
 from database import db, app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
 
 
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_update.py b/src/covid19/blueprints/ecdc/ecdc_service_update.py
index 9645c495b5c8bd0b16c30098e8972f90d4f2aa53..8763df61ef02e45d47f33a87e6b48379ec7984f6 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_update.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_update.py
@@ -1,5 +1,5 @@
 from database import db, app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
 from covid19.blueprints.ecdc.ecdc_model import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData
 
diff --git a/src/covid19/blueprints/ecdc/ecdc_views.py b/src/covid19/blueprints/ecdc/ecdc_views.py
index dcb12ea27a792a6f6ae1f33913ab455bc3034d52..b7bb2c4c168082664a170a0037937c6126301151 100644
--- a/src/covid19/blueprints/ecdc/ecdc_views.py
+++ b/src/covid19/blueprints/ecdc/ecdc_views.py
@@ -4,7 +4,7 @@ from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 
 from database import admin, db
-from covid19.blueprints.app_application.application_services import ecdc_service
+from covid19.blueprints.app_all.application_services import ecdc_service
 from covid19.blueprints.app_application.application_workers import celery
 
 from covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
index e95a022bdddd3da1cff1581b7e9f84ca9b4d7a4a..9c6a3ef059b871ad6e5bd9f44961e5fa2abbb047 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
index c49b6f3b7c79933d892021f4253a65fa86a5d343..ed59eac05189fd95c844e96e4cbda7778e2af1bd 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/continent/ecdc_continent_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
index ca07d13d72e84eebdd525463fca52eb5e6d84a17..63896db920348fc3a7cdf6b3439bf8af63e3c0f4 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
index 61bbe32ecab690e73f20df2159ca8ad42b635cb3..4351ad7bb84de66cd264e43d94b2edb5b3b734cb 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_germany.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
index b15f0c5513d61b44caf5cb2672c574c20600248a..b127074af11d496de49a8a59e9301426c29ec7d4 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/country/ecdc_country_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
index f1ab8fb0340938fb988b2dca61e5f44e56095a0d..c921e50a2b24b223956a0f37e35533f14836a3ad 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
index 6c49dceca6c6e681292bf281b38f22537daeff1e..cf5921bfc7b05221eed4dbb9678019f2af5d739c 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
index 7201c1dbafe755fec4755821629080bcbba706f5..4ed4ee06c6dca946bfef5d58d29e36576b04beb9 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_cases_weekly.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
index 3f64c59be09f3c0922e210cee01a3e0d9901f489..7ef122bf91d8b58990b4326969f691442ff2e0e1 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_deaths_weekly.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
index cba646907eb781a479bffecce3637ce318a1964e..49105eb58910da7c766e9ea276bd41f1b53115d4 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/date_reported/ecdc_date_reported_one_notification_rate.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data.html
index bbfcd08a419e1ed38110a8ae5cd61e7d7233c5cd..a016198c55de305a1e1fdd3f83a9ba7a46d6803b 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_data/ecdc_data.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html
index 4b5230adafd1562647b673efb9e877d4c4d9ffac..6a880552f6673f32bb12b564d041fdbfe922d406 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_info.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
index c29e4bccfd64833a6627254964b6161cb22483a5..988729e8526f7e8914b8def8c27998ecac8c41de 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html b/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html
index 157df00e27fdcb19ef9aea0d6b5d8a2101df1ed6..0b25be878c59f7e3963ea6c0e4f159469c920963 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/imported/ecdc_imported.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/ecdc_test/ecdc_test_service.py b/src/covid19/blueprints/ecdc_test/ecdc_test_service.py
index 0311658e2a8c04c89457b3727b1a5b05ed98a616..44176163673bb1c3e5eac80f98445a8fae05734f 100644
--- a/src/covid19/blueprints/ecdc_test/ecdc_test_service.py
+++ b/src/covid19/blueprints/ecdc_test/ecdc_test_service.py
@@ -1,6 +1,6 @@
 from database import app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
-from covid19.blueprints.ecdc.ecdc_model import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.ecdc.ecdc_model import EcdcDateReported, EcdcData
 
 
 class EcdcTestService:
diff --git a/src/covid19/blueprints/ecdc_test/ecdc_test_views.py b/src/covid19/blueprints/ecdc_test/ecdc_test_views.py
index bad1e9fa5d28686cb472b70268ad6cf89e142e3f..80d7c4ec9f89614f33a57da08665701baaa41ec7 100644
--- a/src/covid19/blueprints/ecdc_test/ecdc_test_views.py
+++ b/src/covid19/blueprints/ecdc_test/ecdc_test_views.py
@@ -4,12 +4,11 @@ from celery.utils.log import get_task_logger
 from flask_login import login_required
 
 from database import app, db
-from covid19.blueprints.app_application.application_services import ecdc_service
+from covid19.blueprints.app_all.application_services import ecdc_service
 from covid19.blueprints.app_application.application_workers import celery
 from covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 from covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
-from covid19.blueprints.ecdc.ecdc_model import EcdcData
 from covid19.blueprints.ecdc_test.ecdc_test_service import EcdcTestService
 
 ecdc_test_service = EcdcTestService(db, ecdc_service)
diff --git a/src/covid19/blueprints/ecdc_test/templates/ecdc_test/ecdc_tests.html b/src/covid19/blueprints/ecdc_test/templates/ecdc_test/ecdc_tests.html
index 02b829d45c2c6a50b8d637155935f771c25457ac..d153c964b1b568690c6f8f2224795aea94c307f6 100644
--- a/src/covid19/blueprints/ecdc_test/templates/ecdc_test/ecdc_tests.html
+++ b/src/covid19/blueprints/ecdc_test/templates/ecdc_test/ecdc_tests.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/divi_service.py b/src/covid19/blueprints/intensivregister/divi_service.py
index 055d405e39d84e108e576b9d5857f8228db95488..355e6e281d7a597f8c93e8ffe7a5ab2379cdded9 100644
--- a/src/covid19/blueprints/intensivregister/divi_service.py
+++ b/src/covid19/blueprints/intensivregister/divi_service.py
@@ -1,7 +1,7 @@
 from flask import flash
 
 from database import app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.app_application.application_service_download import ApplicationServiceDownload
 from covid19.blueprints.intensivregister.divi_service_import import DiviServiceImport
 from covid19.blueprints.intensivregister.divi_service_update import DiviServiceUpdate
diff --git a/src/covid19/blueprints/intensivregister/divi_service_import.py b/src/covid19/blueprints/intensivregister/divi_service_import.py
index a1b0554cfe5debcd345ef944e7709088c63bf955..38ab009dd716d1773d342b97603e5f6ad8d865b9 100644
--- a/src/covid19/blueprints/intensivregister/divi_service_import.py
+++ b/src/covid19/blueprints/intensivregister/divi_service_import.py
@@ -3,7 +3,7 @@ import csv
 import psycopg2
 
 from database import db, app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.intensivregister.divi_model_import import DiviImport
 
 
diff --git a/src/covid19/blueprints/intensivregister/divi_service_update.py b/src/covid19/blueprints/intensivregister/divi_service_update.py
index 356b7aea3c40a9bbe2e1209b00401a4cbe998d2b..6433d0775843440c8e354ae4ee135bbd352ab1e3 100644
--- a/src/covid19/blueprints/intensivregister/divi_service_update.py
+++ b/src/covid19/blueprints/intensivregister/divi_service_update.py
@@ -1,5 +1,5 @@
 from database import db, app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 
 from covid19.blueprints.intensivregister.divi_model import DiviRegion, DiviDateReported, DiviCountry, DiviData
 from covid19.blueprints.intensivregister.divi_model_import import DiviImport
diff --git a/src/covid19/blueprints/intensivregister/divi_views.py b/src/covid19/blueprints/intensivregister/divi_views.py
index 7a79d949ef0344e18a143c3d1c584e763b897dcf..a88be68a17add3e3972ebdd4a5356796ed70d227 100644
--- a/src/covid19/blueprints/intensivregister/divi_views.py
+++ b/src/covid19/blueprints/intensivregister/divi_views.py
@@ -6,7 +6,7 @@ from flask_admin.contrib.sqla import ModelView
 from flask_login import login_required
 
 from database import app, admin, db
-from covid19.blueprints.app_application.application_services import divi_service
+from covid19.blueprints.app_all.application_services import divi_service
 from covid19.blueprints.app_application.application_workers import celery
 from covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html
index 4cf33bb185d154c1912746e73b3d3dd5b880bbf4..d1606608062f722d4d3de1fe01e6c3618f6364ae 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html
index 2ed20c2cf902a2e4a1252300bcecb4f481a9acf1..04acdf381719346031fc6c8deed01b73aee5e576 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html
index 2df755993825bf9a6c4b13a08c7674853cc30f82..c934a4f347696e80b3a3126fd35ca0e4a34be3fe 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html
index 52ffbeb0c25c13c099f271ca51389692313c6877..1c8a52b256cbbfc2f2779e4f123f1fb0fd1f70c1 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html
index 2de058934da0aa6fc2d54113b717846e5b5e64c8..e31a1da55c46c2b0c6444c17e51f1e683e121888 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html
index 204f21353713a9690cb208f2f752d5970be3dc78..5daf192c36bf8828f29c4e46167ad23e0659bb97 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
index 843cbfeca23f687f597e510119169a0581f4f715..c53bc325c87bff28ede2192fdf68ad05d7c63f0e 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html
index fb27e4642fdff7cbfd7b48c4ea2c77a7e9be6ea2..66a6033a698f72deab6dd442152735fb82a4f288 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html
index ca967bdab4944dd98620e121fa660bf9fe80a9f4..3be2ef220dd08edc81108c971c8d72fc35d68e48 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html
index a5a52426a8edf9de5852035f16b5fb314e19efbc..c5cb0a456e5f7c8ba792aaafe97b7a551305d001 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html
index ca967bdab4944dd98620e121fa660bf9fe80a9f4..3be2ef220dd08edc81108c971c8d72fc35d68e48 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html
index f296b13745eb259a179f12d6ee1954bd1d07f8a5..a094ea99d6c7b1c80f4aad4d2cfcc8861c6fef38 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html
index 3e5b23329ef96799b90df030454ceb51de106d67..344c63796013aa23b34695f5e72e9935769347b7 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_new.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html
index 8dbdc54648f6570b88c512297ab33bacdb1ef30d..f66e697d3b68d386725ed8e28a2d5cc599078020 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_imported.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
index a4dc0e5c8cbf545d3603987da136649c69067dde..c35eb645f349dc18928b59d32da1ef5292dab3a9 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_info.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
index de4351b7d7a2612c4a40317485e8287e40dbfc7f..624ae701396035ab98f4f239e2495d13c47ecef8 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html
index 54bb8dc1109ab75359be94ffabd164d3443ba802..c8fb560604deffed3b7e7190eabfb200d3136225 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html
index 1847e5d5cbe26faeebf98ca3571096a6a6128674..6fbef296fa1d803867c2dfe79ab534914af96cde 100644
--- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html
+++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/intensivregister_test/divi_test_service.py b/src/covid19/blueprints/intensivregister_test/divi_test_service.py
index 61f0c60b90991620419620377841d8d93a5927a9..9a25242e990aa50ebf0bf124c9aadc6bc9f089f4 100644
--- a/src/covid19/blueprints/intensivregister_test/divi_test_service.py
+++ b/src/covid19/blueprints/intensivregister_test/divi_test_service.py
@@ -1,5 +1,5 @@
 from database import app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.intensivregister.divi_model import DiviDateReported, DiviData
 
 
diff --git a/src/covid19/blueprints/intensivregister_test/divi_test_views.py b/src/covid19/blueprints/intensivregister_test/divi_test_views.py
index 05c8e57eeaa51be7ee8ef438084b534f67999501..17851429814d9c62a92cb7adc5a21be12df7a20a 100644
--- a/src/covid19/blueprints/intensivregister_test/divi_test_views.py
+++ b/src/covid19/blueprints/intensivregister_test/divi_test_views.py
@@ -4,7 +4,7 @@ from celery.utils.log import get_task_logger
 from flask_login import login_required
 
 from database import app, db
-from covid19.blueprints.app_application.application_services import divi_service
+from covid19.blueprints.app_all.application_services import divi_service
 from covid19.blueprints.app_application.application_workers import celery
 from covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
diff --git a/src/covid19/blueprints/intensivregister_test/templates/divi_test/divi_tests.html b/src/covid19/blueprints/intensivregister_test/templates/divi_test/divi_tests.html
index cdbd748e597af8d0199bb4202a9d1562d10c7766..9939e3aa1a5fb4185de5a710c4df2c01a2b600af 100644
--- a/src/covid19/blueprints/intensivregister_test/templates/divi_test/divi_tests.html
+++ b/src/covid19/blueprints/intensivregister_test/templates/divi_test/divi_tests.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/owid_service.py b/src/covid19/blueprints/owid/owid_service.py
index 7b85cd499c8c0841bd45681a753951e570c26751..628e6900f840258953b900c538a6285fffb228df 100644
--- a/src/covid19/blueprints/owid/owid_service.py
+++ b/src/covid19/blueprints/owid/owid_service.py
@@ -2,7 +2,7 @@ from flask import flash
 
 from database import app
 
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.app_application.application_service_download import ApplicationServiceDownload
 from covid19.blueprints.owid.owid_service_import import OwidServiceImport
 from covid19.blueprints.owid.owid_service_update import OwidServiceUpdate, OwidServiceUpdateFull
diff --git a/src/covid19/blueprints/owid/owid_service_import.py b/src/covid19/blueprints/owid/owid_service_import.py
index 06ee57ba87c2899f341ae916485a53eaf4dc8c22..d3db3e366776bc99221af457932a7e48fadef3f5 100644
--- a/src/covid19/blueprints/owid/owid_service_import.py
+++ b/src/covid19/blueprints/owid/owid_service_import.py
@@ -1,7 +1,7 @@
 import csv
 import psycopg2
 from database import db, app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.owid.owid_model_import import OwidImport
 
 
diff --git a/src/covid19/blueprints/owid/owid_service_update.py b/src/covid19/blueprints/owid/owid_service_update.py
index 9b7500e4a11f3553e5e4a732e93414528e21f692..12b57e3574fb368733ed0caa8556369e75c4f45f 100644
--- a/src/covid19/blueprints/owid/owid_service_update.py
+++ b/src/covid19/blueprints/owid/owid_service_update.py
@@ -1,5 +1,5 @@
 from database import db, app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
 from covid19.blueprints.owid.owid_model_import import OwidImport
 
diff --git a/src/covid19/blueprints/owid/owid_views.py b/src/covid19/blueprints/owid/owid_views.py
index e7af48d6de2a12c184c9e2086f6cc819183a37bc..fb956857b7227409ab0bc041010044a8a2621a3f 100644
--- a/src/covid19/blueprints/owid/owid_views.py
+++ b/src/covid19/blueprints/owid/owid_views.py
@@ -5,7 +5,7 @@ from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 
 from database import app, admin, db
-from covid19.blueprints.app_application.application_services import owid_service
+from covid19.blueprints.app_all.application_services import owid_service
 from covid19.blueprints.app_application.application_workers import celery
 from covid19.blueprints.app_application.application_model_transient import ApplicationPage
 from covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
diff --git a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html
index 3137b1ec9e5eeab575e1a7f175d8dc1859684dd1..2c9b9e2595df1b8a7a7f70bc28714d2ebe79ba61 100644
--- a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html
+++ b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html
index 96ccd639b8d89a48283c8ab791b4a532f13b59dc..920ae7c0c2f2726797e4dca2e38ae6e37cad0adf 100644
--- a/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html
+++ b/src/covid19/blueprints/owid/templates/owid/continent/owid_continent_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html
index a7cddc477d4aec6b41b3cf48da304573fb2351d2..1cdeaa50eb59ccaab8d0cd0d6b4cccae976a4f38 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html
index d1e72c2287b004408d1469c462fa9829b5a24996..c887d07a6892b9d3b57ac01676435f90fb36fd12 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html
index d1e72c2287b004408d1469c462fa9829b5a24996..c887d07a6892b9d3b57ac01676435f90fb36fd12 100644
--- a/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html
+++ b/src/covid19/blueprints/owid/templates/owid/country/owid_country_one_germany.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
index fca14b608beb62a3e674b967130fd08784e0d016..0aed2c786f55e5f4f20ed2d090055f7c82c8c0ab 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
index 507a19cd08a16de7a3a5d9781d5d6ed3d212a9f7..acb65e7b9591bdc46ec722d570e15572ad2ad62f 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
index 9936b1d3ab1ea04351f1a7da984e1fd2a229a4c4..ce4ce69e32c21192a6f3cde96eaff38bb82e5a93 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
index 2c1b5ff2b1a65f68b3f5e32916f4ee47bbd5865b..695ca9fa3478c03f90492f4be957b66116ba2af0 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_cases_new.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
index e0c793f4cc9dff7a8c2d6db80e67a725e916f0bd..8e10d55089974df0fb5434284e56b9f34808d539 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
index 6cbae917275c762b0f26a93a2ba711afc7be442d..6362c561cb3df812def75fad47d98c9384f573aa 100644
--- a/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/owid/templates/owid/date_reported/owid_date_reported_one_deaths_new.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html b/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html
index 0422eb7d5235f4478fba98d7942f5dd7e5008a63..5d7986384252bdeb82a51ad704d02da1849c5427 100644
--- a/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html
+++ b/src/covid19/blueprints/owid/templates/owid/imported/owid_imported.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/owid_info.html b/src/covid19/blueprints/owid/templates/owid/owid_info.html
index dd71fb641e7b962aaf9fcf862f76d1ec924a61e6..758426d91bb76f1416aa48185fc2958088bfceea 100644
--- a/src/covid19/blueprints/owid/templates/owid/owid_info.html
+++ b/src/covid19/blueprints/owid/templates/owid/owid_info.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid/templates/owid/owid_tasks.html b/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
index 86e252b4ab43e64329dd62fd5621c6cbca0f1faa..119707faaa7b7dfa1848c6f20f7d3068b58d0cc4 100644
--- a/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
+++ b/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/owid_test/owid_test_service.py b/src/covid19/blueprints/owid_test/owid_test_service.py
index 03ef32e27f12a7a119e83ca9bf4910ada795501c..465ca34b7094d3c936fc1acdbf457f2e4ef22e20 100644
--- a/src/covid19/blueprints/owid_test/owid_test_service.py
+++ b/src/covid19/blueprints/owid_test/owid_test_service.py
@@ -1,5 +1,5 @@
 from database import db, app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry
 from covid19.blueprints.owid.owid_model_import import OwidImport
 
diff --git a/src/covid19/blueprints/owid_test/owid_test_views.py b/src/covid19/blueprints/owid_test/owid_test_views.py
index 1baaa00a1151ae691a83573289570417c361062d..6af487911efbae375a32838cc013dcfede52dc3d 100644
--- a/src/covid19/blueprints/owid_test/owid_test_views.py
+++ b/src/covid19/blueprints/owid_test/owid_test_views.py
@@ -4,7 +4,7 @@ from celery.utils.log import get_task_logger
 from flask_login import login_required
 
 from database import app, db
-from covid19.blueprints.app_application.application_services import owid_service
+from covid19.blueprints.app_all.application_services import owid_service
 from covid19.blueprints.app_application.application_workers import celery
 from covid19.blueprints.owid.owid_model import OwidData
 from covid19.blueprints.owid.owid_model_import import OwidImport
diff --git a/src/covid19/blueprints/owid_test/templates/owid_test/owid_tests.html b/src/covid19/blueprints/owid_test/templates/owid_test/owid_tests.html
index d62ca7811cc1f0556fd6f7d75e8058dd76c717be..d12f7a5a78bf6b4fe1450733f4a697505ce40e91 100644
--- a/src/covid19/blueprints/owid_test/templates/owid_test/owid_tests.html
+++ b/src/covid19/blueprints/owid_test/templates/owid_test/owid_tests.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all.html b/src/covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all.html
index 26dd7e09a08ffad3e08e9ac95310932e5496794d..9a9aea1b23a5002c7cf278a752a12583988b93ed 100644
--- a/src/covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all.html
+++ b/src/covid19/blueprints/rki_cases/templates/rki/date_reported/rki_date_reported_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/rki_cases/templates/rki/rki_imported.html b/src/covid19/blueprints/rki_cases/templates/rki/rki_imported.html
index ec6288f309fa5c6d3a5baeab1f17d785b00c560c..0522650703bee80f3bb64782e131734818162276 100644
--- a/src/covid19/blueprints/rki_cases/templates/rki/rki_imported.html
+++ b/src/covid19/blueprints/rki_cases/templates/rki/rki_imported.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/rki_cases/templates/rki/rki_info.html b/src/covid19/blueprints/rki_cases/templates/rki/rki_info.html
index 375d17ffe16ecae5b0b437ef5d86e05bfac3abbc..57220a286c2a19e9c2b086a34fda9d4ea6edeb74 100644
--- a/src/covid19/blueprints/rki_cases/templates/rki/rki_info.html
+++ b/src/covid19/blueprints/rki_cases/templates/rki/rki_info.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/rki_cases/templates/rki/rki_tasks.html b/src/covid19/blueprints/rki_cases/templates/rki/rki_tasks.html
index fe5455d504004a8bb7f01631a0340cfb180b05ca..c3047e4c58050cd1c782b2ab52bab702eb4f8308 100644
--- a/src/covid19/blueprints/rki_cases/templates/rki/rki_tasks.html
+++ b/src/covid19/blueprints/rki_cases/templates/rki/rki_tasks.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/rki_cases/templates/rki/rki_test.html b/src/covid19/blueprints/rki_cases/templates/rki/rki_test.html
index b23ba56a7f74812eccabb94d57faff62c47bab4f..4009687145b4d9bce6a157e5ec7f1059ee0a1e45 100644
--- a/src/covid19/blueprints/rki_cases/templates/rki/rki_test.html
+++ b/src/covid19/blueprints/rki_cases/templates/rki/rki_test.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/rki_cases_test/templates/rki_test/rki_tests.html b/src/covid19/blueprints/rki_cases_test/templates/rki_test/rki_tests.html
index c677f7b6977b787585bd5c30d10f7dfa3b8f336c..f2a4cef6bd6d90d4b588f5233076d3139c41d96d 100644
--- a/src/covid19/blueprints/rki_cases_test/templates/rki_test/rki_tests.html
+++ b/src/covid19/blueprints/rki_cases_test/templates/rki_test/rki_tests.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html
index 6d83a2a824306f10fb53e35b192236572ba03bd9..fa98cfb019019f10b41ad2ed6fae6c148625a46b 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/data/rki_vaccination_data.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html
index 45878b35595cbf872180deea6416fe554bd45f12..bbc31fa68458f99061ecb20c93e63b88de6a2926 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/imported/rki_vaccination_imported.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html
index 7d35cfe4a996d47902ab93cefed0b15d4857fc1a..49a05a0d349869dffbb864eb4c38a0da63290524 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html
index 0aac48384ef602016f6928b179e134910dd248e3..1cafc7b2d0735edf1a735e9daa76bbe0229a0fb9 100644
--- a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html
+++ b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_all.html b/src/covid19/blueprints/who/templates/who/country/who_country_all.html
index da3c31d72d0481d16de5409022113b1f148ca06e..16e96b59da007cc97ee63a39335e72b6a359c5a9 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_all.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_germany.html b/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
index cd4675faad9c64d74e8822f753415844f80a501a..9d4c773c3d7cfee271b9a7acd32d8b3527c1d821 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_germany.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one.html b/src/covid19/blueprints/who/templates/who/country/who_country_one.html
index 7f61469fe8597dc6f9005c58247e8160448000b0..f7741b244a80e2476c46e7ab323775a62d70ab69 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
index 5aae35beb7ca944108a520b7800393c22aa14aca..50d80b1e8fe22c4caf930648c349a90939f4e320 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
index a522b64cdceb012b4ba9b9fb2c194ea7ee2500c5..f817671e25cf211472d084b8f166770d91931293 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_cases_new.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
index d55e49fc8fbfb8c331de4c776f9d878148a6aa6b..50b4fd4334c6c869c6eefbb1195f725208aff806 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
index 6a771b79bc54481fad5b95e556c13d23ddd0ba36..81d1adf99b8b3cb1d6e4e5c627ad23818ffea14b 100644
--- a/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
+++ b/src/covid19/blueprints/who/templates/who/country/who_country_one_deaths_new.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
index eea1d5dab6331468a984df2f3fc2fe962f0f3f34..f4d16f2fe25e82aeae1e5dff1008630880ea7ddb 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
index fb852908da57023a907d05d68bc08d75f8bd3bfa..7dd682699aea93a8c0721c4bb577999c96556fad 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
index 2e6562a57a27c4cccce811027fea0fc595b738f3..bc94d5f37a82119e678bd9ccc7c283dc388bc0e4 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
index fb852908da57023a907d05d68bc08d75f8bd3bfa..7dd682699aea93a8c0721c4bb577999c96556fad 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
index 6cade560341b221034de178f547b65c38538e911..c3862be50e1dbc06c2dabad6a74e60c0d059484f 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
index c61e0d1972b4df5e5cc5ef3b37a7458fb522ffbf..a18d6008295b8d21cc8c78e2193ac8678c1822cf 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_all.html b/src/covid19/blueprints/who/templates/who/region/who_region_all.html
index 12960224fc8e1134a925f295a3b040d3e3bf3c5d..be4df422762167e69a39bb3a8988029cd652f714 100644
--- a/src/covid19/blueprints/who/templates/who/region/who_region_all.html
+++ b/src/covid19/blueprints/who/templates/who/region/who_region_all.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/region/who_region_one.html b/src/covid19/blueprints/who/templates/who/region/who_region_one.html
index e273103351b75ac5ba0d54a70ffb0efe954eb0c4..b42b1a537466814ea3dd2a96b0aebb7f667b7f62 100644
--- a/src/covid19/blueprints/who/templates/who/region/who_region_one.html
+++ b/src/covid19/blueprints/who/templates/who/region/who_region_one.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../../app_all/templates/app_all/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/who_imported.html b/src/covid19/blueprints/who/templates/who/who_imported.html
index d12fed01d11e780fb0ef5fb7a5ffea531913d2c5..e1a862f01b43682655e46e92aa10f474d211605f 100644
--- a/src/covid19/blueprints/who/templates/who/who_imported.html
+++ b/src/covid19/blueprints/who/templates/who/who_imported.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/who_info.html b/src/covid19/blueprints/who/templates/who/who_info.html
index 43bb0444dd4b903d25ba2b6c07e7501283266e0e..abc3ea8bae6833978a9dbe35fe01be01d5a6f3f7 100644
--- a/src/covid19/blueprints/who/templates/who/who_info.html
+++ b/src/covid19/blueprints/who/templates/who/who_info.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/templates/who/who_tasks.html b/src/covid19/blueprints/who/templates/who/who_tasks.html
index ce29d69f8e59f07640c7883fa78e9de162c961f4..e4ecbcd5db260d3c5b52066f73a333d65ebd4ff8 100644
--- a/src/covid19/blueprints/who/templates/who/who_tasks.html
+++ b/src/covid19/blueprints/who/templates/who/who_tasks.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who/who_service.py b/src/covid19/blueprints/who/who_service.py
index 4f901d0927768fadbc3cf4976c13dab8ce9318f9..58f684b96487ec5935f2c92961e7e4a770a88d84 100644
--- a/src/covid19/blueprints/who/who_service.py
+++ b/src/covid19/blueprints/who/who_service.py
@@ -1,7 +1,7 @@
 from flask import flash
 
 from database import app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.app_application.application_service_download import ApplicationServiceDownload
 from covid19.blueprints.who.who_service_import import WhoServiceImport
 from covid19.blueprints.who.who_service_update import WhoServiceUpdate, WhoServiceUpdateFull
diff --git a/src/covid19/blueprints/who/who_service_import.py b/src/covid19/blueprints/who/who_service_import.py
index 0a10f6ba4294005e186290687f4ea3deff528609..11edddf97e7a3bb9a26e05a8987378c3b197fb19 100644
--- a/src/covid19/blueprints/who/who_service_import.py
+++ b/src/covid19/blueprints/who/who_service_import.py
@@ -3,7 +3,7 @@ import csv
 import psycopg2
 from database import db, app
 from covid19.blueprints.who.who_model_import import WhoImport
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 
 
 class WhoServiceImport:
diff --git a/src/covid19/blueprints/who/who_service_update.py b/src/covid19/blueprints/who/who_service_update.py
index 9c232729a18fd661337e60087d4e49dbb7e3c86a..f7eb67eed3495e2bab8a92e887d18d7bd89bbdef 100644
--- a/src/covid19/blueprints/who/who_service_update.py
+++ b/src/covid19/blueprints/who/who_service_update.py
@@ -1,5 +1,5 @@
 from database import db, app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.who.who_model import WhoCountryRegion, WhoDateReported, WhoCountry, WhoData
 from covid19.blueprints.who.who_model_import import WhoImport
 
diff --git a/src/covid19/blueprints/who/who_views.py b/src/covid19/blueprints/who/who_views.py
index 4fd4a9cff85c25bdf59624ecec5b626a76febd9d..754a6b6db949d6ec6bb50f9583fab86ff2b3982a 100644
--- a/src/covid19/blueprints/who/who_views.py
+++ b/src/covid19/blueprints/who/who_views.py
@@ -6,7 +6,7 @@ from flask_admin.contrib.sqla import ModelView
 from flask_login import login_required
 
 from database import app, admin, db
-from covid19.blueprints.app_application.application_services import who_service
+from covid19.blueprints.app_all.application_services import who_service
 from covid19.blueprints.app_application.application_workers import celery
 from covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
diff --git a/src/covid19/blueprints/who_test/templates/who_test/who_tests.html b/src/covid19/blueprints/who_test/templates/who_test/who_tests.html
index f79ff4b1cf1ea3bce6075f1d7108fefaa131b554..d3a1fb5068a988c22f57a14bfaedf6cc08ce3ab8 100644
--- a/src/covid19/blueprints/who_test/templates/who_test/who_tests.html
+++ b/src/covid19/blueprints/who_test/templates/who_test/who_tests.html
@@ -1,4 +1,4 @@
-{% extends 'application/page_layout.html' %}
+{% extends 'app_application/../../../app_all/templates/app_all/fragments/../../../app_all/templates/app_all/layout/page_layout.html' %}
 
 {% block content %}
     {{super()}}
diff --git a/src/covid19/blueprints/who_test/who_test_service.py b/src/covid19/blueprints/who_test/who_test_service.py
index 226b77ba38830ea9c17bbb68e0ca5bff75264448..5e7b267d092cb472b3e61aa1d96174042eda9195 100644
--- a/src/covid19/blueprints/who_test/who_test_service.py
+++ b/src/covid19/blueprints/who_test/who_test_service.py
@@ -1,5 +1,5 @@
 from database import app
-from covid19.blueprints.app_application.application_service_config import ApplicationServiceConfig
+from covid19.blueprints.app_all.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.who.who_model import WhoDateReported, WhoData
 
 
diff --git a/src/covid19/blueprints/who_test/who_test_views.py b/src/covid19/blueprints/who_test/who_test_views.py
index b5b8b5638c15f692891edf07894c2df5b4d0bf71..f836f256d2016facaff6c7baf0ec1b30e7861521 100644
--- a/src/covid19/blueprints/who_test/who_test_views.py
+++ b/src/covid19/blueprints/who_test/who_test_views.py
@@ -4,7 +4,7 @@ from celery.utils.log import get_task_logger
 from flask_login import login_required
 
 from database import app, db
-from covid19.blueprints.app_application.application_services import who_service
+from covid19.blueprints.app_all.application_services import who_service
 from covid19.blueprints.app_application.application_workers import celery
 from covid19.blueprints.app_application.application_model_transient import ApplicationPage