diff --git a/app/__init__.py b/covid19/__init__.py
similarity index 100%
rename from app/__init__.py
rename to covid19/__init__.py
diff --git a/app/oodm/__init__.py b/covid19/oodm/__init__.py
similarity index 100%
rename from app/oodm/__init__.py
rename to covid19/oodm/__init__.py
diff --git a/app/oodm/admin/__init__.py b/covid19/oodm/admin/__init__.py
similarity index 100%
rename from app/oodm/admin/__init__.py
rename to covid19/oodm/admin/__init__.py
diff --git a/app/oodm/admin/admin_service.py b/covid19/oodm/admin/admin_service.py
similarity index 100%
rename from app/oodm/admin/admin_service.py
rename to covid19/oodm/admin/admin_service.py
diff --git a/app/oodm/common/__init__.py b/covid19/oodm/common/__init__.py
similarity index 100%
rename from app/oodm/common/__init__.py
rename to covid19/oodm/common/__init__.py
diff --git a/app/oodm/common/common_model.py b/covid19/oodm/common/common_model.py
similarity index 100%
rename from app/oodm/common/common_model.py
rename to covid19/oodm/common/common_model.py
diff --git a/app/oodm/common/common_model_transient.py b/covid19/oodm/common/common_model_transient.py
similarity index 100%
rename from app/oodm/common/common_model_transient.py
rename to covid19/oodm/common/common_model_transient.py
diff --git a/app/oodm/common/common_service.py b/covid19/oodm/common/common_service.py
similarity index 100%
rename from app/oodm/common/common_service.py
rename to covid19/oodm/common/common_service.py
diff --git a/app/oodm/europe/__init__.py b/covid19/oodm/europe/__init__.py
similarity index 100%
rename from app/oodm/europe/__init__.py
rename to covid19/oodm/europe/__init__.py
diff --git a/app/oodm/europe/europe_model.py b/covid19/oodm/europe/europe_model.py
similarity index 100%
rename from app/oodm/europe/europe_model.py
rename to covid19/oodm/europe/europe_model.py
diff --git a/app/oodm/europe/europe_service.py b/covid19/oodm/europe/europe_service.py
similarity index 91%
rename from app/oodm/europe/europe_service.py
rename to covid19/oodm/europe/europe_service.py
index 687e6676ffb36eef5260a7f51b5a673dbbcff2c4..854517321dbeaf40488ee60d51803137b312b65b 100644
--- a/app/oodm/europe/europe_service.py
+++ b/covid19/oodm/europe/europe_service.py
@@ -1,9 +1,9 @@
 import os
 
 from database import app
-from app.oodm.europe.europe_service_download import EuropeServiceDownload
-from app.oodm.europe.europe_service_import import EuropeServiceImport
-from app.oodm.europe.europe_service_update import EuropeServiceUpdate
+from covid19.oodm.europe.europe_service_download import EuropeServiceDownload
+from covid19.oodm.europe.europe_service_import import EuropeServiceImport
+from covid19.oodm.europe.europe_service_update import EuropeServiceUpdate
 
 
 class EuropeService:
diff --git a/app/oodm/europe/europe_service_download.py b/covid19/oodm/europe/europe_service_download.py
similarity index 100%
rename from app/oodm/europe/europe_service_download.py
rename to covid19/oodm/europe/europe_service_download.py
diff --git a/app/oodm/europe/europe_service_import.py b/covid19/oodm/europe/europe_service_import.py
similarity index 95%
rename from app/oodm/europe/europe_service_import.py
rename to covid19/oodm/europe/europe_service_import.py
index 25a68c1344ee75cda2d94503768de1ff84d81727..6e9eae7e5b01602c8a23ba8bb236a476c08e0992 100644
--- a/app/oodm/europe/europe_service_import.py
+++ b/covid19/oodm/europe/europe_service_import.py
@@ -3,8 +3,8 @@ import csv
 import psycopg2
 
 from database import db, app
-from app.oodm.europe.europe_model import EuropeDataImportTable
-from app.oodm.europe.europe_service_download import EuropeServiceDownloadConfig
+from covid19.oodm.europe.europe_model import EuropeDataImportTable
+from covid19.oodm.europe.europe_service_download import EuropeServiceDownloadConfig
 
 
 class EuropeServiceImport:
diff --git a/app/oodm/europe/europe_service_update.py b/covid19/oodm/europe/europe_service_update.py
similarity index 99%
rename from app/oodm/europe/europe_service_update.py
rename to covid19/oodm/europe/europe_service_update.py
index 646eacd877431466825999af4c43c37a70706b06..8a15b190d2e4fb95d38681ef30f02e241fd8f041 100644
--- a/app/oodm/europe/europe_service_update.py
+++ b/covid19/oodm/europe/europe_service_update.py
@@ -1,6 +1,6 @@
 import os
 from database import db, app
-from app.oodm.europe.europe_model import EuropeDataImportTable, \
+from covid19.oodm.europe.europe_model import EuropeDataImportTable, \
     EuropeDateReported, EuropeContinent, EuropeCountry, EuropeData
 
 
diff --git a/app/oodm/nrw/__init__.py b/covid19/oodm/nrw/__init__.py
similarity index 100%
rename from app/oodm/nrw/__init__.py
rename to covid19/oodm/nrw/__init__.py
diff --git a/app/oodm/rki/__init__.py b/covid19/oodm/rki/__init__.py
similarity index 100%
rename from app/oodm/rki/__init__.py
rename to covid19/oodm/rki/__init__.py
diff --git a/app/oodm/rki/rki_model.py b/covid19/oodm/rki/rki_model.py
similarity index 100%
rename from app/oodm/rki/rki_model.py
rename to covid19/oodm/rki/rki_model.py
diff --git a/app/oodm/rki/rki_service.py b/covid19/oodm/rki/rki_service.py
similarity index 92%
rename from app/oodm/rki/rki_service.py
rename to covid19/oodm/rki/rki_service.py
index 054c365266e5124e9b4d40d97b8eb0a36310107b..03dd935761a77b30d6ed80c0a9914a690ff09a9f 100644
--- a/app/oodm/rki/rki_service.py
+++ b/covid19/oodm/rki/rki_service.py
@@ -1,8 +1,8 @@
 from database import app
 
-from app.oodm.rki.rki_service_download import RkiServiceDownload
-from app.oodm.rki.rki_service_import import RkiServiceImport
-from app.oodm.rki.rki_service_update import RkiServiceUpdate
+from covid19.oodm.rki.rki_service_download import RkiServiceDownload
+from covid19.oodm.rki.rki_service_import import RkiServiceImport
+from covid19.oodm.rki.rki_service_update import RkiServiceUpdate
 
 
 class RkiService:
diff --git a/app/oodm/rki/rki_service_download.py b/covid19/oodm/rki/rki_service_download.py
similarity index 100%
rename from app/oodm/rki/rki_service_download.py
rename to covid19/oodm/rki/rki_service_download.py
diff --git a/app/oodm/rki/rki_service_import.py b/covid19/oodm/rki/rki_service_import.py
similarity index 98%
rename from app/oodm/rki/rki_service_import.py
rename to covid19/oodm/rki/rki_service_import.py
index 839bac131667b30f9e48c092bf998612fb723223..69421d1aaa7c9ec12b2aaeccbe5571f8c9799cc6 100644
--- a/app/oodm/rki/rki_service_import.py
+++ b/covid19/oodm/rki/rki_service_import.py
@@ -5,7 +5,7 @@ import psycopg2
 
 from database import db, app
 
-from app.oodm.who.who_model import WhoGlobalDataImportTable
+from covid19.oodm.who.who_model import WhoGlobalDataImportTable
 
 
 class RkiServiceImport:
diff --git a/app/oodm/rki/rki_service_update.py b/covid19/oodm/rki/rki_service_update.py
similarity index 98%
rename from app/oodm/rki/rki_service_update.py
rename to covid19/oodm/rki/rki_service_update.py
index 456cbdfd405ca0de03f20b219ef13a6d180e2823..71328ab69cf47156059a831a44cb7e053194d8b2 100644
--- a/app/oodm/rki/rki_service_update.py
+++ b/covid19/oodm/rki/rki_service_update.py
@@ -1,7 +1,7 @@
 from database import db, app
 
-from app.oodm.rki.rki_model import RkiRegion, RkiDateReported, RkiCountry, RkiGermanyData
-from app.oodm.rki.rki_model import RkiGermanyDataImportTable
+from covid19.oodm.rki.rki_model import RkiRegion, RkiDateReported, RkiCountry, RkiGermanyData
+from covid19.oodm.rki.rki_model import RkiGermanyDataImportTable
 
 
 rki_service_update = None
diff --git a/app/oodm/vaccination/__init__.py b/covid19/oodm/vaccination/__init__.py
similarity index 100%
rename from app/oodm/vaccination/__init__.py
rename to covid19/oodm/vaccination/__init__.py
diff --git a/app/oodm/vaccination/vaccination_model.py b/covid19/oodm/vaccination/vaccination_model.py
similarity index 100%
rename from app/oodm/vaccination/vaccination_model.py
rename to covid19/oodm/vaccination/vaccination_model.py
diff --git a/app/oodm/vaccination/vaccination_service.py b/covid19/oodm/vaccination/vaccination_service.py
similarity index 91%
rename from app/oodm/vaccination/vaccination_service.py
rename to covid19/oodm/vaccination/vaccination_service.py
index 4fa7a9a51e953008a341c535add1350e4806de59..f3c6efdd6e4ec51278ad22af0ef7cfa9125eab7b 100644
--- a/app/oodm/vaccination/vaccination_service.py
+++ b/covid19/oodm/vaccination/vaccination_service.py
@@ -1,8 +1,8 @@
 import os
 
 from database import app
-from app.oodm.vaccination.vaccination_service_download import VaccinationServiceDownload
-from app.oodm.vaccination.vaccination_service_import import VaccinationServiceImport
+from covid19.oodm.vaccination.vaccination_service_download import VaccinationServiceDownload
+from covid19.oodm.vaccination.vaccination_service_import import VaccinationServiceImport
 
 
 class VaccinationService:
diff --git a/app/oodm/vaccination/vaccination_service_download.py b/covid19/oodm/vaccination/vaccination_service_download.py
similarity index 100%
rename from app/oodm/vaccination/vaccination_service_download.py
rename to covid19/oodm/vaccination/vaccination_service_download.py
diff --git a/app/oodm/vaccination/vaccination_service_import.py b/covid19/oodm/vaccination/vaccination_service_import.py
similarity index 96%
rename from app/oodm/vaccination/vaccination_service_import.py
rename to covid19/oodm/vaccination/vaccination_service_import.py
index 472e6ee93538b30f61efb4af0901ddc69af39b29..fe58b48fa563da50bea5317e11a8762354d39390 100644
--- a/app/oodm/vaccination/vaccination_service_import.py
+++ b/covid19/oodm/vaccination/vaccination_service_import.py
@@ -3,8 +3,8 @@ import csv
 import psycopg2
 
 from database import db, app
-from app.oodm.vaccination.vaccination_model import VaccinationGermanyTimeline
-from app.oodm.vaccination.vaccination_service_download import VaccinationServiceDownloadConfig
+from covid19.oodm.vaccination.vaccination_model import VaccinationGermanyTimeline
+from covid19.oodm.vaccination.vaccination_service_download import VaccinationServiceDownloadConfig
 
 
 class VaccinationServiceImport:
diff --git a/app/oodm/who/__init__.py b/covid19/oodm/who/__init__.py
similarity index 100%
rename from app/oodm/who/__init__.py
rename to covid19/oodm/who/__init__.py
diff --git a/app/oodm/who/who_model.py b/covid19/oodm/who/who_model.py
similarity index 100%
rename from app/oodm/who/who_model.py
rename to covid19/oodm/who/who_model.py
diff --git a/app/oodm/who/who_service.py b/covid19/oodm/who/who_service.py
similarity index 93%
rename from app/oodm/who/who_service.py
rename to covid19/oodm/who/who_service.py
index 97ba2eb4402afc7221c9aa311bb32f742ee270b3..a602ebbec938d0a502f6bc1818734e51f0999556 100644
--- a/app/oodm/who/who_service.py
+++ b/covid19/oodm/who/who_service.py
@@ -1,9 +1,9 @@
 import os
 
 from database import app
-from app.oodm.who.who_service_download import WhoServiceDownload
-from app.oodm.who.who_service_import import WhoServiceImport
-from app.oodm.who.who_service_update import WhoServiceUpdate
+from covid19.oodm.who.who_service_download import WhoServiceDownload
+from covid19.oodm.who.who_service_import import WhoServiceImport
+from covid19.oodm.who.who_service_update import WhoServiceUpdate
 
 
 class WhoService:
diff --git a/app/oodm/who/who_service_download.py b/covid19/oodm/who/who_service_download.py
similarity index 100%
rename from app/oodm/who/who_service_download.py
rename to covid19/oodm/who/who_service_download.py
diff --git a/app/oodm/who/who_service_import.py b/covid19/oodm/who/who_service_import.py
similarity index 95%
rename from app/oodm/who/who_service_import.py
rename to covid19/oodm/who/who_service_import.py
index 89a688e28705cada458e8269747baac3821bbbb2..b32b80f2e68465356fc6a66740a4e60b696db527 100644
--- a/app/oodm/who/who_service_import.py
+++ b/covid19/oodm/who/who_service_import.py
@@ -3,8 +3,8 @@ import sys
 import csv
 import psycopg2
 from database import db, app
-from app.oodm.who.who_model import WhoGlobalDataImportTable
-from app.oodm.who.who_service_download import WhoServiceDownloadConfig
+from covid19.oodm.who.who_model import WhoGlobalDataImportTable
+from covid19.oodm.who.who_service_download import WhoServiceDownloadConfig
 
 who_service_import = None
 
diff --git a/app/oodm/who/who_service_update.py b/covid19/oodm/who/who_service_update.py
similarity index 98%
rename from app/oodm/who/who_service_update.py
rename to covid19/oodm/who/who_service_update.py
index f80f12bbffd4de7cb0725d95be9c597df214d2a0..ca564d6d5ee690701fdd7567ad405c72977ff5ec 100644
--- a/app/oodm/who/who_service_update.py
+++ b/covid19/oodm/who/who_service_update.py
@@ -1,8 +1,8 @@
 import os
 
 from database import db, app
-from app.oodm.who.who_model import WhoRegion, WhoDateReported, WhoCountry, WhoGlobalData
-from app.oodm.who.who_model import WhoGlobalDataImportTable
+from covid19.oodm.who.who_model import WhoRegion, WhoDateReported, WhoCountry, WhoGlobalData
+from covid19.oodm.who.who_model import WhoGlobalDataImportTable
 
 
 class WhoServiceUpdate:
diff --git a/app/static/favicon.ico b/covid19/static/favicon.ico
similarity index 100%
rename from app/static/favicon.ico
rename to covid19/static/favicon.ico
diff --git a/app/templates/admin/admin_info.html b/covid19/templates/admin/admin_info.html
similarity index 100%
rename from app/templates/admin/admin_info.html
rename to covid19/templates/admin/admin_info.html
diff --git a/app/templates/admin/admin_tasks.html b/covid19/templates/admin/admin_tasks.html
similarity index 100%
rename from app/templates/admin/admin_tasks.html
rename to covid19/templates/admin/admin_tasks.html
diff --git a/app/templates/admin/fragments/fragment_admin_navbar_dropdown.html b/covid19/templates/admin/fragments/fragment_admin_navbar_dropdown.html
similarity index 100%
rename from app/templates/admin/fragments/fragment_admin_navbar_dropdown.html
rename to covid19/templates/admin/fragments/fragment_admin_navbar_dropdown.html
diff --git a/app/templates/admin/fragments/fragment_admin_navtabs.html b/covid19/templates/admin/fragments/fragment_admin_navtabs.html
similarity index 100%
rename from app/templates/admin/fragments/fragment_admin_navtabs.html
rename to covid19/templates/admin/fragments/fragment_admin_navtabs.html
diff --git a/app/templates/europe/continent/europe_continent_all.html b/covid19/templates/europe/continent/europe_continent_all.html
similarity index 100%
rename from app/templates/europe/continent/europe_continent_all.html
rename to covid19/templates/europe/continent/europe_continent_all.html
diff --git a/app/templates/europe/continent/europe_continent_germany.html b/covid19/templates/europe/continent/europe_continent_germany.html
similarity index 100%
rename from app/templates/europe/continent/europe_continent_germany.html
rename to covid19/templates/europe/continent/europe_continent_germany.html
diff --git a/app/templates/europe/continent/europe_continent_one.html b/covid19/templates/europe/continent/europe_continent_one.html
similarity index 100%
rename from app/templates/europe/continent/europe_continent_one.html
rename to covid19/templates/europe/continent/europe_continent_one.html
diff --git a/app/templates/europe/country/europe_country_all.html b/covid19/templates/europe/country/europe_country_all.html
similarity index 100%
rename from app/templates/europe/country/europe_country_all.html
rename to covid19/templates/europe/country/europe_country_all.html
diff --git a/app/templates/europe/country/europe_country_germany.html b/covid19/templates/europe/country/europe_country_germany.html
similarity index 100%
rename from app/templates/europe/country/europe_country_germany.html
rename to covid19/templates/europe/country/europe_country_germany.html
diff --git a/app/templates/europe/country/europe_country_one.html b/covid19/templates/europe/country/europe_country_one.html
similarity index 100%
rename from app/templates/europe/country/europe_country_one.html
rename to covid19/templates/europe/country/europe_country_one.html
diff --git a/app/templates/europe/date_reported/europe_date_reported_all.html b/covid19/templates/europe/date_reported/europe_date_reported_all.html
similarity index 100%
rename from app/templates/europe/date_reported/europe_date_reported_all.html
rename to covid19/templates/europe/date_reported/europe_date_reported_all.html
diff --git a/app/templates/europe/date_reported/europe_date_reported_one.html b/covid19/templates/europe/date_reported/europe_date_reported_one.html
similarity index 100%
rename from app/templates/europe/date_reported/europe_date_reported_one.html
rename to covid19/templates/europe/date_reported/europe_date_reported_one.html
diff --git a/app/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html b/covid19/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
similarity index 100%
rename from app/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
rename to covid19/templates/europe/date_reported/europe_date_reported_one_cases_weekly.html
diff --git a/app/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html b/covid19/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
similarity index 100%
rename from app/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
rename to covid19/templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html
diff --git a/app/templates/europe/date_reported/europe_date_reported_one_notification_rate.html b/covid19/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
similarity index 100%
rename from app/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
rename to covid19/templates/europe/date_reported/europe_date_reported_one_notification_rate.html
diff --git a/app/templates/europe/europe_data.html b/covid19/templates/europe/europe_data.html
similarity index 100%
rename from app/templates/europe/europe_data.html
rename to covid19/templates/europe/europe_data.html
diff --git a/app/templates/europe/europe_imported.html b/covid19/templates/europe/europe_imported.html
similarity index 100%
rename from app/templates/europe/europe_imported.html
rename to covid19/templates/europe/europe_imported.html
diff --git a/app/templates/europe/europe_info.html b/covid19/templates/europe/europe_info.html
similarity index 100%
rename from app/templates/europe/europe_info.html
rename to covid19/templates/europe/europe_info.html
diff --git a/app/templates/europe/europe_tasks.html b/covid19/templates/europe/europe_tasks.html
similarity index 100%
rename from app/templates/europe/europe_tasks.html
rename to covid19/templates/europe/europe_tasks.html
diff --git a/app/templates/europe/fragments/fragment_europe_navbar_dropdown.html b/covid19/templates/europe/fragments/fragment_europe_navbar_dropdown.html
similarity index 100%
rename from app/templates/europe/fragments/fragment_europe_navbar_dropdown.html
rename to covid19/templates/europe/fragments/fragment_europe_navbar_dropdown.html
diff --git a/app/templates/europe/fragments/fragment_europe_navtabs.html b/covid19/templates/europe/fragments/fragment_europe_navtabs.html
similarity index 100%
rename from app/templates/europe/fragments/fragment_europe_navtabs.html
rename to covid19/templates/europe/fragments/fragment_europe_navtabs.html
diff --git a/app/templates/europe/fragments/fragment_europe_table_continent.html b/covid19/templates/europe/fragments/fragment_europe_table_continent.html
similarity index 100%
rename from app/templates/europe/fragments/fragment_europe_table_continent.html
rename to covid19/templates/europe/fragments/fragment_europe_table_continent.html
diff --git a/app/templates/europe/fragments/fragment_europe_table_country.html b/covid19/templates/europe/fragments/fragment_europe_table_country.html
similarity index 100%
rename from app/templates/europe/fragments/fragment_europe_table_country.html
rename to covid19/templates/europe/fragments/fragment_europe_table_country.html
diff --git a/app/templates/europe/fragments/fragment_europe_table_data.html b/covid19/templates/europe/fragments/fragment_europe_table_data.html
similarity index 100%
rename from app/templates/europe/fragments/fragment_europe_table_data.html
rename to covid19/templates/europe/fragments/fragment_europe_table_data.html
diff --git a/app/templates/europe/fragments/fragment_europe_table_data_imported.html b/covid19/templates/europe/fragments/fragment_europe_table_data_imported.html
similarity index 100%
rename from app/templates/europe/fragments/fragment_europe_table_data_imported.html
rename to covid19/templates/europe/fragments/fragment_europe_table_data_imported.html
diff --git a/app/templates/europe/fragments/fragment_europe_table_date_reported.html b/covid19/templates/europe/fragments/fragment_europe_table_date_reported.html
similarity index 100%
rename from app/templates/europe/fragments/fragment_europe_table_date_reported.html
rename to covid19/templates/europe/fragments/fragment_europe_table_date_reported.html
diff --git a/app/templates/fragment_flashed_messages.html b/covid19/templates/fragment_flashed_messages.html
similarity index 100%
rename from app/templates/fragment_flashed_messages.html
rename to covid19/templates/fragment_flashed_messages.html
diff --git a/app/templates/fragment_navbar.html b/covid19/templates/fragment_navbar.html
similarity index 100%
rename from app/templates/fragment_navbar.html
rename to covid19/templates/fragment_navbar.html
diff --git a/app/templates/fragment_navtabs.html b/covid19/templates/fragment_navtabs.html
similarity index 100%
rename from app/templates/fragment_navtabs.html
rename to covid19/templates/fragment_navtabs.html
diff --git a/app/templates/fragment_pagination.html b/covid19/templates/fragment_pagination.html
similarity index 100%
rename from app/templates/fragment_pagination.html
rename to covid19/templates/fragment_pagination.html
diff --git a/app/templates/nrw/fragment_nrw_navbar_dropdown.html b/covid19/templates/nrw/fragment_nrw_navbar_dropdown.html
similarity index 100%
rename from app/templates/nrw/fragment_nrw_navbar_dropdown.html
rename to covid19/templates/nrw/fragment_nrw_navbar_dropdown.html
diff --git a/app/templates/nrw/fragment_nrw_navtabs.html b/covid19/templates/nrw/fragment_nrw_navtabs.html
similarity index 100%
rename from app/templates/nrw/fragment_nrw_navtabs.html
rename to covid19/templates/nrw/fragment_nrw_navtabs.html
diff --git a/app/templates/nrw/nrw_imported.html b/covid19/templates/nrw/nrw_imported.html
similarity index 100%
rename from app/templates/nrw/nrw_imported.html
rename to covid19/templates/nrw/nrw_imported.html
diff --git a/app/templates/nrw/nrw_info.html b/covid19/templates/nrw/nrw_info.html
similarity index 100%
rename from app/templates/nrw/nrw_info.html
rename to covid19/templates/nrw/nrw_info.html
diff --git a/app/templates/nrw/nrw_stadt.html b/covid19/templates/nrw/nrw_stadt.html
similarity index 100%
rename from app/templates/nrw/nrw_stadt.html
rename to covid19/templates/nrw/nrw_stadt.html
diff --git a/app/templates/nrw/nrw_tasks.html b/covid19/templates/nrw/nrw_tasks.html
similarity index 100%
rename from app/templates/nrw/nrw_tasks.html
rename to covid19/templates/nrw/nrw_tasks.html
diff --git a/app/templates/page_home.html b/covid19/templates/page_home.html
similarity index 100%
rename from app/templates/page_home.html
rename to covid19/templates/page_home.html
diff --git a/app/templates/page_layout.html b/covid19/templates/page_layout.html
similarity index 100%
rename from app/templates/page_layout.html
rename to covid19/templates/page_layout.html
diff --git a/app/templates/rki/fragment_rki_navbar_dropdown.html b/covid19/templates/rki/fragment_rki_navbar_dropdown.html
similarity index 100%
rename from app/templates/rki/fragment_rki_navbar_dropdown.html
rename to covid19/templates/rki/fragment_rki_navbar_dropdown.html
diff --git a/app/templates/rki/fragment_rki_navtabs.html b/covid19/templates/rki/fragment_rki_navtabs.html
similarity index 100%
rename from app/templates/rki/fragment_rki_navtabs.html
rename to covid19/templates/rki/fragment_rki_navtabs.html
diff --git a/app/templates/rki/rki_imported.html b/covid19/templates/rki/rki_imported.html
similarity index 100%
rename from app/templates/rki/rki_imported.html
rename to covid19/templates/rki/rki_imported.html
diff --git a/app/templates/rki/rki_info.html b/covid19/templates/rki/rki_info.html
similarity index 100%
rename from app/templates/rki/rki_info.html
rename to covid19/templates/rki/rki_info.html
diff --git a/app/templates/rki/rki_tasks.html b/covid19/templates/rki/rki_tasks.html
similarity index 100%
rename from app/templates/rki/rki_tasks.html
rename to covid19/templates/rki/rki_tasks.html
diff --git a/app/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html b/covid19/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html
similarity index 100%
rename from app/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html
rename to covid19/templates/vaccination/fragments/fragment_vaccination_navbar_dropdown.html
diff --git a/app/templates/vaccination/fragments/fragment_vaccination_navtabs.html b/covid19/templates/vaccination/fragments/fragment_vaccination_navtabs.html
similarity index 100%
rename from app/templates/vaccination/fragments/fragment_vaccination_navtabs.html
rename to covid19/templates/vaccination/fragments/fragment_vaccination_navtabs.html
diff --git a/app/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html b/covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html
similarity index 100%
rename from app/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html
rename to covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table.html
diff --git a/app/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html b/covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html
similarity index 100%
rename from app/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html
rename to covid19/templates/vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html
diff --git a/app/templates/vaccination/vaccination_info.html b/covid19/templates/vaccination/vaccination_info.html
similarity index 100%
rename from app/templates/vaccination/vaccination_info.html
rename to covid19/templates/vaccination/vaccination_info.html
diff --git a/app/templates/vaccination/vaccination_tasks.html b/covid19/templates/vaccination/vaccination_tasks.html
similarity index 100%
rename from app/templates/vaccination/vaccination_tasks.html
rename to covid19/templates/vaccination/vaccination_tasks.html
diff --git a/app/templates/vaccination/vaccination_timeline_germany.html b/covid19/templates/vaccination/vaccination_timeline_germany.html
similarity index 100%
rename from app/templates/vaccination/vaccination_timeline_germany.html
rename to covid19/templates/vaccination/vaccination_timeline_germany.html
diff --git a/app/templates/who/country/who_country_all.html b/covid19/templates/who/country/who_country_all.html
similarity index 100%
rename from app/templates/who/country/who_country_all.html
rename to covid19/templates/who/country/who_country_all.html
diff --git a/app/templates/who/country/who_country_germany.html b/covid19/templates/who/country/who_country_germany.html
similarity index 100%
rename from app/templates/who/country/who_country_germany.html
rename to covid19/templates/who/country/who_country_germany.html
diff --git a/app/templates/who/country/who_country_one.html b/covid19/templates/who/country/who_country_one.html
similarity index 100%
rename from app/templates/who/country/who_country_one.html
rename to covid19/templates/who/country/who_country_one.html
diff --git a/app/templates/who/country/who_country_one_cases_cumulative.html b/covid19/templates/who/country/who_country_one_cases_cumulative.html
similarity index 100%
rename from app/templates/who/country/who_country_one_cases_cumulative.html
rename to covid19/templates/who/country/who_country_one_cases_cumulative.html
diff --git a/app/templates/who/country/who_country_one_cases_new.html b/covid19/templates/who/country/who_country_one_cases_new.html
similarity index 100%
rename from app/templates/who/country/who_country_one_cases_new.html
rename to covid19/templates/who/country/who_country_one_cases_new.html
diff --git a/app/templates/who/country/who_country_one_deaths_cumulative.html b/covid19/templates/who/country/who_country_one_deaths_cumulative.html
similarity index 100%
rename from app/templates/who/country/who_country_one_deaths_cumulative.html
rename to covid19/templates/who/country/who_country_one_deaths_cumulative.html
diff --git a/app/templates/who/country/who_country_one_deaths_new.html b/covid19/templates/who/country/who_country_one_deaths_new.html
similarity index 100%
rename from app/templates/who/country/who_country_one_deaths_new.html
rename to covid19/templates/who/country/who_country_one_deaths_new.html
diff --git a/app/templates/who/date_reported/who_date_reported_all.html b/covid19/templates/who/date_reported/who_date_reported_all.html
similarity index 100%
rename from app/templates/who/date_reported/who_date_reported_all.html
rename to covid19/templates/who/date_reported/who_date_reported_all.html
diff --git a/app/templates/who/date_reported/who_date_reported_one.html b/covid19/templates/who/date_reported/who_date_reported_one.html
similarity index 100%
rename from app/templates/who/date_reported/who_date_reported_one.html
rename to covid19/templates/who/date_reported/who_date_reported_one.html
diff --git a/app/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/covid19/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
similarity index 100%
rename from app/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
rename to covid19/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
diff --git a/app/templates/who/date_reported/who_date_reported_one_cases_new.html b/covid19/templates/who/date_reported/who_date_reported_one_cases_new.html
similarity index 100%
rename from app/templates/who/date_reported/who_date_reported_one_cases_new.html
rename to covid19/templates/who/date_reported/who_date_reported_one_cases_new.html
diff --git a/app/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/covid19/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
similarity index 100%
rename from app/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
rename to covid19/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
diff --git a/app/templates/who/date_reported/who_date_reported_one_deaths_new.html b/covid19/templates/who/date_reported/who_date_reported_one_deaths_new.html
similarity index 100%
rename from app/templates/who/date_reported/who_date_reported_one_deaths_new.html
rename to covid19/templates/who/date_reported/who_date_reported_one_deaths_new.html
diff --git a/app/templates/who/fragments/fragment_who_navbar_dropdown.html b/covid19/templates/who/fragments/fragment_who_navbar_dropdown.html
similarity index 100%
rename from app/templates/who/fragments/fragment_who_navbar_dropdown.html
rename to covid19/templates/who/fragments/fragment_who_navbar_dropdown.html
diff --git a/app/templates/who/fragments/fragment_who_navtabs.html b/covid19/templates/who/fragments/fragment_who_navtabs.html
similarity index 100%
rename from app/templates/who/fragments/fragment_who_navtabs.html
rename to covid19/templates/who/fragments/fragment_who_navtabs.html
diff --git a/app/templates/who/fragments/fragment_who_table_global_data.html b/covid19/templates/who/fragments/fragment_who_table_global_data.html
similarity index 100%
rename from app/templates/who/fragments/fragment_who_table_global_data.html
rename to covid19/templates/who/fragments/fragment_who_table_global_data.html
diff --git a/app/templates/who/fragments/fragment_who_table_global_data_country.html b/covid19/templates/who/fragments/fragment_who_table_global_data_country.html
similarity index 100%
rename from app/templates/who/fragments/fragment_who_table_global_data_country.html
rename to covid19/templates/who/fragments/fragment_who_table_global_data_country.html
diff --git a/app/templates/who/fragments/fragment_who_table_global_data_date_reported.html b/covid19/templates/who/fragments/fragment_who_table_global_data_date_reported.html
similarity index 100%
rename from app/templates/who/fragments/fragment_who_table_global_data_date_reported.html
rename to covid19/templates/who/fragments/fragment_who_table_global_data_date_reported.html
diff --git a/app/templates/who/fragments/fragment_who_table_who_country.html b/covid19/templates/who/fragments/fragment_who_table_who_country.html
similarity index 100%
rename from app/templates/who/fragments/fragment_who_table_who_country.html
rename to covid19/templates/who/fragments/fragment_who_table_who_country.html
diff --git a/app/templates/who/region/who_region_all.html b/covid19/templates/who/region/who_region_all.html
similarity index 100%
rename from app/templates/who/region/who_region_all.html
rename to covid19/templates/who/region/who_region_all.html
diff --git a/app/templates/who/region/who_region_one.html b/covid19/templates/who/region/who_region_one.html
similarity index 100%
rename from app/templates/who/region/who_region_one.html
rename to covid19/templates/who/region/who_region_one.html
diff --git a/app/templates/who/who_imported.html b/covid19/templates/who/who_imported.html
similarity index 100%
rename from app/templates/who/who_imported.html
rename to covid19/templates/who/who_imported.html
diff --git a/app/templates/who/who_info.html b/covid19/templates/who/who_info.html
similarity index 100%
rename from app/templates/who/who_info.html
rename to covid19/templates/who/who_info.html
diff --git a/app/templates/who/who_tasks.html b/covid19/templates/who/who_tasks.html
similarity index 100%
rename from app/templates/who/who_tasks.html
rename to covid19/templates/who/who_tasks.html
diff --git a/view_admin.py b/covid19/views_admin.py
similarity index 89%
rename from view_admin.py
rename to covid19/views_admin.py
index 78ee5b7e9ea92e2b29aef99fcca59e7abd828182..7f71262ac816e95e27347721849d5e116eb70156 100644
--- a/view_admin.py
+++ b/covid19/views_admin.py
@@ -7,12 +7,12 @@ from database import app
 from services import who_service, europe_service, vaccination_service, admin_service, rki_service
 from workers import celery
 
-from app.oodm.who.who_model import WhoGlobalDataImportTable
-from app.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
-from app.oodm.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent
-from app.oodm.europe.europe_model import EuropeCountry, EuropeData
-from app.oodm.common.common_model_transient import ApplicationPage
-from app.oodm.vaccination.vaccination_model import VaccinationGermanyTimeline
+from covid19.oodm.who.who_model import WhoGlobalDataImportTable
+from covid19.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
+from covid19.oodm.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent
+from covid19.oodm.europe.europe_model import EuropeCountry, EuropeData
+from covid19.oodm.common.common_model_transient import ApplicationPage
+from covid19.oodm.vaccination.vaccination_model import VaccinationGermanyTimeline
 
 drop_and_create_data_again = True
 
diff --git a/views_europe.py b/covid19/views_europe.py
similarity index 96%
rename from views_europe.py
rename to covid19/views_europe.py
index 148929d90f21f5758e560f868c15e278f2e7cbb9..f6986ed604f0567f103f941dd3ff3ce77a4aca3b 100644
--- a/views_europe.py
+++ b/covid19/views_europe.py
@@ -6,9 +6,9 @@ from database import app
 from services import europe_service
 from workers import celery
 
-from app.oodm.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent
-from app.oodm.europe.europe_model import EuropeCountry, EuropeData
-from app.oodm.common.common_model_transient import ApplicationPage
+from covid19.oodm.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent
+from covid19.oodm.europe.europe_model import EuropeCountry, EuropeData
+from covid19.oodm.common.common_model_transient import ApplicationPage
 
 
 ##################################################################################################################
diff --git a/views_nrw.py b/covid19/views_nrw.py
similarity index 78%
rename from views_nrw.py
rename to covid19/views_nrw.py
index 99f17b14947fcbd180e987d5b8899b1bd54480ea..83c1895cad07fba2bf37e7e012205c97d40974af 100644
--- a/views_nrw.py
+++ b/covid19/views_nrw.py
@@ -7,12 +7,12 @@ from database import app
 from services import who_service, europe_service, vaccination_service, admin_service, rki_service
 from workers import celery
 
-from app.oodm.who.who_model import WhoGlobalDataImportTable
-from app.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
-from app.oodm.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent
-from app.oodm.europe.europe_model import EuropeCountry, EuropeData
-from app.oodm.common.common_model_transient import ApplicationPage
-from app.oodm.vaccination.vaccination_model import VaccinationGermanyTimeline
+from covid19.oodm.who.who_model import WhoGlobalDataImportTable
+from covid19.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
+from covid19.oodm.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent
+from covid19.oodm.europe.europe_model import EuropeCountry, EuropeData
+from covid19.oodm.common.common_model_transient import ApplicationPage
+from covid19.oodm.vaccination.vaccination_model import VaccinationGermanyTimeline
 
 
 ##################################################################################################################
diff --git a/views_rki.py b/covid19/views_rki.py
similarity index 90%
rename from views_rki.py
rename to covid19/views_rki.py
index af3ecffb5e82b368bec4c32bbc7b5e5cafa353e8..0a6f8b5409b0f70751d7c0db28e76b9312f83e37 100644
--- a/views_rki.py
+++ b/covid19/views_rki.py
@@ -3,8 +3,8 @@ from sqlalchemy.exc import OperationalError
 
 from database import app
 
-from app.oodm.who.who_model import WhoGlobalDataImportTable
-from app.oodm.common.common_model_transient import ApplicationPage
+from covid19.oodm.who.who_model import WhoGlobalDataImportTable
+from covid19.oodm.common.common_model_transient import ApplicationPage
 
 drop_and_create_data_again = True
 
diff --git a/view_vaccination.py b/covid19/views_vaccination.py
similarity index 82%
rename from view_vaccination.py
rename to covid19/views_vaccination.py
index 64d2125cc4cee7c4dbbdb332910360994166f726..6cfdd6d0f94acef3f3c428397385847e05f6cfcb 100644
--- a/view_vaccination.py
+++ b/covid19/views_vaccination.py
@@ -7,12 +7,12 @@ from database import app
 from services import who_service, europe_service, vaccination_service, admin_service, rki_service
 from workers import celery
 
-from app.oodm.who.who_model import WhoGlobalDataImportTable
-from app.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
-from app.oodm.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent
-from app.oodm.europe.europe_model import EuropeCountry, EuropeData
-from app.oodm.common.common_model_transient import ApplicationPage
-from app.oodm.vaccination.vaccination_model import VaccinationGermanyTimeline
+from covid19.oodm.who.who_model import WhoGlobalDataImportTable
+from covid19.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
+from covid19.oodm.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent
+from covid19.oodm.europe.europe_model import EuropeCountry, EuropeData
+from covid19.oodm.common.common_model_transient import ApplicationPage
+from covid19.oodm.vaccination.vaccination_model import VaccinationGermanyTimeline
 
 
 ##################################################################################################################
diff --git a/views_who.py b/covid19/views_who.py
similarity index 96%
rename from views_who.py
rename to covid19/views_who.py
index c1be22fe1ce563eabf6093dd339a53bb0b2a8335..2c15c3acfb7d2a5595a2cdfcd5a27e0d86a528f2 100644
--- a/views_who.py
+++ b/covid19/views_who.py
@@ -7,12 +7,12 @@ from database import app
 from services import who_service, europe_service, vaccination_service, admin_service, rki_service
 from workers import celery
 
-from app.oodm.who.who_model import WhoGlobalDataImportTable
-from app.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
-from app.oodm.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent
-from app.oodm.europe.europe_model import EuropeCountry, EuropeData
-from app.oodm.common.common_model_transient import ApplicationPage
-from app.oodm.vaccination.vaccination_model import VaccinationGermanyTimeline
+from covid19.oodm.who.who_model import WhoGlobalDataImportTable
+from covid19.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
+from covid19.oodm.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent
+from covid19.oodm.europe.europe_model import EuropeCountry, EuropeData
+from covid19.oodm.common.common_model_transient import ApplicationPage
+from covid19.oodm.vaccination.vaccination_model import VaccinationGermanyTimeline
 
 
 ##################################################################################################################
diff --git a/app_worker/__init__.py b/covid19_worker/__init__.py
similarity index 96%
rename from app_worker/__init__.py
rename to covid19_worker/__init__.py
index 9881337db9d7f6ed3d8daac9fce52980c5bc5465..77a002b4bd3a68344367ee326715153d1fc08d59 100644
--- a/app_worker/__init__.py
+++ b/covid19_worker/__init__.py
@@ -1,4 +1,4 @@
-from app import app
+from covid19 import app
 from workers import celery
 
 #################################################################################################################
diff --git a/services.py b/services.py
index d6a6d4195ca26b8f24fb0767c6c1848848d18949..bcca44b55860dc1ed2626295015886dcfa20b2af 100644
--- a/services.py
+++ b/services.py
@@ -1,11 +1,11 @@
 from database import db
 
-from app.oodm.common.common_service import CommonService
-from app.oodm.who.who_service import WhoService
-from app.oodm.europe.europe_service import EuropeService
-from app.oodm.rki.rki_service import RkiService
-from app.oodm.vaccination.vaccination_service import VaccinationService
-from app.oodm.admin.admin_service import AdminService
+from covid19.oodm.common.common_service import CommonService
+from covid19.oodm.who.who_service import WhoService
+from covid19.oodm.europe.europe_service import EuropeService
+from covid19.oodm.rki.rki_service import RkiService
+from covid19.oodm.vaccination.vaccination_service import VaccinationService
+from covid19.oodm.admin.admin_service import AdminService
 
 ############################################################################################
 #
diff --git a/views.py b/views.py
index 6b5f46a83a4374a194aaede35028d2fcf94d18f8..0e409327f6eade5990b834e682ab62fcca15be73 100644
--- a/views.py
+++ b/views.py
@@ -1,13 +1,13 @@
 from flask import render_template, redirect, url_for
 from database import app
-from app.oodm.common.common_model_transient import ApplicationPage
+from covid19.oodm.common.common_model_transient import ApplicationPage
 
-import views_who
-import views_europe
-import view_vaccination
-import views_rki
-import views_nrw
-import view_admin
+import covid19.views_who
+import covid19.views_europe
+import covid19.views_vaccination
+import covid19.views_rki
+import covid19.views_nrw
+import covid19.views_admin
 
 
 ############################################################################################