diff --git a/src/flask_covid19/__init__.py b/src/flask_covid19/__init__.py
index c5688473fef824a5666ff5b2409616c9272e03eb..a1ae08392eed50ab2489e7a9deb827048313c33e 100644
--- a/src/flask_covid19/__init__.py
+++ b/src/flask_covid19/__init__.py
@@ -1,8 +1,8 @@
 from database import app, run_run_with_debug, port, db
 
 import flask_covid19.blueprints.app_application.application_views
-from flask_covid19 import app_user_service
-from flask_covid19 import ApplicationService
+from flask_covid19.blueprints.app_all.all_services import app_user_service
+from flask_covid19.blueprints.app_application.application_service import ApplicationService
 
 
 def run_web():
diff --git a/src/flask_covid19/blueprints/app_admin/app_admin_views.py b/src/flask_covid19/blueprints/app_admin/app_admin_views.py
index f76d120961539a42a261255d9b7915c769f40abc..51d11777f05bedb1a95c3cfc091ea07d17fafbf8 100644
--- a/src/flask_covid19/blueprints/app_admin/app_admin_views.py
+++ b/src/flask_covid19/blueprints/app_admin/app_admin_views.py
@@ -3,12 +3,12 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-from flask_covid19 import who_service, owid_service
-from flask_covid19 import rki_service, rki_vaccination_service
-from flask_covid19 import ecdc_service, divi_service
-from flask_covid19 import app_admin_service, app_user_service
+from flask_covid19.blueprints.app_all.all_services import who_service, owid_service
+from flask_covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service
+from flask_covid19.blueprints.app_all.all_services import ecdc_service, divi_service
+from flask_covid19.blueprints.app_all.all_services import app_admin_service, app_user_service
 from flask_covid19 import celery
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 drop_and_create_data_again = True
 
diff --git a/src/flask_covid19/blueprints/app_all/all_service.py b/src/flask_covid19/blueprints/app_all/all_service.py
index 2faae9111955676e696a4ce0f2d40fe8b487bbc2..a1aa0d6cec4362253b8bbee8f34f258a512f389f 100644
--- a/src/flask_covid19/blueprints/app_all/all_service.py
+++ b/src/flask_covid19/blueprints/app_all/all_service.py
@@ -1,11 +1,11 @@
 from database import app
 
-from flask_covid19 import EcdcService
-from flask_covid19 import OwidService
-from flask_covid19 import RkiVaccinationService
-from flask_covid19 import WhoService
-from flask_covid19 import DiviService
-from flask_covid19 import RkiService
+from flask_covid19.blueprints.ecdc.ecdc_service import EcdcService
+from flask_covid19.blueprints.owid.owid_service import OwidService
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_service import RkiVaccinationService
+from flask_covid19.blueprints.who.who_service import WhoService
+from flask_covid19.blueprints.divi.divi_service import DiviService
+from flask_covid19.blueprints.rki_cases.rki_service import RkiService
 
 
 class AllService:
diff --git a/src/flask_covid19/blueprints/app_all/all_service_config.py b/src/flask_covid19/blueprints/app_all/all_service_config.py
index 57671edc70511fcb82a3cdec044787f5128aaca4..8e7d273a4d94606b06ecae79aba16008d2545c82 100644
--- a/src/flask_covid19/blueprints/app_all/all_service_config.py
+++ b/src/flask_covid19/blueprints/app_all/all_service_config.py
@@ -1,10 +1,10 @@
 import os
-from flask_covid19 import EcdcImport
-from flask_covid19 import WhoImport
-from flask_covid19 import RkiVaccinationImport
-from flask_covid19 import OwidImport
-from flask_covid19 import RkiImport
-from flask_covid19 import DiviImport
+from flask_covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
+from flask_covid19.blueprints.who.who_service_import import WhoImport
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
+from flask_covid19.blueprints.owid.owid_model_import import OwidImport
+from flask_covid19.blueprints.rki_cases.rki_model_import import RkiImport
+from flask_covid19.blueprints.divi.divi_model_import import DiviImport
 
 
 class ApplicationServiceConfig:
diff --git a/src/flask_covid19/blueprints/app_all/all_service_download.py b/src/flask_covid19/blueprints/app_all/all_service_download.py
index f0974b9e8f8b9d133d661e671bbda1cc9f773bbd..7d2d1d95f7bd2f4741ea0ea9358b970002fe89f3 100644
--- a/src/flask_covid19/blueprints/app_all/all_service_download.py
+++ b/src/flask_covid19/blueprints/app_all/all_service_download.py
@@ -2,7 +2,7 @@ import os
 import wget
 import subprocess
 from database import app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 
 
 class ApplicationServiceDownload:
diff --git a/src/flask_covid19/blueprints/app_all/all_services.py b/src/flask_covid19/blueprints/app_all/all_services.py
index 0f62f722b16512c2ee4b6192c2e98de9110536f6..0caffeb0f4cc17befdfd0868193d21e66e7a759e 100644
--- a/src/flask_covid19/blueprints/app_all/all_services.py
+++ b/src/flask_covid19/blueprints/app_all/all_services.py
@@ -1,14 +1,14 @@
 from database import db
 
-from flask_covid19 import AdminService
-from flask_covid19 import AllService
-from flask_covid19 import UserService
-from flask_covid19 import EcdcService
-from flask_covid19 import OwidService
-from flask_covid19 import RkiVaccinationService
-from flask_covid19 import WhoService
-from flask_covid19 import DiviService
-from flask_covid19 import RkiService
+from flask_covid19.blueprints.app_admin.app_admin_service import AdminService
+from flask_covid19.blueprints.app_all.all_service import AllService
+from flask_covid19.blueprints.app_user.user_service import UserService
+from flask_covid19.blueprints.ecdc.ecdc_service import EcdcService
+from flask_covid19.blueprints.owid.owid_service import OwidService
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_service import RkiVaccinationService
+from flask_covid19.blueprints.who.who_service import WhoService
+from flask_covid19.blueprints.divi.divi_service import DiviService
+from flask_covid19.blueprints.rki_cases.rki_service import RkiService
 
 ############################################################################################
 #
diff --git a/src/flask_covid19/blueprints/app_all/all_views.py b/src/flask_covid19/blueprints/app_all/all_views.py
index ee63dce44e358d058aaba72a11aeb324e2c5beb0..e926eb254bf2612c04dffa561e59ddd508cbbe49 100644
--- a/src/flask_covid19/blueprints/app_all/all_views.py
+++ b/src/flask_covid19/blueprints/app_all/all_views.py
@@ -3,12 +3,12 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-from flask_covid19 import who_service, owid_service
-from flask_covid19 import rki_service, rki_vaccination_service
-from flask_covid19 import ecdc_service, divi_service
-from flask_covid19 import app_admin_service, app_user_service, all_service
+from flask_covid19.blueprints.app_all.all_services import who_service, owid_service
+from flask_covid19.blueprints.app_all.all_services import rki_service, rki_vaccination_service
+from flask_covid19.blueprints.app_all.all_services import ecdc_service, divi_service
+from flask_covid19.blueprints.app_all.all_services import app_admin_service, app_user_service, all_service
 from flask_covid19 import celery
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 drop_and_create_data_again = True
 
diff --git a/src/flask_covid19/blueprints/app_application/application_views.py b/src/flask_covid19/blueprints/app_application/application_views.py
index b6e7cf964ce530275e4dc2b09eba46c02d6334a3..c2ed1acf7e0183e9d81388bdfdd033442664fc94 100644
--- a/src/flask_covid19/blueprints/app_application/application_views.py
+++ b/src/flask_covid19/blueprints/app_application/application_views.py
@@ -1,25 +1,25 @@
 from flask import render_template, redirect, url_for, Blueprint
 
 from database import app
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 
-from flask_covid19 import blueprint_app_user
-from flask_covid19 import blueprint_app_admin
-from flask_covid19 import blueprint_app_all
+from flask_covid19.blueprints.app_user.user_views import blueprint_app_user
+from flask_covid19.blueprints.app_admin.app_admin_views import blueprint_app_admin
+from flask_covid19.blueprints.app_all.all_views import blueprint_app_all
 
-from flask_covid19 import app_who
-from flask_covid19 import app_owid
-from flask_covid19 import app_ecdc
-from flask_covid19 import app_rki_vaccination
-from flask_covid19 import app_rki
-from flask_covid19 import app_divi
+from flask_covid19.blueprints.who.who_views import app_who
+from flask_covid19.blueprints.owid.owid_views import app_owid
+from flask_covid19.blueprints.ecdc.ecdc_views import app_ecdc
+from flask_covid19.blueprints.rki_vaccination.rki_vaccination_views import app_rki_vaccination
+from flask_covid19.blueprints.rki_cases.rki_views import app_rki
+from flask_covid19.blueprints.divi.divi_views import app_divi
 
-from flask_covid19 import app_who_test
-from flask_covid19.blueprints.owid_test import app_owid_test
-from flask_covid19 import app_ecdc_test
-from flask_covid19 import app_rki_test
-from flask_covid19 import app_divi_test
+from flask_covid19.blueprints.who_test.who_test_views import app_who_test
+from flask_covid19.blueprints.owid_test.owid_test_views import app_owid_test
+from flask_covid19.blueprints.ecdc_test.ecdc_test_views import app_ecdc_test
+from flask_covid19.blueprints.rki_cases_test.rki_test_views import app_rki_test
+from flask_covid19.blueprints.divi_test.divi_test_views import app_divi_test
 
 blueprint_application = Blueprint('application', __name__, template_folder='templates', url_prefix='/')
 
diff --git a/src/flask_covid19/blueprints/who/who_model.py b/src/flask_covid19/blueprints/who/who_model.py
index 6b016cb74a6a09a2ddab30b64fe73aaa2cb4bbcb..5ce85f0b34f42a9f1e81a7fd86965c9760294c0b 100644
--- a/src/flask_covid19/blueprints/who/who_model.py
+++ b/src/flask_covid19/blueprints/who/who_model.py
@@ -2,7 +2,7 @@ from sqlalchemy import and_
 from datetime import date
 from sqlalchemy.orm import joinedload, subqueryload
 from database import db, cache, ITEMS_PER_PAGE
-from flask_covid19 import ApplicationDateReported, ApplicationRegion
+from flask_covid19.blueprints.app_all.all_model import ApplicationDateReported, ApplicationRegion
 
 
 class WhoDateReported(ApplicationDateReported):
diff --git a/src/flask_covid19/blueprints/who/who_model_import.py b/src/flask_covid19/blueprints/who/who_model_import.py
index 28bf4e5d355ec9c62aab42b088c36365eabf0f4e..a8217130dec17244a8abb22cdc9dbab0b935149c 100644
--- a/src/flask_covid19/blueprints/who/who_model_import.py
+++ b/src/flask_covid19/blueprints/who/who_model_import.py
@@ -1,6 +1,7 @@
 from sqlalchemy.orm import Bundle
 from database import db, ITEMS_PER_PAGE
 
+
 class WhoImport(db.Model):
     __tablename__ = 'application__import__who'
 
diff --git a/src/flask_covid19/blueprints/who/who_service.py b/src/flask_covid19/blueprints/who/who_service.py
index d9c63fca0ab7429d8a995b26902409af46198e22..c9c5302141ea56d24362ce42f60cce02017993f8 100644
--- a/src/flask_covid19/blueprints/who/who_service.py
+++ b/src/flask_covid19/blueprints/who/who_service.py
@@ -1,10 +1,10 @@
 from flask import flash
 
 from database import app
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
-from flask_covid19 import WhoServiceImport
-from flask_covid19 import WhoServiceUpdate, WhoServiceUpdateFull
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_download import ApplicationServiceDownload
+from flask_covid19.blueprints.who.who_service_import import WhoServiceImport
+from flask_covid19.blueprints.who.who_service_update import WhoServiceUpdate, WhoServiceUpdateFull
 
 
 class WhoService:
diff --git a/src/flask_covid19/blueprints/who/who_service_import.py b/src/flask_covid19/blueprints/who/who_service_import.py
index 6e30124cfd6cdc05acab6e79ddba8a027a2ee37d..20e474fae783354bdeba0deae2fd3fe59b8c12b8 100644
--- a/src/flask_covid19/blueprints/who/who_service_import.py
+++ b/src/flask_covid19/blueprints/who/who_service_import.py
@@ -2,9 +2,9 @@ import sys
 import csv
 import psycopg2
 from database import db, app
-from flask_covid19 import WhoDateReported
-from flask_covid19 import WhoImport
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
+from flask_covid19.blueprints.who.who_model import WhoDateReported
+from flask_covid19.blueprints.who.who_model_import import WhoImport
 
 
 class WhoServiceImport:
diff --git a/src/flask_covid19/blueprints/who/who_service_update.py b/src/flask_covid19/blueprints/who/who_service_update.py
index 26de9ba0ec9476599b4b6b4395d9c2aeaa30287f..3ec7121412d70adb621621097d2420b2116e6d8f 100644
--- a/src/flask_covid19/blueprints/who/who_service_update.py
+++ b/src/flask_covid19/blueprints/who/who_service_update.py
@@ -1,7 +1,7 @@
 from database import db, app
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import WhoCountryRegion, WhoDateReported, WhoCountry, WhoData
-from flask_covid19 import WhoImport
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
+from flask_covid19.blueprints.who.who_model import WhoCountryRegion, WhoDateReported, WhoCountry, WhoData
+from flask_covid19.blueprints.who.who_model_import import WhoImport
 
 
 class WhoServiceUpdateBase:
diff --git a/src/flask_covid19/blueprints/who/who_views.py b/src/flask_covid19/blueprints/who/who_views.py
index ebda63582bd48d00bf2f952104a77c860f16e695..1430f5e37fc3f84854d4ab949510c2c6dbe41bb2 100644
--- a/src/flask_covid19/blueprints/who/who_views.py
+++ b/src/flask_covid19/blueprints/who/who_views.py
@@ -6,12 +6,12 @@ from flask_admin.contrib.sqla import ModelView
 from flask_login import login_required
 
 from database import app, admin, db
-from flask_covid19 import who_service
+from flask_covid19.blueprints.app_all.all_services import who_service
 from flask_covid19 import celery
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
-from flask_covid19 import WhoImport
-from flask_covid19 import WhoCountryRegion, WhoCountry, WhoDateReported, WhoData
+from flask_covid19.blueprints.who.who_model_import import WhoImport
+from flask_covid19.blueprints.who.who_model import WhoCountryRegion, WhoCountry, WhoDateReported, WhoData
 
 
 app_who = Blueprint('who', __name__, template_folder='templates', url_prefix='/who')