diff --git "a/src/drawio/DD_Feature_Information_\303\274ber_neue_Nachricht.drawio" "b/src/drawio/DD_Feature_Information_\303\274ber_neue_Nachricht.drawio"
deleted file mode 100644
index 5c370f12..00000000
--- "a/src/drawio/DD_Feature_Information_\303\274ber_neue_Nachricht.drawio"
+++ /dev/null
@@ -1,120 +0,0 @@
-<mxfile host="app.diagrams.net" modified="2023-10-19T14:37:42.949Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36" etag="RJmwLdwO40rzE1k3zBH-" version="22.0.4" type="device">
-  <diagram name="Seite-1" id="gc1YbI-Wx7_Q_iwZn_eA">
-    <mxGraphModel dx="989" dy="523" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="ejHJoWQ4-AMJ1VvW92XO-1" value="Device" style="rounded=0;whiteSpace=wrap;html=1;verticalAlign=top;strokeColor=#000000;strokeWidth=2;align=left;" parent="1" vertex="1">
-          <mxGeometry x="240" y="120" width="200" height="160" as="geometry" />
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-1" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="yt_74iejyjVCjCeiJqDR-1" target="ejHJoWQ4-AMJ1VvW92XO-16">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="460" y="200" />
-              <mxPoint x="460" y="80" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-3" value="(1)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="tb5CzWaAFQT677PR1t4r-1">
-          <mxGeometry x="0.0313" y="-1" relative="1" as="geometry">
-            <mxPoint x="9" y="35" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-5" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="yt_74iejyjVCjCeiJqDR-1" target="yt_74iejyjVCjCeiJqDR-2">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-7" value="(2.1)&lt;br&gt;(6.1)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="tb5CzWaAFQT677PR1t4r-5">
-          <mxGeometry x="0.54" y="-2" relative="1" as="geometry">
-            <mxPoint x="16" y="18" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-6" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="yt_74iejyjVCjCeiJqDR-1" target="ejHJoWQ4-AMJ1VvW92XO-6">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="460" y="200" />
-              <mxPoint x="460" y="320" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-8" value="(2.2)&lt;br&gt;(6.2)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="tb5CzWaAFQT677PR1t4r-6">
-          <mxGeometry x="0.6313" relative="1" as="geometry">
-            <mxPoint x="29" y="20" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="yt_74iejyjVCjCeiJqDR-1" value="FdV App&lt;br&gt;(ePA und TI-M)" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=#000000;strokeWidth=2;" parent="1" vertex="1">
-          <mxGeometry x="280" y="160" width="120" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-11" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="yt_74iejyjVCjCeiJqDR-2" target="ejHJoWQ4-AMJ1VvW92XO-16">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="760" y="200" />
-              <mxPoint x="760" y="80" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="1" source="yt_74iejyjVCjCeiJqDR-2">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="400" y="200" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-20" value="(7)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="tb5CzWaAFQT677PR1t4r-19">
-          <mxGeometry x="0.0715" y="1" relative="1" as="geometry">
-            <mxPoint x="-3" y="9" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="yt_74iejyjVCjCeiJqDR-2" value="ePA Fachdienst" style="rounded=0;whiteSpace=wrap;html=1;strokeColor=#000000;strokeWidth=2;" parent="1" vertex="1">
-          <mxGeometry x="600" y="160" width="120" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="ejHJoWQ4-AMJ1VvW92XO-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;strokeColor=#030303;" parent="1" source="yt_74iejyjVCjCeiJqDR-3" target="yt_74iejyjVCjCeiJqDR-1" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-18" value="(0)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="ejHJoWQ4-AMJ1VvW92XO-13">
-          <mxGeometry x="0.016" relative="1" as="geometry">
-            <mxPoint x="-16" y="10" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="yt_74iejyjVCjCeiJqDR-3" value="Versicherte" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;strokeWidth=2;" parent="1" vertex="1">
-          <mxGeometry x="160" y="170" width="30" height="60" as="geometry" />
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-10" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="ejHJoWQ4-AMJ1VvW92XO-6" target="ejHJoWQ4-AMJ1VvW92XO-16">
-          <mxGeometry relative="1" as="geometry">
-            <Array as="points">
-              <mxPoint x="760" y="320" />
-              <mxPoint x="760" y="80" />
-            </Array>
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-12" value="(3)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="tb5CzWaAFQT677PR1t4r-10">
-          <mxGeometry x="0.3875" y="2" relative="1" as="geometry">
-            <mxPoint x="12" y="2" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="ejHJoWQ4-AMJ1VvW92XO-6" value="TI-Messenger Fachdienst&lt;br&gt;(für Versicherte)" style="rounded=0;whiteSpace=wrap;html=1;verticalAlign=middle;strokeWidth=2;strokeColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="600" y="280" width="120" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-2" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="ejHJoWQ4-AMJ1VvW92XO-16" target="ejHJoWQ4-AMJ1VvW92XO-1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-4" value="(4)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="tb5CzWaAFQT677PR1t4r-2">
-          <mxGeometry x="0.0353" y="-1" relative="1" as="geometry">
-            <mxPoint x="-45" y="11" as="offset" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="ejHJoWQ4-AMJ1VvW92XO-16" value="Externer Push Dienst&lt;br&gt;(z. B. FCM)" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=2;strokeColor=#000000;" parent="1" vertex="1">
-          <mxGeometry x="600" y="40" width="120" height="80" as="geometry" />
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-16" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="ejHJoWQ4-AMJ1VvW92XO-1" target="yt_74iejyjVCjCeiJqDR-1">
-          <mxGeometry width="50" height="50" relative="1" as="geometry">
-            <mxPoint x="290" y="90" as="sourcePoint" />
-            <mxPoint x="340" y="40" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="tb5CzWaAFQT677PR1t4r-17" value="(5)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="tb5CzWaAFQT677PR1t4r-16">
-          <mxGeometry x="-0.09" relative="1" as="geometry">
-            <mxPoint x="10" as="offset" />
-          </mxGeometry>
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>
diff --git a/src/drawio/TI-Messenger-Fachdienst/Berechtigung_Messenger_Proxy_fdv.drawio b/src/drawio/ePA_FDV/Berechtigung_Messenger_Proxy_fdv.drawio
similarity index 100%
rename from src/drawio/TI-Messenger-Fachdienst/Berechtigung_Messenger_Proxy_fdv.drawio
rename to src/drawio/ePA_FDV/Berechtigung_Messenger_Proxy_fdv.drawio
diff --git a/src/drawio/TI-Messenger-Fachdienst/Berechtigung_fdv.drawio b/src/drawio/ePA_FDV/Berechtigung_fdv.drawio
similarity index 100%
rename from src/drawio/TI-Messenger-Fachdienst/Berechtigung_fdv.drawio
rename to src/drawio/ePA_FDV/Berechtigung_fdv.drawio
diff --git a/src/drawio/TI-Messenger-Fachdienst/Komponentendiagramm_fdv.drawio b/src/drawio/ePA_FDV/Komponentendiagramm_fdv.drawio
similarity index 100%
rename from src/drawio/TI-Messenger-Fachdienst/Komponentendiagramm_fdv.drawio
rename to src/drawio/ePA_FDV/Komponentendiagramm_fdv.drawio
diff --git a/src/drawio/TI-Messenger-Fachdienst/Push_Komponeten_fdv.drawio b/src/drawio/ePA_FDV/Push_Komponeten_fdv.drawio
similarity index 100%
rename from src/drawio/TI-Messenger-Fachdienst/Push_Komponeten_fdv.drawio
rename to src/drawio/ePA_FDV/Push_Komponeten_fdv.drawio
diff --git a/src/drawio/TI-M_Kontextabgrenzung_fdv.drawio b/src/drawio/ePA_FDV/TI-M_Kontextabgrenzung_fdv.drawio
similarity index 100%
rename from src/drawio/TI-M_Kontextabgrenzung_fdv.drawio
rename to src/drawio/ePA_FDV/TI-M_Kontextabgrenzung_fdv.drawio
diff --git "a/src/drawio/TI-Messenger_2.0_f\303\274r_Versicherte_Verteilungssicht.drawio" "b/src/drawio/ePA_FDV/TI-Messenger_2.0_f\303\274r_Versicherte_Verteilungssicht.drawio"
similarity index 100%
rename from "src/drawio/TI-Messenger_2.0_f\303\274r_Versicherte_Verteilungssicht.drawio"
rename to "src/drawio/ePA_FDV/TI-Messenger_2.0_f\303\274r_Versicherte_Verteilungssicht.drawio"
diff --git a/src/plantuml/TI-Messenger-Client/Berechtigungen_setzen.puml b/src/plantuml/ePA_FDV/Berechtigungen_setzen.puml
similarity index 100%
rename from src/plantuml/TI-Messenger-Client/Berechtigungen_setzen.puml
rename to src/plantuml/ePA_FDV/Berechtigungen_setzen.puml
diff --git a/src/plantuml/TI-Messenger-Dienst/Ressourcen/TI-Messenger_OIDC_login.puml b/src/plantuml/ePA_FDV/TI-Messenger_OIDC_login_fdv.puml
similarity index 100%
rename from src/plantuml/TI-Messenger-Dienst/Ressourcen/TI-Messenger_OIDC_login.puml
rename to src/plantuml/ePA_FDV/TI-Messenger_OIDC_login_fdv.puml
diff --git a/src/plantuml/TI-Messenger-Dienst/Ressourcen/UC_10104_Seq_fdv.puml b/src/plantuml/ePA_FDV/UC_10104_Seq_fdv.puml
similarity index 100%
rename from src/plantuml/TI-Messenger-Dienst/Ressourcen/UC_10104_Seq_fdv.puml
rename to src/plantuml/ePA_FDV/UC_10104_Seq_fdv.puml
diff --git a/src/plantuml/TI-Messenger-Dienst/Ressourcen/UC_Approvel_List_Seq_fdv.puml b/src/plantuml/ePA_FDV/UC_Approvel_List_Seq_fdv.puml
similarity index 100%
rename from src/plantuml/TI-Messenger-Dienst/Ressourcen/UC_Approvel_List_Seq_fdv.puml
rename to src/plantuml/ePA_FDV/UC_Approvel_List_Seq_fdv.puml
diff --git a/src/plantuml/TI-Messenger-Dienst/Ressourcen/push_notifications_fdv.puml b/src/plantuml/ePA_FDV/push_notifications_fdv.puml
similarity index 100%
rename from src/plantuml/TI-Messenger-Dienst/Ressourcen/push_notifications_fdv.puml
rename to src/plantuml/ePA_FDV/push_notifications_fdv.puml