diff --git a/images/generated/TI-M_Basis/UC_org_admin.png b/images/generated/TI-M_Basis/UC_org_admin.png
deleted file mode 100644
index d6889937..00000000
Binary files a/images/generated/TI-M_Basis/UC_org_admin.png and /dev/null differ
diff --git a/images/generated/TI-M_Basis/UC_org_admin.svg b/images/generated/TI-M_Basis/UC_org_admin.svg
deleted file mode 100644
index 70be4e31..00000000
--- a/images/generated/TI-M_Basis/UC_org_admin.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="444px" preserveAspectRatio="none" style="width:1402px;height:444px;background:#FFFFFF;" version="1.1" viewBox="0 0 1402 444" width="1402px" zoomAndPan="magnify"><defs/><g><!--cluster Rolle--><g id="cluster_Rolle"><path d="M190,106 L268,106 A7.5,7.5 0 0 1 273,111 L287,150.5938 L350,150.5938 A5,5 0 0 1 355,155.5938 L355,323 A5,5 0 0 1 350,328 L190,328 A5,5 0 0 1 185,323 L185,111 A5,5 0 0 1 190,106 " fill="none" style="stroke:#000000;stroke-width:3.0;"/><line style="stroke:#000000;stroke-width:3.0;" x1="185" x2="287" y1="150.5938" y2="150.5938"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="76" x="193" y="135.9902">Rolle</text></g><!--cluster Anwendungsf?lle--><g id="cluster_Anwendungsf&#228;lle"><path d="M589,8 L865,8 A7.5,7.5 0 0 1 870,13 L884,52.5938 L1383,52.5938 A5,5 0 0 1 1388,57.5938 L1388,425 A5,5 0 0 1 1383,430 L589,430 A5,5 0 0 1 584,425 L584,13 A5,5 0 0 1 589,8 " fill="none" style="stroke:#000000;stroke-width:3.0;"/><line style="stroke:#000000;stroke-width:3.0;" x1="584" x2="884" y1="52.5938" y2="52.5938"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="274" x="592" y="37.9902">Anwendungsf&#228;lle</text></g><g id="elem_GMN9"><path d="M12,348 L12,428.5313 A0,0 0 0 0 12,428.5313 L528,428.5313 A0,0 0 0 0 528,428.5313 L528,368 L508,348 L278,348 L270,312.7422 L262,348 L12,348 A0,0 0 0 0 12,348 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/><path d="M508,348 L508,368 L528,368 L508,348 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="26" lengthAdjust="spacing" textLength="474" x="24" y="382.1338">z. B. Beauftragter Mitarbeiter in einer</text><text fill="#000000" font-family="sans-serif" font-size="26" lengthAdjust="spacing" textLength="162" x="24" y="412.3994">Organisation</text></g><!--entity oa--><g id="elem_oa"><ellipse cx="270" cy="193" fill="#DCDCDC" rx="32" ry="32" style="stroke:#000000;stroke-width:1.0;"/><path d="M270,233 C278,233 284,233 292,225 C308,225 324,241 324,257 L324,265 C324,273 316,281 308,281 L232,281 C224,281 216,273 216,265 L216,257 C216,241 232,225 248,225 C256,233 262,233 270,233 " fill="#DCDCDC" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="Aapex" font-size="26" lengthAdjust="spacing" textLength="138" x="201" y="306.1338">Org-Admin</text></g><g id="elem_UC1"><ellipse cx="985.5145" cy="137.5029" fill="#F0F8FF" rx="353.5145" ry="75.5029" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="190" x="886.5145" y="110.6025">&#171;AF_10103&#187;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="8" x="1076.5145" y="110.6025">&#160;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="462" x="750.5145" y="143.1963">Authentisieren einer Organisation</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="340" x="815.5145" y="175.79">am TI-Messenger-Dienst</text></g><g id="elem_UC2"><ellipse cx="986.0504" cy="332.0101" fill="#F0F8FF" rx="386.0504" ry="82.0101" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="190" x="887.0504" y="305.1097">&#171;AF_10060&#187;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="8" x="1077.0504" y="305.1097">&#160;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="550" x="707.0504" y="337.7034">Bereitstellung eines Messenger-Service</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="286" x="843.0504" y="370.2972">f&#252;r eine Organisation</text></g><polygon fill="#000000" points="631.744,186.4847,612.8213,181.0138,621.8374,187.8482,615.003,196.8643,631.744,186.4847" style="stroke:#000000;stroke-width:2.0;"/><path d="M339.6251,226.692 C408.3556,217.232 508.4065,203.4609 619.8561,188.1209 " fill="none" style="stroke:#000000;stroke-width:2.0;"/><polygon fill="#000000" points="599.6852,280.1823,582.9156,269.8488,589.7748,278.846,580.7776,285.7053,599.6852,280.1823" style="stroke:#000000;stroke-width:2.0;"/><path d="M339.6251,245.118 C401.7602,253.4958 487.3167,265.0315 587.7928,278.5788 " fill="none" style="stroke:#000000;stroke-width:2.0;"/></g></svg>
\ No newline at end of file
diff --git a/images/generated/TI-M_Basis/UC_user.png b/images/generated/TI-M_Basis/UC_user.png
deleted file mode 100644
index aa8e0403..00000000
Binary files a/images/generated/TI-M_Basis/UC_user.png and /dev/null differ
diff --git a/images/generated/TI-M_Basis/UC_user.svg b/images/generated/TI-M_Basis/UC_user.svg
deleted file mode 100644
index c6fbe78a..00000000
--- a/images/generated/TI-M_Basis/UC_user.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="1262px" preserveAspectRatio="none" style="width:1192px;height:1262px;background:#FFFFFF;" version="1.1" viewBox="0 0 1192 1262" width="1192px" zoomAndPan="magnify"><defs/><g><!--cluster Rolle--><g id="cluster_Rolle"><path d="M153,510 L231,510 A7.5,7.5 0 0 1 236,515 L250,554.5938 L285,554.5938 A5,5 0 0 1 290,559.5938 L290,727 A5,5 0 0 1 285,732 L153,732 A5,5 0 0 1 148,727 L148,515 A5,5 0 0 1 153,510 " fill="none" style="stroke:#000000;stroke-width:3.0;"/><line style="stroke:#000000;stroke-width:3.0;" x1="148" x2="250" y1="554.5938" y2="554.5938"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="76" x="156" y="539.9902">Rolle</text></g><!--cluster Anwendungsf?lle--><g id="cluster_Anwendungsf&#228;lle"><path d="M487,8 L763,8 A7.5,7.5 0 0 1 768,13 L782,52.5938 L1173,52.5938 A5,5 0 0 1 1178,57.5938 L1178,1243 A5,5 0 0 1 1173,1248 L487,1248 A5,5 0 0 1 482,1243 L482,13 A5,5 0 0 1 487,8 " fill="none" style="stroke:#000000;stroke-width:3.0;"/><line style="stroke:#000000;stroke-width:3.0;" x1="482" x2="782" y1="52.5938" y2="52.5938"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="274" x="490" y="37.9902">Anwendungsf&#228;lle</text></g><g id="elem_GMN17"><path d="M12,753 L12,803.2656 A0,0 0 0 0 12,803.2656 L426,803.2656 A0,0 0 0 0 426,803.2656 L426,773 L406,753 L227,753 L219,716.5764 L211,753 L12,753 A0,0 0 0 0 12,753 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/><path d="M406,753 L406,773 L426,773 L406,753 " fill="#FEFFDD" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="26" lengthAdjust="spacing" textLength="372" x="24" y="787.1338">Akteur im Gesundheitswesen</text></g><!--entity u--><g id="elem_u"><ellipse cx="219" cy="597" fill="#DCDCDC" rx="32" ry="32" style="stroke:#000000;stroke-width:1.0;"/><path d="M219,637 C227,637 233,637 241,629 C257,629 273,645 273,661 L273,669 C273,677 265,685 257,685 L181,685 C173,685 165,677 165,669 L165,661 C165,645 181,629 197,629 C205,637 211,637 219,637 " fill="#DCDCDC" style="stroke:#000000;stroke-width:1.0;"/><text fill="#000000" font-family="Aapex" font-size="26" lengthAdjust="spacing" textLength="60" x="189" y="710.1338">User</text></g><g id="elem_UC1"><ellipse cx="829.7128" cy="138.1418" fill="#F1F1F1" rx="315.7128" ry="75.1418" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="190" x="730.7128" y="111.2414">&#171;AF_10057&#187;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="8" x="920.7128" y="111.2414">&#160;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="406" x="622.7128" y="143.8351">Anmeldung eines Akteurs am</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="266" x="696.7128" y="176.4289">Messenger-Service</text></g><g id="elem_UC2"><ellipse cx="830.328" cy="324.1418" fill="#F0F8FF" rx="297.328" ry="75.1418" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="190" x="731.328" y="297.2414">&#171;AF_10104&#187;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="8" x="921.328" y="297.2414">&#160;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="328" x="662.328" y="329.8351">Einladung von Akteuren</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="388" x="636.328" y="362.4289">innerhalb einer Organisation</text></g><g id="elem_UC3"><ellipse cx="830.328" cy="534.189" fill="#F0F8FF" rx="297.328" ry="98.189" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="190" x="731.328" y="490.9918">&#171;AF_10063&#187;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="8" x="921.328" y="490.9918">&#160;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="306" x="673.328" y="523.5855">Austausch von Events</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="264" x="694.328" y="556.1793">zwischen Akteuren</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="388" x="636.328" y="588.773">innerhalb einer Organisation</text></g><g id="elem_UC4"><ellipse cx="830.3991" cy="744.1418" fill="#FFFFF0" rx="304.3991" ry="75.1418" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="190" x="731.3991" y="717.2414">&#171;AF_10061&#187;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="8" x="921.3991" y="717.2414">&#160;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="328" x="662.3991" y="749.8351">Einladung von Akteuren</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="398" x="631.3991" y="782.4289">au&#223;erhalb einer Organisation</text></g><g id="elem_UC5"><ellipse cx="830.3991" cy="954.189" fill="#FFFFF0" rx="304.3991" ry="98.189" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="190" x="731.3991" y="910.9918">&#171;AF_10062&#187;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="8" x="921.3991" y="910.9918">&#160;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="306" x="673.3991" y="943.5855">Austausch von Events</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="264" x="694.3991" y="976.1793">zwischen Akteuren</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="398" x="631.3991" y="1008.773">au&#223;erhalb einer Organisation</text></g><g id="elem_UC6"><ellipse cx="829.7036" cy="1160.1407" fill="#CD5C5C" rx="331.7036" ry="71.1407" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="28" font-weight="bold" lengthAdjust="spacing" textLength="190" x="730.7036" y="1149.5372">&#171;AF_10235&#187;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="8" x="920.7036" y="1149.5372">&#160;</text><text fill="#000000" font-family="sans-serif" font-size="28" lengthAdjust="spacing" textLength="540" x="559.7036" y="1182.1309">Eintr&#228;ge im VZD-FHIR-Directory suchen</text></g><polygon fill="#000000" points="513.58,209.682,493.9755,211.5956,504.8796,214.6119,501.8633,225.5161,513.58,209.682" style="stroke:#000000;stroke-width:2.0;"/><path d="M249.3703,563.4175 C287.779,470.4344 365.2316,315.4771 482,230 C492.031,222.6571 492.166,221.8159 503.1396,215.5979 " fill="none" style="stroke:#000000;stroke-width:2.0;"/><polygon fill="#000000" points="532.8742,394.4364,513.1855,393.8398,523.6172,398.2192,519.2379,408.6509,532.8742,394.4364" style="stroke:#000000;stroke-width:2.0;"/><path d="M274.6516,581.7147 C323.9821,531.4445 401.4836,460.436 482,418 C498.2447,409.4383 504.2317,406.1408 521.7658,398.9757 " fill="none" style="stroke:#000000;stroke-width:2.0;"/><polygon fill="#000000" points="532.7768,585.5546,513.6689,580.7704,522.9259,587.2749,516.4213,596.5318,532.7768,585.5546" style="stroke:#000000;stroke-width:2.0;"/><path d="M274.3352,630.6861 C333.4961,620.3549 421.9035,604.9164 520.9557,587.6189 " fill="none" style="stroke:#000000;stroke-width:2.0;"/><polygon fill="#000000" points="525.5099,692.173,509.1194,681.2482,515.6535,690.4843,506.4174,697.0184,525.5099,692.173" style="stroke:#000000;stroke-width:2.0;"/><path d="M274.3352,649.1382 C332.0496,659.0266 417.0204,673.585 513.6822,690.1465 " fill="none" style="stroke:#000000;stroke-width:2.0;"/><polygon fill="#000000" points="525.8912,867.1262,514.6068,850.9811,517.3273,861.9629,506.3456,864.6833,525.8912,867.1262" style="stroke:#000000;stroke-width:2.0;"/><path d="M274.3245,654.1447 C319.1691,668.2618 382.7138,693.7299 426,734 C463.8642,769.226 442.4016,802.7354 482,836 C495.6068,847.4303 500.0995,851.576 515.6145,860.9302 " fill="none" style="stroke:#000000;stroke-width:2.0;"/><polygon fill="#000000" points="501.419,1088.5654,492.7689,1070.8686,493.7573,1082.139,482.4868,1083.1273,501.419,1088.5654" style="stroke:#000000;stroke-width:2.0;"/><path d="M274.3312,649.8409 C321.7538,661.506 389.1274,685.7981 426,734 C517.9831,854.2456 379.8353,958.2759 482,1070 C488.0734,1076.6417 485.3748,1075.1081 492.2249,1080.8538 " fill="none" style="stroke:#000000;stroke-width:2.0;"/></g></svg>
\ No newline at end of file
diff --git a/src/images/TI-M_Basis/UC_org_admin.puml b/src/images/TI-M_Basis/UC_org_admin.puml
deleted file mode 100644
index ae2395e5..00000000
--- a/src/images/TI-M_Basis/UC_org_admin.puml
+++ /dev/null
@@ -1,51 +0,0 @@
-@startuml
-/'
-# TI-Messenger 1.1
-# TI-Messenger-Dienst
-# Use Case Diagram
-# Name: Org-Admin - Anwendungsfaelle
-'/
-!pragma layout smetana
-
-skinparam actorStyle awesome
-left to right direction
-scale 6/3
-
-skinparam sequence {
-ArrowColor black
-ArrowFontSize 17
-ActorBorderColor black
-LifeLineBorderColor black
-LifeLineBackgroundColor Gainsboro
-
-ParticipantBorderColor Motivation
-ParticipantBackgroundColor Motivation
-ParticipantFontName Impact
-ParticipantFontSize 20
-ParticipantFontColor black
-ParticipantBorderColor Black
-ParticipantBackgroundColor MOTIVATION
-
-ActorBackgroundColor Gainsboro
-ActorFontColor black
-ActorFontSize 13
-ActorFontName Aapex
-}
-
-package Rolle {
-  actor "Org-Admin" as oa
-}
-
-package Anwendungsfälle {
-  usecase "**<<AF_10103>>** \nAuthentisieren einer Organisation \nam TI-Messenger-Dienst" as UC1 #AliceBlue
-  usecase "**<<AF_10060>>** \nBereitstellung eines Messenger-Service \nfür eine Organisation" as UC2 #AliceBlue
-}
-
-oa --> UC1
-oa --> UC2
-
-note top of (oa)
-  z. B. Beauftragter Mitarbeiter in einer
-  Organisation
-end note
-@enduml
diff --git a/src/images/TI-M_Basis/UC_user.puml b/src/images/TI-M_Basis/UC_user.puml
deleted file mode 100644
index 318d5f3f..00000000
--- a/src/images/TI-M_Basis/UC_user.puml
+++ /dev/null
@@ -1,59 +0,0 @@
-/' 
-# TI-Messenger 1.1
-# TI-Messenger-Dienst
-# Use Case Diagram
-# Name: User / User-HBA - Anwendungsfaelle
-'/
-
-@startuml
-!pragma layout smetana
-skinparam actorStyle awesome
-left to right direction
-scale 6/3
-
-skinparam sequence {
-ArrowColor black
-ArrowFontSize 17
-ActorBorderColor black
-LifeLineBorderColor black
-LifeLineBackgroundColor Gainsboro
-
-ParticipantBorderColor Motivation
-ParticipantBackgroundColor Motivation
-ParticipantFontName Impact
-ParticipantFontSize 20
-ParticipantFontColor black
-ParticipantBorderColor Black
-ParticipantBackgroundColor MOTIVATION
-
-ActorBackgroundColor Gainsboro
-ActorFontColor black
-ActorFontSize 13
-ActorFontName Aapex
-}
-
-package Rolle {
-actor "User" as u
-}
-
-package Anwendungsfälle {
-usecase "**<<AF_10057>>** \nAnmeldung eines Akteurs am \nMessenger-Service" as UC1
-usecase "**<<AF_10104>>** \nEinladung von Akteuren \ninnerhalb einer Organisation" as UC2 #AliceBlue
-usecase "**<<AF_10063>>** \nAustausch von Events \nzwischen Akteuren \ninnerhalb einer Organisation" as UC3 #AliceBlue
-usecase "**<<AF_10061>>** \nEinladung von Akteuren \naußerhalb einer Organisation" as UC4 #Ivory
-usecase "**<<AF_10062>>** \nAustausch von Events \nzwischen Akteuren \naußerhalb einer Organisation" as UC5 #Ivory
-usecase "**<<AF_10235>>** \nEinträge im VZD-FHIR-Directory suchen" as UC6 #IndianRed
-}
-
-u --> UC1
-u --> UC2
-u --> UC3
-u --> UC4
-u --> UC5
-u --> UC6
-
-note bottom of (u)
-Akteur im Gesundheitswesen
-end note
-
-@enduml