diff --git a/data b/data
index c5f31744c9a130e983bc232707307c586f02178f..351c36868826eb35d792cdb95d48ba9b788f0e94 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit c5f31744c9a130e983bc232707307c586f02178f
+Subproject commit 351c36868826eb35d792cdb95d48ba9b788f0e94
diff --git a/docs/blueprints/rki_cases/uml/.gitignore b/docs/blueprints/divi/uml/.gitignore
similarity index 100%
rename from docs/blueprints/rki_cases/uml/.gitignore
rename to docs/blueprints/divi/uml/.gitignore
diff --git a/docs/blueprints/rki_cases/uml/impl/.gitignore b/docs/blueprints/divi/uml/impl/.gitignore
similarity index 100%
rename from docs/blueprints/rki_cases/uml/impl/.gitignore
rename to docs/blueprints/divi/uml/impl/.gitignore
diff --git a/docs/blueprints/intensivregister/uml_implementation/intensivregister_domain_model.txt b/docs/blueprints/divi/uml/impl/intensivregister_domain_model.puml
similarity index 100%
rename from docs/blueprints/intensivregister/uml_implementation/intensivregister_domain_model.txt
rename to docs/blueprints/divi/uml/impl/intensivregister_domain_model.puml
diff --git a/docs/blueprints/intensivregister/uml_implementation/intensivregister_use_cases.txt b/docs/blueprints/divi/uml/impl/intensivregister_use_cases.puml
similarity index 100%
rename from docs/blueprints/intensivregister/uml_implementation/intensivregister_use_cases.txt
rename to docs/blueprints/divi/uml/impl/intensivregister_use_cases.puml
diff --git a/docs/blueprints/intensivregister/uml_requirements/intensivregister_domain_model.txt b/docs/blueprints/divi/uml/intensivregister_domain_model.puml
similarity index 100%
rename from docs/blueprints/intensivregister/uml_requirements/intensivregister_domain_model.txt
rename to docs/blueprints/divi/uml/intensivregister_domain_model.puml
diff --git a/docs/blueprints/intensivregister/uml_requirements/intensivregister_use_cases.txt b/docs/blueprints/divi/uml/intensivregister_use_cases.puml
similarity index 100%
rename from docs/blueprints/intensivregister/uml_requirements/intensivregister_use_cases.txt
rename to docs/blueprints/divi/uml/intensivregister_use_cases.puml
diff --git a/docs/blueprints/rki_vaccination/uml/.gitignore b/docs/blueprints/rki/uml/.gitignore
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/.gitignore
rename to docs/blueprints/rki/uml/.gitignore
diff --git a/docs/blueprints/rki_cases/uml/img/rki_cases_domain_model.png b/docs/blueprints/rki/uml/img/rki_cases_domain_model.png
similarity index 100%
rename from docs/blueprints/rki_cases/uml/img/rki_cases_domain_model.png
rename to docs/blueprints/rki/uml/img/rki_cases_domain_model.png
diff --git a/docs/blueprints/rki_cases/uml/img/rki_cases_domain_model_import.png b/docs/blueprints/rki/uml/img/rki_cases_domain_model_import.png
similarity index 100%
rename from docs/blueprints/rki_cases/uml/img/rki_cases_domain_model_import.png
rename to docs/blueprints/rki/uml/img/rki_cases_domain_model_import.png
diff --git a/docs/blueprints/rki_cases/uml/img/rki_cases_use_cases.png b/docs/blueprints/rki/uml/img/rki_cases_use_cases.png
similarity index 100%
rename from docs/blueprints/rki_cases/uml/img/rki_cases_use_cases.png
rename to docs/blueprints/rki/uml/img/rki_cases_use_cases.png
diff --git a/docs/blueprints/rki_vaccination/uml/impl/.gitignore b/docs/blueprints/rki/uml/impl/.gitignore
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/impl/.gitignore
rename to docs/blueprints/rki/uml/impl/.gitignore
diff --git a/docs/blueprints/rki_cases/uml/impl/img/rki_cases_domain_model_impl.png b/docs/blueprints/rki/uml/impl/img/rki_cases_domain_model_impl.png
similarity index 100%
rename from docs/blueprints/rki_cases/uml/impl/img/rki_cases_domain_model_impl.png
rename to docs/blueprints/rki/uml/impl/img/rki_cases_domain_model_impl.png
diff --git a/docs/blueprints/rki_cases/uml/impl/img/rki_cases_use_cases_impl.png b/docs/blueprints/rki/uml/impl/img/rki_cases_use_cases_impl.png
similarity index 100%
rename from docs/blueprints/rki_cases/uml/impl/img/rki_cases_use_cases_impl.png
rename to docs/blueprints/rki/uml/impl/img/rki_cases_use_cases_impl.png
diff --git a/docs/blueprints/rki_cases/uml/impl/rki_cases_domain_model_impl.puml b/docs/blueprints/rki/uml/impl/rki_cases_domain_model_impl.puml
similarity index 100%
rename from docs/blueprints/rki_cases/uml/impl/rki_cases_domain_model_impl.puml
rename to docs/blueprints/rki/uml/impl/rki_cases_domain_model_impl.puml
diff --git a/docs/blueprints/rki_cases/uml/impl/rki_cases_service_impl.puml b/docs/blueprints/rki/uml/impl/rki_cases_service_impl.puml
similarity index 100%
rename from docs/blueprints/rki_cases/uml/impl/rki_cases_service_impl.puml
rename to docs/blueprints/rki/uml/impl/rki_cases_service_impl.puml
diff --git a/docs/blueprints/rki_cases/uml/impl/rki_cases_use_cases_impl.puml b/docs/blueprints/rki/uml/impl/rki_cases_use_cases_impl.puml
similarity index 100%
rename from docs/blueprints/rki_cases/uml/impl/rki_cases_use_cases_impl.puml
rename to docs/blueprints/rki/uml/impl/rki_cases_use_cases_impl.puml
diff --git a/docs/blueprints/rki_cases/uml/rki_cases_domain_model.puml b/docs/blueprints/rki/uml/rki_cases_domain_model.puml
similarity index 100%
rename from docs/blueprints/rki_cases/uml/rki_cases_domain_model.puml
rename to docs/blueprints/rki/uml/rki_cases_domain_model.puml
diff --git a/docs/blueprints/rki_cases/uml/rki_cases_domain_model_import.puml b/docs/blueprints/rki/uml/rki_cases_domain_model_import.puml
similarity index 100%
rename from docs/blueprints/rki_cases/uml/rki_cases_domain_model_import.puml
rename to docs/blueprints/rki/uml/rki_cases_domain_model_import.puml
diff --git a/docs/blueprints/rki_cases/uml/rki_cases_domain_model_star_schema.puml b/docs/blueprints/rki/uml/rki_cases_domain_model_star_schema.puml
similarity index 100%
rename from docs/blueprints/rki_cases/uml/rki_cases_domain_model_star_schema.puml
rename to docs/blueprints/rki/uml/rki_cases_domain_model_star_schema.puml
diff --git a/docs/blueprints/rki_cases/uml/rki_cases_use_cases.puml b/docs/blueprints/rki/uml/rki_cases_use_cases.puml
similarity index 100%
rename from docs/blueprints/rki_cases/uml/rki_cases_use_cases.puml
rename to docs/blueprints/rki/uml/rki_cases_use_cases.puml
diff --git a/docs/blueprints/vaccination/uml/.gitignore b/docs/blueprints/vaccination/uml/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b44ef384e2d834c8a456302f2f70af9320b0df87
--- /dev/null
+++ b/docs/blueprints/vaccination/uml/.gitignore
@@ -0,0 +1 @@
+/*.png
diff --git a/docs/blueprints/rki_vaccination/uml/img/rki_vaccination_domain_model.png b/docs/blueprints/vaccination/uml/img/rki_vaccination_domain_model.png
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/img/rki_vaccination_domain_model.png
rename to docs/blueprints/vaccination/uml/img/rki_vaccination_domain_model.png
diff --git a/docs/blueprints/rki_vaccination/uml/img/rki_vaccination_domain_model_import.png b/docs/blueprints/vaccination/uml/img/rki_vaccination_domain_model_import.png
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/img/rki_vaccination_domain_model_import.png
rename to docs/blueprints/vaccination/uml/img/rki_vaccination_domain_model_import.png
diff --git a/docs/blueprints/rki_vaccination/uml/img/rki_vaccination_use_cases.png b/docs/blueprints/vaccination/uml/img/rki_vaccination_use_cases.png
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/img/rki_vaccination_use_cases.png
rename to docs/blueprints/vaccination/uml/img/rki_vaccination_use_cases.png
diff --git a/docs/blueprints/vaccination/uml/impl/.gitignore b/docs/blueprints/vaccination/uml/impl/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b44ef384e2d834c8a456302f2f70af9320b0df87
--- /dev/null
+++ b/docs/blueprints/vaccination/uml/impl/.gitignore
@@ -0,0 +1 @@
+/*.png
diff --git a/docs/blueprints/rki_vaccination/uml/impl/img/rki_vaccination_domain_model_impl.png b/docs/blueprints/vaccination/uml/impl/img/rki_vaccination_domain_model_impl.png
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/impl/img/rki_vaccination_domain_model_impl.png
rename to docs/blueprints/vaccination/uml/impl/img/rki_vaccination_domain_model_impl.png
diff --git a/docs/blueprints/rki_vaccination/uml/impl/rki_vaccination_domain_model_impl.puml b/docs/blueprints/vaccination/uml/impl/rki_vaccination_domain_model_impl.puml
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/impl/rki_vaccination_domain_model_impl.puml
rename to docs/blueprints/vaccination/uml/impl/rki_vaccination_domain_model_impl.puml
diff --git a/docs/blueprints/rki_vaccination/uml/impl/rki_vaccination_service_impl.puml b/docs/blueprints/vaccination/uml/impl/rki_vaccination_service_impl.puml
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/impl/rki_vaccination_service_impl.puml
rename to docs/blueprints/vaccination/uml/impl/rki_vaccination_service_impl.puml
diff --git a/docs/blueprints/rki_vaccination/uml/impl/rki_vaccination_use_cases_impl.puml b/docs/blueprints/vaccination/uml/impl/rki_vaccination_use_cases_impl.puml
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/impl/rki_vaccination_use_cases_impl.puml
rename to docs/blueprints/vaccination/uml/impl/rki_vaccination_use_cases_impl.puml
diff --git a/docs/blueprints/rki_vaccination/uml/rki_vaccination_domain_model.puml b/docs/blueprints/vaccination/uml/rki_vaccination_domain_model.puml
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/rki_vaccination_domain_model.puml
rename to docs/blueprints/vaccination/uml/rki_vaccination_domain_model.puml
diff --git a/docs/blueprints/rki_vaccination/uml/rki_vaccination_domain_model_import.puml b/docs/blueprints/vaccination/uml/rki_vaccination_domain_model_import.puml
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/rki_vaccination_domain_model_import.puml
rename to docs/blueprints/vaccination/uml/rki_vaccination_domain_model_import.puml
diff --git a/docs/blueprints/rki_vaccination/uml/rki_vaccination_domain_model_star_schema.puml b/docs/blueprints/vaccination/uml/rki_vaccination_domain_model_star_schema.puml
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/rki_vaccination_domain_model_star_schema.puml
rename to docs/blueprints/vaccination/uml/rki_vaccination_domain_model_star_schema.puml
diff --git a/docs/blueprints/rki_vaccination/uml/rki_vaccination_use_cases.puml b/docs/blueprints/vaccination/uml/rki_vaccination_use_cases.puml
similarity index 100%
rename from docs/blueprints/rki_vaccination/uml/rki_vaccination_use_cases.puml
rename to docs/blueprints/vaccination/uml/rki_vaccination_use_cases.puml