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 c60f681cff91096658e7f0d2e74b87d663c503f5..d36c748c5c6cae787d7933776675af3c27b6755d 100644
--- a/src/flask_covid19/blueprints/app_admin/app_admin_views.py
+++ b/src/flask_covid19/blueprints/app_admin/app_admin_views.py
@@ -3,10 +3,7 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-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.blueprints.app_all.all_services import app_admin_service
 from flask_covid19.blueprints.app_mq.application_workers import celery
 from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
diff --git a/src/flask_covid19/blueprints/app_all/all_views.py b/src/flask_covid19/blueprints/app_all/all_views.py
index e27c882afa2c85e009f7484b53572a720843c481..3ad0c974ff19523f1d96f96baf0e8c46385bd60f 100644
--- a/src/flask_covid19/blueprints/app_all/all_views.py
+++ b/src/flask_covid19/blueprints/app_all/all_views.py
@@ -3,10 +3,7 @@ from celery import states
 from celery.utils.log import get_task_logger
 
 from database import app
-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.blueprints.app_all.all_services import app_admin_service, all_service
 from flask_covid19.blueprints.app_mq.application_workers import celery
 from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
diff --git a/src/flask_covid19/blueprints/app_user/user_service.py b/src/flask_covid19/blueprints/app_user/user_service.py
index e592ca3f3d3722e61dc82d981d69dee1b85a0a52..5b7bf7c56cb4980a2d87755ae5c2502719192c26 100644
--- a/src/flask_covid19/blueprints/app_user/user_service.py
+++ b/src/flask_covid19/blueprints/app_user/user_service.py
@@ -1,5 +1,5 @@
 from database import app
-from flask_covid19 import User, LoginForm
+from flask_covid19.blueprints.app_user.user_model import User, LoginForm
 
 
 class UserService:
diff --git a/src/flask_covid19/blueprints/app_user/user_views.py b/src/flask_covid19/blueprints/app_user/user_views.py
index 242e228f73e3c3d779c9aafe85f82c231ccabfd2..acaf6e2c4a72df42191b9bab34fbfd9e604f7478 100644
--- a/src/flask_covid19/blueprints/app_user/user_views.py
+++ b/src/flask_covid19/blueprints/app_user/user_views.py
@@ -8,8 +8,9 @@ import flask
 
 from database import admin, db, login_manager
 
-from flask_covid19 import ApplicationPage
-from flask_covid19 import User, LoginForm
+
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
+from flask_covid19.blueprints.app_user.user_model import User, LoginForm
 
 
 blueprint_app_user = Blueprint('usr', __name__, template_folder='templates', url_prefix='/app/usr')
diff --git a/src/flask_covid19/blueprints/divi/divi_service.py b/src/flask_covid19/blueprints/divi/divi_service.py
index 8d74caddeb55eda950ea208cf8901fcceb6ca30b..7128d2fb3004cef28cf43821a5a5edce072f7642 100644
--- a/src/flask_covid19/blueprints/divi/divi_service.py
+++ b/src/flask_covid19/blueprints/divi/divi_service.py
@@ -1,7 +1,8 @@
 from database import app
 
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
+
+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 import DiviServiceImport
 from flask_covid19 import DiviServiceUpdate, DiviServiceUpdateFull
 
diff --git a/src/flask_covid19/blueprints/divi/divi_service_import.py b/src/flask_covid19/blueprints/divi/divi_service_import.py
index d90dbe02aef13f7107a033261eea3055ddd7d5b1..a12206e4b5495f1decf9960749fd4924f1824db6 100644
--- a/src/flask_covid19/blueprints/divi/divi_service_import.py
+++ b/src/flask_covid19/blueprints/divi/divi_service_import.py
@@ -3,7 +3,7 @@ import csv
 import psycopg2
 
 from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import DiviImport
 
 
diff --git a/src/flask_covid19/blueprints/divi/divi_service_update.py b/src/flask_covid19/blueprints/divi/divi_service_update.py
index b0f1ab609cc06dda4693774631d1118436de3d3e..6bbbdc87672b37035152a70d5d7813722ea40ee2 100644
--- a/src/flask_covid19/blueprints/divi/divi_service_update.py
+++ b/src/flask_covid19/blueprints/divi/divi_service_update.py
@@ -1,5 +1,5 @@
 from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 
 from flask_covid19 import DiviRegion, DiviDateReported, DiviCountry, DiviData
 from flask_covid19 import DiviImport
diff --git a/src/flask_covid19/blueprints/divi/divi_views.py b/src/flask_covid19/blueprints/divi/divi_views.py
index e1d2602003792dd131978de73b77c985f647fd4b..17be23f1de87d75c94709405643966b16d77c0df 100644
--- a/src/flask_covid19/blueprints/divi/divi_views.py
+++ b/src/flask_covid19/blueprints/divi/divi_views.py
@@ -6,9 +6,10 @@ from flask_admin.contrib.sqla import ModelView
 from flask_login import login_required
 
 from database import app, admin, db
-from flask_covid19 import divi_service
+
+from flask_covid19.blueprints.app_all.all_services import divi_service
 from flask_covid19.blueprints.app_mq.application_workers import celery
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 from flask_covid19 import DiviRegion, DiviDateReported, DiviCountry, DiviData
 from flask_covid19 import DiviImport
diff --git a/src/flask_covid19/blueprints/divi_test/divi_test_service.py b/src/flask_covid19/blueprints/divi_test/divi_test_service.py
index 06a61752a27551f84efe147a49f8896c988ca6f0..af86c7a1ed685317e8b195926a01207d9de75391 100644
--- a/src/flask_covid19/blueprints/divi_test/divi_test_service.py
+++ b/src/flask_covid19/blueprints/divi_test/divi_test_service.py
@@ -1,5 +1,5 @@
 from database import app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import DiviDateReported, DiviData
 
 
diff --git a/src/flask_covid19/blueprints/divi_test/divi_test_views.py b/src/flask_covid19/blueprints/divi_test/divi_test_views.py
index 5bc85130a30ad3c305fc8bec11700c7bf0f2e4aa..c0b9cf078fd60b156effa4cf6342f7be73245fa2 100644
--- a/src/flask_covid19/blueprints/divi_test/divi_test_views.py
+++ b/src/flask_covid19/blueprints/divi_test/divi_test_views.py
@@ -4,9 +4,9 @@ from celery.utils.log import get_task_logger
 from flask_login import login_required
 
 from database import app, db
-from flask_covid19 import divi_service
-from flask_covid19 import celery
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_all.all_services import divi_service
+from flask_covid19.blueprints.app_mq.application_workers import celery
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 from flask_covid19 import DiviImport
 from flask_covid19 import DiviData
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_service.py b/src/flask_covid19/blueprints/ecdc/ecdc_service.py
index bcedfa24e4c7431496fc064b73c146b4dace1c50..19d157a18cdc8418c280896660b5d40976426bff 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_service.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_service.py
@@ -1,6 +1,6 @@
 from database import app
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
+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 import EcdcServiceImport
 from flask_covid19 import EcdcServiceUpdate, EcdcServiceUpdateFull
 
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py b/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py
index 734674ef991a7febff01a44e370320de61b99b02..bbe88482bc308fc1ae896ede598b545fb853112c 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_service_import.py
@@ -2,7 +2,7 @@ import csv
 import psycopg2
 
 from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import EcdcDateReported
 from flask_covid19 import EcdcImport
 
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py b/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py
index aa04092703541a96a7d42076b3360c7c24b3b9df..fdaa8d8dc15a9cb1a5807dd5d88f5074832157c4 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_service_update.py
@@ -1,5 +1,5 @@
 from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import EcdcImport
 from flask_covid19 import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData
 
diff --git a/src/flask_covid19/blueprints/ecdc/ecdc_views.py b/src/flask_covid19/blueprints/ecdc/ecdc_views.py
index f32728bf6ad53fe584d408a825f56cd1f7669ff6..8aa83048c4ff0d8096d11999df8fa24f4feae20b 100644
--- a/src/flask_covid19/blueprints/ecdc/ecdc_views.py
+++ b/src/flask_covid19/blueprints/ecdc/ecdc_views.py
@@ -4,13 +4,12 @@ from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 
 from database import admin, db
-from flask_covid19 import who_service, owid_service
-from flask_covid19 import ecdc_service
+from flask_covid19.blueprints.app_all.all_services import ecdc_service
 from flask_covid19.blueprints.app_mq.application_workers import celery
 
 from flask_covid19 import EcdcImport
 from flask_covid19 import EcdcDateReported, EcdcContinent, EcdcCountry, EcdcData
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 
 app_ecdc = Blueprint('ecdc', __name__, template_folder='templates', url_prefix='/ecdc')
diff --git a/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py
index a3522388e33ac13a0eda14854aa61a68d63bcec5..56de2f8d0f4dc63b1c3f12476070feca947ab0cf 100644
--- a/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py
+++ b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_service.py
@@ -1,5 +1,5 @@
 from database import app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import EcdcDateReported, EcdcData
 
 
diff --git a/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py
index 93a74f17b89e900c57f73de1c2e2b544666e8bbc..ebc01f8f947c1bd06da5650b486aebdf7723ef2f 100644
--- a/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py
+++ b/src/flask_covid19/blueprints/ecdc_test/ecdc_test_views.py
@@ -4,12 +4,9 @@ from celery.utils.log import get_task_logger
 from flask_login import login_required
 
 from database import app, db
-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 import celery
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_all.all_services import ecdc_service
+from flask_covid19.blueprints.app_mq.application_workers import celery
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 from flask_covid19 import EcdcImport
 from flask_covid19 import EcdcTestService
diff --git a/src/flask_covid19/blueprints/owid/owid_service.py b/src/flask_covid19/blueprints/owid/owid_service.py
index 3e3026feecc71dd3ccdb4d47cc8da5c87ddc91d7..7bc458f7e2a13c710570f381b1609c9ccb12cd21 100644
--- a/src/flask_covid19/blueprints/owid/owid_service.py
+++ b/src/flask_covid19/blueprints/owid/owid_service.py
@@ -1,9 +1,8 @@
 from flask import flash
 
 from database import app
-
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
+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 import OwidServiceImport
 from flask_covid19 import OwidServiceUpdate, OwidServiceUpdateFull
 
diff --git a/src/flask_covid19/blueprints/owid/owid_service_import.py b/src/flask_covid19/blueprints/owid/owid_service_import.py
index 29020bc3e9631e4351b4fce56f71a9c89e776f66..8633efd1f590aa8f0e6bdce98672207818a5be05 100644
--- a/src/flask_covid19/blueprints/owid/owid_service_import.py
+++ b/src/flask_covid19/blueprints/owid/owid_service_import.py
@@ -1,7 +1,7 @@
 import csv
 import psycopg2
 from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import OwidDateReported
 from flask_covid19 import OwidImport
 
diff --git a/src/flask_covid19/blueprints/owid/owid_service_update.py b/src/flask_covid19/blueprints/owid/owid_service_update.py
index 1d1c49809f0ed4062ce00d0173a28f605726247f..b25829202292f38e12980cbacdacf35cde571483 100644
--- a/src/flask_covid19/blueprints/owid/owid_service_update.py
+++ b/src/flask_covid19/blueprints/owid/owid_service_update.py
@@ -1,5 +1,5 @@
 from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry
 from flask_covid19 import OwidImport
 
diff --git a/src/flask_covid19/blueprints/owid/owid_views.py b/src/flask_covid19/blueprints/owid/owid_views.py
index b9302b9727bb4e9d2cccaea84e708bb59df8c443..66e53d1bd7c7283ebff8e5251b0edd70a82fcd16 100644
--- a/src/flask_covid19/blueprints/owid/owid_views.py
+++ b/src/flask_covid19/blueprints/owid/owid_views.py
@@ -5,12 +5,9 @@ from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 
 from database import app, admin, db
-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 owid_service
 from flask_covid19.blueprints.app_mq.application_workers import celery
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry
 from flask_covid19 import OwidImport
 
diff --git a/src/flask_covid19/blueprints/owid_test/owid_test_service.py b/src/flask_covid19/blueprints/owid_test/owid_test_service.py
index 8cbddfa15c141ed6a19bfd7b63a205ba17702064..2e725ea57045a15958d79cbd96817b01312865b3 100644
--- a/src/flask_covid19/blueprints/owid_test/owid_test_service.py
+++ b/src/flask_covid19/blueprints/owid_test/owid_test_service.py
@@ -1,5 +1,5 @@
 from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import OwidDateReported, OwidData, OwidContinent, OwidCountry
 from flask_covid19 import OwidImport
 
diff --git a/src/flask_covid19/blueprints/owid_test/owid_test_views.py b/src/flask_covid19/blueprints/owid_test/owid_test_views.py
index eb7e44f9e55546e2b5af691e58b259a97abe9e7b..4fae00e81ef18c9a8b3af4ed90d906994ac5bf2c 100644
--- a/src/flask_covid19/blueprints/owid_test/owid_test_views.py
+++ b/src/flask_covid19/blueprints/owid_test/owid_test_views.py
@@ -4,14 +4,11 @@ from celery.utils.log import get_task_logger
 from flask_login import login_required
 
 from database import app, db
-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 import celery
+from flask_covid19.blueprints.app_all.all_services import owid_service
+from flask_covid19.blueprints.app_mq.application_workers import celery
 from flask_covid19 import OwidData
 from flask_covid19 import OwidImport
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 from flask_covid19.blueprints.owid_test import OwidTestService
 
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_service.py b/src/flask_covid19/blueprints/rki_cases/rki_service.py
index 16a767ce9591c2d12cf4303296b0df55b19a63a1..ab713defd192f2943da1707809747a6b47902f6c 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_service.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_service.py
@@ -1,8 +1,8 @@
 from flask import flash
 
 from database import app
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
+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 import RkiServiceImport
 from flask_covid19 import RkiServiceUpdate, RkiServiceUpdateFull
 
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_service_import.py b/src/flask_covid19/blueprints/rki_cases/rki_service_import.py
index e40e9461b031277378e97fd57faf31267a7fd929..6914fc0941c9526b1bf3891ce3d913ea87ddf68c 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_service_import.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_service_import.py
@@ -2,7 +2,7 @@ import csv
 import psycopg2
 
 from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import RkiImport
 
 
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_service_update.py b/src/flask_covid19/blueprints/rki_cases/rki_service_update.py
index 8f72ccf5bd622214df9417f0b2609ef9245e9191..a68c83d26003bfe05c841bca78fe831489a81d58 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_service_update.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_service_update.py
@@ -1,6 +1,6 @@
 from database import db, app
 
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import RkiData, RkiMeldedatum
 from flask_covid19 import RkiImport
 
diff --git a/src/flask_covid19/blueprints/rki_cases/rki_views.py b/src/flask_covid19/blueprints/rki_cases/rki_views.py
index 48fc58b0f6801ebc02ad2419f31b1a4ae449c44f..7b224760836910085888b3fb4adc49d59ad1efa3 100644
--- a/src/flask_covid19/blueprints/rki_cases/rki_views.py
+++ b/src/flask_covid19/blueprints/rki_cases/rki_views.py
@@ -5,13 +5,10 @@ from celery import states
 
 from database import app, admin, db
 from flask_covid19.blueprints.app_mq.application_workers import celery
-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 rki_service
 from flask_covid19 import RkiData, RkiMeldedatum
 from flask_covid19 import RkiImport
-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/rki_cases_test/rki_test_service.py b/src/flask_covid19/blueprints/rki_cases_test/rki_test_service.py
index f6084f340b04401351caf6352423d161f1db0014..fba734170b582d79cb7862ede2cf33760cb494ce 100644
--- a/src/flask_covid19/blueprints/rki_cases_test/rki_test_service.py
+++ b/src/flask_covid19/blueprints/rki_cases_test/rki_test_service.py
@@ -1,5 +1,5 @@
 from database import db, app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import RkiData, RkiDateReported, RkiCountryRegion, RkiCountry
 from flask_covid19 import RkiImport
 
diff --git a/src/flask_covid19/blueprints/rki_cases_test/rki_test_views.py b/src/flask_covid19/blueprints/rki_cases_test/rki_test_views.py
index 28b780aa53e38bbc946dc3d6e8330a50f857b7d9..03dbe1340559f125a8c86c681c40bf255269ee8b 100644
--- a/src/flask_covid19/blueprints/rki_cases_test/rki_test_views.py
+++ b/src/flask_covid19/blueprints/rki_cases_test/rki_test_views.py
@@ -5,11 +5,11 @@ from flask_login import login_required
 
 from database import app, db
 
-from flask_covid19 import rki_service
-from flask_covid19 import celery
+from flask_covid19.blueprints.app_all.all_services import rki_service
+from flask_covid19.blueprints.app_mq.application_workers import celery
 from flask_covid19 import RkiData
 from flask_covid19 import RkiImport
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 from flask_covid19.blueprints.owid_test import OwidTestService
 
diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py
index 8a778a204de450b63e6e230468b11ad2474dc927..b9a0bf5c391010ffe370406f8514db5b7822485e 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service.py
@@ -1,8 +1,8 @@
 from flask import flash
 
 from database import app
-from flask_covid19 import ApplicationServiceConfig
-from flask_covid19 import ApplicationServiceDownload
+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 import RkiVaccinationServiceImport
 from flask_covid19 import RkiVaccinationServiceUpdate, RkiVaccinationServiceUpdateFull
 
diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
index bdb5cdeafa5e638291c4e3e913dd8dde6a0f9d63..ce5bf42a3471cde196ac88c48b0b54c7daa5dc29 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
@@ -2,10 +2,10 @@ import csv
 import psycopg2
 
 from database import db, app
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 
 from flask_covid19 import RkiVaccinationDateReported
 from flask_covid19 import RkiVaccinationImport
-from flask_covid19 import ApplicationServiceConfig
 
 
 class RkiVaccinationServiceImport:
diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
index 378595bc2849227b7596997ec6b1a712d7b742dd..689f2741dd6503505a8961165be100d4f7dbad94 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
@@ -1,6 +1,6 @@
 from database import db, app
 
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import RkiVaccinationImport
 from flask_covid19 import RkiVaccinationDateReported, RkiVaccinationData
 
diff --git a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
index ff67dc8a2b405625e764eac724b0e23eb8601bf9..85147e022d77842ff572a13b0c4f2f6626ac24b7 100644
--- a/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
+++ b/src/flask_covid19/blueprints/rki_vaccination/rki_vaccination_views.py
@@ -4,15 +4,12 @@ from celery.utils.log import get_task_logger
 from flask_admin.contrib.sqla import ModelView
 
 from database import admin, db
-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 rki_vaccination_service
 from flask_covid19.blueprints.app_mq.application_workers import celery
 
 from flask_covid19 import RkiVaccinationData, RkiVaccinationDateReported
 from flask_covid19 import RkiVaccinationImport
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 
 app_rki_vaccination = Blueprint('rki_vaccination', __name__, template_folder='templates', url_prefix='/rki/vaccination')
diff --git a/src/flask_covid19/blueprints/who_test/who_test_service.py b/src/flask_covid19/blueprints/who_test/who_test_service.py
index b2301214269cadc370f4371614b78d8f945b8d97..aee9c2224a05f04f83ba6d261bdcdb66e8d69d33 100644
--- a/src/flask_covid19/blueprints/who_test/who_test_service.py
+++ b/src/flask_covid19/blueprints/who_test/who_test_service.py
@@ -1,5 +1,5 @@
 from database import app
-from flask_covid19 import ApplicationServiceConfig
+from flask_covid19.blueprints.app_all.all_service_config import ApplicationServiceConfig
 from flask_covid19 import WhoDateReported, WhoData
 
 
diff --git a/src/flask_covid19/blueprints/who_test/who_test_views.py b/src/flask_covid19/blueprints/who_test/who_test_views.py
index 925eaf84c53f2bc8fa11a45de9e69751a228e89d..8a84d0f9803db845fedecd6cfc7cd4d2a48dc782 100644
--- a/src/flask_covid19/blueprints/who_test/who_test_views.py
+++ b/src/flask_covid19/blueprints/who_test/who_test_views.py
@@ -4,9 +4,9 @@ from celery.utils.log import get_task_logger
 from flask_login import login_required
 
 from database import app, db
-from flask_covid19 import who_service
-from flask_covid19 import celery
-from flask_covid19 import ApplicationPage
+from flask_covid19.blueprints.app_all.all_services import who_service
+from flask_covid19.blueprints.app_mq.application_workers import celery
+from flask_covid19.blueprints.app_application.application_model_transient import ApplicationPage
 
 from flask_covid19 import WhoImport
 from flask_covid19 import WhoData