diff --git a/covid19/__init__.py b/covid19/__init__.py
index 3d68df5acd134ed3534b8e571455970920c260c4..5f450b30d4058f0af2641b2e1c7efba29d5ff34f 100644
--- a/covid19/__init__.py
+++ b/covid19/__init__.py
@@ -1,6 +1,6 @@
 from database import app, run_run_with_debug
 
-import views
+import covid19.views
 
 #################################################################################################################
 #
diff --git a/services.py b/covid19/services.py
similarity index 100%
rename from services.py
rename to covid19/services.py
diff --git a/views.py b/covid19/views.py
similarity index 100%
rename from views.py
rename to covid19/views.py
diff --git a/covid19/views_admin.py b/covid19/views_admin.py
index 7f71262ac816e95e27347721849d5e116eb70156..67a00036f69c3b1954052c251cd0081935636af7 100644
--- a/covid19/views_admin.py
+++ b/covid19/views_admin.py
@@ -4,8 +4,8 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-from services import who_service, europe_service, vaccination_service, admin_service, rki_service
-from workers import celery
+from covid19.services import who_service, europe_service, vaccination_service, admin_service, rki_service
+from covid19.workers import celery
 
 from covid19.oodm.who.who_model import WhoGlobalDataImportTable
 from covid19.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
diff --git a/covid19/views_europe.py b/covid19/views_europe.py
index f6986ed604f0567f103f941dd3ff3ce77a4aca3b..55b4b155d138b80a9e629660f1ca976c90fa4c47 100644
--- a/covid19/views_europe.py
+++ b/covid19/views_europe.py
@@ -3,8 +3,8 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-from services import europe_service
-from workers import celery
+from covid19.services import europe_service
+from covid19.workers import celery
 
 from covid19.oodm.europe.europe_model import EuropeDataImportTable, EuropeDateReported, EuropeContinent
 from covid19.oodm.europe.europe_model import EuropeCountry, EuropeData
diff --git a/covid19/views_nrw.py b/covid19/views_nrw.py
index 83c1895cad07fba2bf37e7e012205c97d40974af..aa88480ba3965bd59a3f5d49b2646b8d86cc4acc 100644
--- a/covid19/views_nrw.py
+++ b/covid19/views_nrw.py
@@ -4,8 +4,8 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-from services import who_service, europe_service, vaccination_service, admin_service, rki_service
-from workers import celery
+from covid19.services import who_service, europe_service, vaccination_service, admin_service, rki_service
+from covid19.workers import celery
 
 from covid19.oodm.who.who_model import WhoGlobalDataImportTable
 from covid19.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
diff --git a/covid19/views_vaccination.py b/covid19/views_vaccination.py
index 6cfdd6d0f94acef3f3c428397385847e05f6cfcb..e0b088b8027416408c98164f0ea960ade854026b 100644
--- a/covid19/views_vaccination.py
+++ b/covid19/views_vaccination.py
@@ -4,8 +4,8 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-from services import who_service, europe_service, vaccination_service, admin_service, rki_service
-from workers import celery
+from covid19.services import who_service, europe_service, vaccination_service, admin_service, rki_service
+from covid19.workers import celery
 
 from covid19.oodm.who.who_model import WhoGlobalDataImportTable
 from covid19.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
diff --git a/covid19/views_who.py b/covid19/views_who.py
index 2c15c3acfb7d2a5595a2cdfcd5a27e0d86a528f2..becdcde313b25cb754f23c67ea2dfdaa934aae54 100644
--- a/covid19/views_who.py
+++ b/covid19/views_who.py
@@ -4,8 +4,8 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-from services import who_service, europe_service, vaccination_service, admin_service, rki_service
-from workers import celery
+from covid19.services import who_service, europe_service, vaccination_service, admin_service, rki_service
+from covid19.workers import celery
 
 from covid19.oodm.who.who_model import WhoGlobalDataImportTable
 from covid19.oodm.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
diff --git a/workers.py b/covid19/workers.py
similarity index 100%
rename from workers.py
rename to covid19/workers.py
diff --git a/covid19_worker/__init__.py b/covid19_worker/__init__.py
index 77a002b4bd3a68344367ee326715153d1fc08d59..e14bc87928b4cce65c22d3a078da9380197b31c7 100644
--- a/covid19_worker/__init__.py
+++ b/covid19_worker/__init__.py
@@ -1,5 +1,5 @@
 from covid19 import app
-from workers import celery
+from covid19.workers import celery
 
 #################################################################################################################
 #