diff --git a/src/covid19/blueprints/application/application_views.py b/src/covid19/blueprints/application/application_views.py
index 2aed03ed1a734850d6d43f4d96fb046a7251c6d4..22528f07caaf7d627942fe8f97e170a472d6c2bb 100644
--- a/src/covid19/blueprints/application/application_views.py
+++ b/src/covid19/blueprints/application/application_views.py
@@ -6,17 +6,17 @@ from covid19.blueprints.application.application_model_transient import Applicati
 
 import covid19.blueprints.admin.admin_views
 import covid19.blueprints.ecdc.ecdc_views
-import covid19.blueprints.rki_bundeslaender.rki_bundeslaender_views
-import covid19.blueprints.rki_landkreise.rki_landkreise_views
-import covid19.blueprints.rki_vaccination.rki_vaccination_views
+import covid19.blueprints.rki.rki_bundeslaender.rki_bundeslaender_views
+import covid19.blueprints.rki.rki_landkreise.rki_landkreise_views
+import covid19.blueprints.rki.rki_vaccination.rki_vaccination_views
 import covid19.blueprints.who.who_views
 
 
 from covid19.blueprints.admin.admin_views import app_admin
 from covid19.blueprints.ecdc.ecdc_views import app_ecdc
-from covid19.blueprints.rki_bundeslaender.rki_bundeslaender_views import app_rki_bundeslaender
-from covid19.blueprints.rki_landkreise.rki_landkreise_views import app_rki_landkreise
-from covid19.blueprints.rki_vaccination.rki_vaccination_views import app_rki_vaccination
+from covid19.blueprints.rki.rki_bundeslaender.rki_bundeslaender_views import app_rki_bundeslaender
+from covid19.blueprints.rki.rki_landkreise.rki_landkreise_views import app_rki_landkreise
+from covid19.blueprints.rki.rki_vaccination.rki_vaccination_views import app_rki_vaccination
 from covid19.blueprints.who.who_views import app_who
 from covid19.blueprints.owid.owid_views import app_owid
 
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_model_import.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_model_import.py
index 86bb1b2a1437aecfae63725b4f9c53626c12fe01..94fb7597c7b86c519eee7041261ad1ac31f81424 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_model_import.py
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_model_import.py
@@ -1,7 +1,6 @@
 from database import db, ITEMS_PER_PAGE
 
 
-# TODO: #126 implement RkiBundeslaenderImport
 class RkiBundeslaenderImport(db.Model):
     __tablename__ = 'import_rki_bundeslsaender'
 
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service.py
index 0a0bda951d162c2675009dc76ab8fa6b6aa775cf..021f75888f5855567f558982e5c2e2e52d9a600d 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service.py
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service.py
@@ -3,8 +3,8 @@ from flask import flash
 from database import app
 from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.application.application_service_download import ApplicationServiceDownload
-from covid19.blueprints.rki_bundeslaender.rki_bundeslaender_service_import import RkiBundeslaenderServiceImport
-from covid19.blueprints.rki_bundeslaender.rki_bundeslaender_service_update import RkiBundeslaenderServiceUpdate
+from covid19.blueprints.rki.rki_bundeslaender.rki_bundeslaender_service_import import RkiBundeslaenderServiceImport
+from covid19.blueprints.rki.rki_bundeslaender.rki_bundeslaender_service_update import RkiBundeslaenderServiceUpdate
 
 
 class RkiBundeslaenderService:
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service_import.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service_import.py
index dc281a2cbef5769a8fb17ae263af6c5760e88d1e..972008bd5aa252fae308139db10de8ee93f6a079 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service_import.py
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service_import.py
@@ -3,7 +3,7 @@ import psycopg2
 
 from database import db, app
 from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
-from covid19.blueprints.rki_bundeslaender.rki_bundeslaender_model_import import RkiBundeslaenderImport
+from covid19.blueprints.rki.rki_bundeslaender.rki_bundeslaender_model_import import RkiBundeslaenderImport
 
 
 class RkiBundeslaenderServiceImport:
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service_update.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service_update.py
index a7a1beab5f729ec871f56ec5093cbb1094060552..59c41e48ce455e4b6d034581f8c8ae0b1acdbbbf 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service_update.py
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service_update.py
@@ -2,8 +2,8 @@ from database import db, app
 
 from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.application.application_model import RkiDateReported
-from covid19.blueprints.rki_bundeslaender.rki_bundeslaender_model import RkiBundeslaender
-from covid19.blueprints.rki_bundeslaender.rki_bundeslaender_model_import import RkiBundeslaenderImport
+from covid19.blueprints.rki.rki_bundeslaender.rki_bundeslaender_model import RkiBundeslaender
+from covid19.blueprints.rki.rki_bundeslaender.rki_bundeslaender_model_import import RkiBundeslaenderImport
 
 
 class RkiBundeslaenderServiceUpdate:
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_views.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_views.py
index 122343ed8fa2b81efc6cbb0aa8b6584b9de2e018..32a48cea635c40b4e52acb77f6c8dd3d844a6724 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_views.py
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_views.py
@@ -6,8 +6,8 @@ from celery import states
 from database import app, admin, db
 from covid19.blueprints.application.application_workers import celery
 from covid19.blueprints.application.application_services import rki_service_bundeslaender
-from covid19.blueprints.rki_bundeslaender.rki_bundeslaender_model import RkiBundeslaender
-from covid19.blueprints.rki_bundeslaender.rki_bundeslaender_model_import import RkiBundeslaenderImport
+from covid19.blueprints.rki.rki_bundeslaender.rki_bundeslaender_model import RkiBundeslaender
+from covid19.blueprints.rki.rki_bundeslaender.rki_bundeslaender_model_import import RkiBundeslaenderImport
 from covid19.blueprints.application.application_model_transient import ApplicationPage
 
 drop_and_create_data_again = True
diff --git a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service.py b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service.py
index d1e1d19d3a6468744c86b2c2da098647a3399888..5e37deb6ef5a7ee76a8978b75b898a94e8a65b26 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service.py
+++ b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service.py
@@ -3,8 +3,8 @@ from flask import flash
 from database import app
 from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.application.application_service_download import ApplicationServiceDownload
-from covid19.blueprints.rki_landkreise.rki_landkreise_service_import import RkiLandkreiseServiceImport
-from covid19.blueprints.rki_landkreise.rki_landkreise_service_update import RkiLandkreiseServiceUpdate
+from covid19.blueprints.rki.rki_landkreise.rki_landkreise_service_import import RkiLandkreiseServiceImport
+from covid19.blueprints.rki.rki_landkreise.rki_landkreise_service_update import RkiLandkreiseServiceUpdate
 
 
 class RkiLandkreiseService:
diff --git a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py
index cdfc9e487d4c548739d8c04d107293b10bb43279..c6cbf8765b5e3164a89880dd364c97a22e7f98c7 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py
+++ b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py
@@ -5,7 +5,7 @@ import psycopg2
 from database import db, app
 
 from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
-from covid19.blueprints.rki_landkreise.rki_landkreise_model_import import RkiLandkreiseImport
+from covid19.blueprints.rki.rki_landkreise.rki_landkreise_model_import import RkiLandkreiseImport
 
 
 class RkiLandkreiseServiceImport:
diff --git a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_update.py b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_update.py
index 2a4ff6476bb0ed0e9d718310ca4fd125b404331a..61056413b88b7cd2a6eda9f6ddcd815b856aa80c 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_update.py
+++ b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_update.py
@@ -2,8 +2,8 @@ from database import db, app
 
 from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.application.application_model import RkiDateReported
-from covid19.blueprints.rki_landkreise.rki_landkreise_model import RkiLandkreise
-from covid19.blueprints.rki_landkreise.rki_landkreise_model_import import RkiLandkreiseImport
+from covid19.blueprints.rki.rki_landkreise.rki_landkreise_model import RkiLandkreise
+from covid19.blueprints.rki.rki_landkreise.rki_landkreise_model_import import RkiLandkreiseImport
 
 
 class RkiLandkreiseServiceUpdate:
diff --git a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py
index e3f82657d2be920cf4f880e994aaf99881d6ca87..dfcf6b68500b2554a20c53cbe213b86820f05ed0 100644
--- a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py
+++ b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py
@@ -8,8 +8,8 @@ from database import app, admin, db
 from covid19.blueprints.application.application_workers import celery
 from covid19.blueprints.application.application_services import rki_service_landkreise
 from covid19.blueprints.application.application_model import RkiDateReported
-from covid19.blueprints.rki_landkreise.rki_landkreise_model import RkiLandkreise
-from covid19.blueprints.rki_landkreise.rki_landkreise_model_import import RkiLandkreiseImport
+from covid19.blueprints.rki.rki_landkreise.rki_landkreise_model import RkiLandkreise
+from covid19.blueprints.rki.rki_landkreise.rki_landkreise_model_import import RkiLandkreiseImport
 from covid19.blueprints.application.application_model_transient import ApplicationPage
 
 drop_and_create_data_again = True
diff --git a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service.py b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service.py
index 0a4e119b9bc63d9c1848b467e6f8e6dec30ab14b..e300f9ffb9f1af62624116f2792613446388e9d3 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service.py
+++ b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service.py
@@ -3,8 +3,8 @@ from flask import flash
 from database import app
 from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
 from covid19.blueprints.application.application_service_download import ApplicationServiceDownload
-from covid19.blueprints.rki_vaccination.rki_vaccination_service_import import RkiVaccinationServiceImport
-from covid19.blueprints.rki_vaccination.rki_vaccination_service_update import RkiVaccinationServiceUpdate
+from covid19.blueprints.rki.rki_vaccination.rki_vaccination_service_import import RkiVaccinationServiceImport
+from covid19.blueprints.rki.rki_vaccination.rki_vaccination_service_update import RkiVaccinationServiceUpdate
 
 
 class RkiVaccinationService:
diff --git a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py
index 5b213f2c94374b86116c35718823b400b0b60b1f..66afbb2cf7a7a79bda57827d07798b437d3304b4 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py
@@ -3,7 +3,7 @@ import csv
 import psycopg2
 
 from database import db, app
-from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
+from covid19.blueprints.rki.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
 from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
 
 
diff --git a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_update.py b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_update.py
index 1280a5054197cb907c5106b7bf517c75a0eb70a0..7bcf0bec0ca22d0e3a21e1b86a232d5b667d9a50 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_update.py
+++ b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_update.py
@@ -1,8 +1,8 @@
 from database import db, app
 
 from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
-from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
-from covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationDateReported, RkiVaccinationData
+from covid19.blueprints.rki.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
+from covid19.blueprints.rki.rki_vaccination.rki_vaccination_model import RkiVaccinationDateReported, RkiVaccinationData
 
 
 class RkiVaccinationServiceUpdate:
diff --git a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
index 749d4e57560cf938e7e2346b09797fb22f5a0c54..c93b94cc8081f8885e0a31f52d8af3bd77a2e2be 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
+++ b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py
@@ -7,8 +7,8 @@ from database import app, admin, db
 from covid19.blueprints.application.application_services import rki_vaccination_service
 from covid19.blueprints.application.application_workers import celery
 
-from covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationData, RkiVaccinationDateReported
-from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
+from covid19.blueprints.rki.rki_vaccination.rki_vaccination_model import RkiVaccinationData, RkiVaccinationDateReported
+from covid19.blueprints.rki.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
 from covid19.blueprints.application.application_model_transient import ApplicationPage