diff --git a/package-lock.json b/package-lock.json
index e1a52c42b..b26208e98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11539,6 +11539,10 @@
         "packages/runtime-types": {
             "name": "@nmshd/runtime-types",
             "license": "AGPL-3.0-or-later",
+            "dependencies": {
+                "@js-soft/ts-utils": "2.3.5",
+                "@nmshd/content": "*"
+            },
             "devDependencies": {}
         },
         "packages/runtime/node_modules/ajv": {
diff --git a/packages/runtime-types/package.json b/packages/runtime-types/package.json
index 3e175c24a..bc7e81faa 100644
--- a/packages/runtime-types/package.json
+++ b/packages/runtime-types/package.json
@@ -20,7 +20,10 @@
         "cdep": "tsc && madge --circular dist",
         "lint:tsc": "tsc --noEmit"
     },
-    "dependencies": {},
+    "dependencies": {
+        "@js-soft/ts-utils": "2.3.5",
+        "@nmshd/content": "*"
+    },
     "devDependencies": {},
     "publishConfig": {
         "access": "public",
diff --git a/packages/runtime-types/src/consumption/AttributeTagCollectionDTO.ts b/packages/runtime-types/src/dtos/consumption/AttributeTagCollectionDTO.ts
similarity index 100%
rename from packages/runtime-types/src/consumption/AttributeTagCollectionDTO.ts
rename to packages/runtime-types/src/dtos/consumption/AttributeTagCollectionDTO.ts
diff --git a/packages/runtime-types/src/consumption/DraftDTO.ts b/packages/runtime-types/src/dtos/consumption/DraftDTO.ts
similarity index 100%
rename from packages/runtime-types/src/consumption/DraftDTO.ts
rename to packages/runtime-types/src/dtos/consumption/DraftDTO.ts
diff --git a/packages/runtime-types/src/consumption/IdentityMetadataDTO.ts b/packages/runtime-types/src/dtos/consumption/IdentityMetadataDTO.ts
similarity index 100%
rename from packages/runtime-types/src/consumption/IdentityMetadataDTO.ts
rename to packages/runtime-types/src/dtos/consumption/IdentityMetadataDTO.ts
diff --git a/packages/runtime-types/src/consumption/LocalAttributeDTO.ts b/packages/runtime-types/src/dtos/consumption/LocalAttributeDTO.ts
similarity index 100%
rename from packages/runtime-types/src/consumption/LocalAttributeDTO.ts
rename to packages/runtime-types/src/dtos/consumption/LocalAttributeDTO.ts
diff --git a/packages/runtime-types/src/consumption/LocalAttributeDeletionInfoDTO.ts b/packages/runtime-types/src/dtos/consumption/LocalAttributeDeletionInfoDTO.ts
similarity index 100%
rename from packages/runtime-types/src/consumption/LocalAttributeDeletionInfoDTO.ts
rename to packages/runtime-types/src/dtos/consumption/LocalAttributeDeletionInfoDTO.ts
diff --git a/packages/runtime-types/src/consumption/LocalAttributeForwardingDetailsDTO.ts b/packages/runtime-types/src/dtos/consumption/LocalAttributeForwardingDetailsDTO.ts
similarity index 100%
rename from packages/runtime-types/src/consumption/LocalAttributeForwardingDetailsDTO.ts
rename to packages/runtime-types/src/dtos/consumption/LocalAttributeForwardingDetailsDTO.ts
diff --git a/packages/runtime-types/src/consumption/LocalNotificationDTO.ts b/packages/runtime-types/src/dtos/consumption/LocalNotificationDTO.ts
similarity index 100%
rename from packages/runtime-types/src/consumption/LocalNotificationDTO.ts
rename to packages/runtime-types/src/dtos/consumption/LocalNotificationDTO.ts
diff --git a/packages/runtime-types/src/consumption/LocalRequestDTO.ts b/packages/runtime-types/src/dtos/consumption/LocalRequestDTO.ts
similarity index 100%
rename from packages/runtime-types/src/consumption/LocalRequestDTO.ts
rename to packages/runtime-types/src/dtos/consumption/LocalRequestDTO.ts
diff --git a/packages/runtime-types/src/consumption/RequestValidationResultDTO.ts b/packages/runtime-types/src/dtos/consumption/RequestValidationResultDTO.ts
similarity index 100%
rename from packages/runtime-types/src/consumption/RequestValidationResultDTO.ts
rename to packages/runtime-types/src/dtos/consumption/RequestValidationResultDTO.ts
diff --git a/packages/runtime-types/src/consumption/SettingDTO.ts b/packages/runtime-types/src/dtos/consumption/SettingDTO.ts
similarity index 100%
rename from packages/runtime-types/src/consumption/SettingDTO.ts
rename to packages/runtime-types/src/dtos/consumption/SettingDTO.ts
diff --git a/packages/runtime-types/src/consumption/index.ts b/packages/runtime-types/src/dtos/consumption/index.ts
similarity index 100%
rename from packages/runtime-types/src/consumption/index.ts
rename to packages/runtime-types/src/dtos/consumption/index.ts
diff --git a/packages/runtime-types/src/dtos/index.ts b/packages/runtime-types/src/dtos/index.ts
new file mode 100644
index 000000000..c947cd4d9
--- /dev/null
+++ b/packages/runtime-types/src/dtos/index.ts
@@ -0,0 +1,2 @@
+export * from "./consumption";
+export * from "./transport";
diff --git a/packages/runtime-types/src/transport/AnnouncementDTO.ts b/packages/runtime-types/src/dtos/transport/AnnouncementDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/AnnouncementDTO.ts
rename to packages/runtime-types/src/dtos/transport/AnnouncementDTO.ts
diff --git a/packages/runtime-types/src/transport/ChallengeDTO.ts b/packages/runtime-types/src/dtos/transport/ChallengeDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/ChallengeDTO.ts
rename to packages/runtime-types/src/dtos/transport/ChallengeDTO.ts
diff --git a/packages/runtime-types/src/transport/DeviceDTO.ts b/packages/runtime-types/src/dtos/transport/DeviceDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/DeviceDTO.ts
rename to packages/runtime-types/src/dtos/transport/DeviceDTO.ts
diff --git a/packages/runtime-types/src/transport/DeviceOnboardingInfoDTO.ts b/packages/runtime-types/src/dtos/transport/DeviceOnboardingInfoDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/DeviceOnboardingInfoDTO.ts
rename to packages/runtime-types/src/dtos/transport/DeviceOnboardingInfoDTO.ts
diff --git a/packages/runtime-types/src/transport/EmptyTokenDTO.ts b/packages/runtime-types/src/dtos/transport/EmptyTokenDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/EmptyTokenDTO.ts
rename to packages/runtime-types/src/dtos/transport/EmptyTokenDTO.ts
diff --git a/packages/runtime-types/src/transport/FileDTO.ts b/packages/runtime-types/src/dtos/transport/FileDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/FileDTO.ts
rename to packages/runtime-types/src/dtos/transport/FileDTO.ts
diff --git a/packages/runtime-types/src/transport/IdentityDTO.ts b/packages/runtime-types/src/dtos/transport/IdentityDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/IdentityDTO.ts
rename to packages/runtime-types/src/dtos/transport/IdentityDTO.ts
diff --git a/packages/runtime-types/src/transport/IdentityDeletionProcessDTO.ts b/packages/runtime-types/src/dtos/transport/IdentityDeletionProcessDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/IdentityDeletionProcessDTO.ts
rename to packages/runtime-types/src/dtos/transport/IdentityDeletionProcessDTO.ts
diff --git a/packages/runtime-types/src/transport/MessageDTO.ts b/packages/runtime-types/src/dtos/transport/MessageDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/MessageDTO.ts
rename to packages/runtime-types/src/dtos/transport/MessageDTO.ts
diff --git a/packages/runtime-types/src/transport/MessageWithAttachmentsDTO.ts b/packages/runtime-types/src/dtos/transport/MessageWithAttachmentsDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/MessageWithAttachmentsDTO.ts
rename to packages/runtime-types/src/dtos/transport/MessageWithAttachmentsDTO.ts
diff --git a/packages/runtime-types/src/transport/PasswordProtectionDTO.ts b/packages/runtime-types/src/dtos/transport/PasswordProtectionDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/PasswordProtectionDTO.ts
rename to packages/runtime-types/src/dtos/transport/PasswordProtectionDTO.ts
diff --git a/packages/runtime-types/src/transport/PublicRelationshipTemplateReferenceDTO.ts b/packages/runtime-types/src/dtos/transport/PublicRelationshipTemplateReferenceDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/PublicRelationshipTemplateReferenceDTO.ts
rename to packages/runtime-types/src/dtos/transport/PublicRelationshipTemplateReferenceDTO.ts
diff --git a/packages/runtime-types/src/transport/RecipientDTO.ts b/packages/runtime-types/src/dtos/transport/RecipientDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/RecipientDTO.ts
rename to packages/runtime-types/src/dtos/transport/RecipientDTO.ts
diff --git a/packages/runtime-types/src/transport/RelationshipDTO.ts b/packages/runtime-types/src/dtos/transport/RelationshipDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/RelationshipDTO.ts
rename to packages/runtime-types/src/dtos/transport/RelationshipDTO.ts
diff --git a/packages/runtime-types/src/transport/RelationshipTemplateDTO.ts b/packages/runtime-types/src/dtos/transport/RelationshipTemplateDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/RelationshipTemplateDTO.ts
rename to packages/runtime-types/src/dtos/transport/RelationshipTemplateDTO.ts
diff --git a/packages/runtime-types/src/transport/TokenDTO.ts b/packages/runtime-types/src/dtos/transport/TokenDTO.ts
similarity index 100%
rename from packages/runtime-types/src/transport/TokenDTO.ts
rename to packages/runtime-types/src/dtos/transport/TokenDTO.ts
diff --git a/packages/runtime-types/src/transport/index.ts b/packages/runtime-types/src/dtos/transport/index.ts
similarity index 100%
rename from packages/runtime-types/src/transport/index.ts
rename to packages/runtime-types/src/dtos/transport/index.ts
diff --git a/packages/runtime/src/events/DataEvent.ts b/packages/runtime-types/src/events/DataEvent.ts
similarity index 100%
rename from packages/runtime/src/events/DataEvent.ts
rename to packages/runtime-types/src/events/DataEvent.ts
diff --git a/packages/runtime/src/events/consumption/AttributeCreatedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeCreatedEvent.ts
similarity index 85%
rename from packages/runtime/src/events/consumption/AttributeCreatedEvent.ts
rename to packages/runtime-types/src/events/consumption/AttributeCreatedEvent.ts
index c12f384bf..53e87b014 100644
--- a/packages/runtime/src/events/consumption/AttributeCreatedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/AttributeCreatedEvent.ts
@@ -1,4 +1,4 @@
-import { LocalAttributeDTO } from "@nmshd/runtime-types";
+import { LocalAttributeDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class AttributeCreatedEvent extends DataEvent<LocalAttributeDTO> {
diff --git a/packages/runtime/src/events/consumption/AttributeDeletedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeDeletedEvent.ts
similarity index 85%
rename from packages/runtime/src/events/consumption/AttributeDeletedEvent.ts
rename to packages/runtime-types/src/events/consumption/AttributeDeletedEvent.ts
index 9df4c5344..b2a9977ab 100644
--- a/packages/runtime/src/events/consumption/AttributeDeletedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/AttributeDeletedEvent.ts
@@ -1,4 +1,4 @@
-import { LocalAttributeDTO } from "@nmshd/runtime-types";
+import { LocalAttributeDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class AttributeDeletedEvent extends DataEvent<LocalAttributeDTO> {
diff --git a/packages/runtime/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts
similarity index 87%
rename from packages/runtime/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts
rename to packages/runtime-types/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts
index 49e0a9f9d..437fd3161 100644
--- a/packages/runtime/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/AttributeForwardingDetailsChangedEvent.ts
@@ -1,4 +1,4 @@
-import { LocalAttributeDTO } from "@nmshd/runtime-types";
+import { LocalAttributeDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class AttributeForwardingDetailsChangedEvent extends DataEvent<LocalAttributeDTO> {
diff --git a/packages/runtime/src/events/consumption/AttributeSucceededEvent.ts b/packages/runtime-types/src/events/consumption/AttributeSucceededEvent.ts
similarity index 89%
rename from packages/runtime/src/events/consumption/AttributeSucceededEvent.ts
rename to packages/runtime-types/src/events/consumption/AttributeSucceededEvent.ts
index c2903593a..d70ff3a56 100644
--- a/packages/runtime/src/events/consumption/AttributeSucceededEvent.ts
+++ b/packages/runtime-types/src/events/consumption/AttributeSucceededEvent.ts
@@ -1,4 +1,4 @@
-import { LocalAttributeDTO } from "@nmshd/runtime-types";
+import { LocalAttributeDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export interface AttributeSucceededEventData {
diff --git a/packages/runtime/src/events/consumption/AttributeWasViewedAtChangedEvent.ts b/packages/runtime-types/src/events/consumption/AttributeWasViewedAtChangedEvent.ts
similarity index 86%
rename from packages/runtime/src/events/consumption/AttributeWasViewedAtChangedEvent.ts
rename to packages/runtime-types/src/events/consumption/AttributeWasViewedAtChangedEvent.ts
index 7018b07f7..95374c304 100644
--- a/packages/runtime/src/events/consumption/AttributeWasViewedAtChangedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/AttributeWasViewedAtChangedEvent.ts
@@ -1,4 +1,4 @@
-import { LocalAttributeDTO } from "@nmshd/runtime-types";
+import { LocalAttributeDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class AttributeWasViewedAtChangedEvent extends DataEvent<LocalAttributeDTO> {
diff --git a/packages/runtime/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts b/packages/runtime-types/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts
similarity index 87%
rename from packages/runtime/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts
rename to packages/runtime-types/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts
index c1d444572..2f75b040e 100644
--- a/packages/runtime/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts
+++ b/packages/runtime-types/src/events/consumption/ForwardedAttributeDeletedByPeerEvent.ts
@@ -1,4 +1,4 @@
-import { LocalAttributeDTO } from "@nmshd/runtime-types";
+import { LocalAttributeDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class ForwardedAttributeDeletedByPeerEvent extends DataEvent<LocalAttributeDTO> {
diff --git a/packages/runtime/src/events/consumption/IncomingRequestReceivedEvent.ts b/packages/runtime-types/src/events/consumption/IncomingRequestReceivedEvent.ts
similarity index 89%
rename from packages/runtime/src/events/consumption/IncomingRequestReceivedEvent.ts
rename to packages/runtime-types/src/events/consumption/IncomingRequestReceivedEvent.ts
index 5a597b07f..6a135761e 100644
--- a/packages/runtime/src/events/consumption/IncomingRequestReceivedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/IncomingRequestReceivedEvent.ts
@@ -1,4 +1,4 @@
-import { LocalRequestDTO } from "@nmshd/runtime-types";
+import { LocalRequestDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class IncomingRequestReceivedEvent extends DataEvent<LocalRequestDTO> {
diff --git a/packages/runtime/src/events/consumption/IncomingRequestStatusChangedEvent.ts b/packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts
similarity index 85%
rename from packages/runtime/src/events/consumption/IncomingRequestStatusChangedEvent.ts
rename to packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts
index 259e998b0..c6357bf72 100644
--- a/packages/runtime/src/events/consumption/IncomingRequestStatusChangedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/IncomingRequestStatusChangedEvent.ts
@@ -1,5 +1,4 @@
-import { LocalRequestStatus } from "@nmshd/consumption";
-import { LocalRequestDTO } from "@nmshd/runtime-types";
+import { LocalRequestDTO, LocalRequestStatus } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export interface IncomingRequestStatusChangedEventData {
diff --git a/packages/runtime/src/events/consumption/MailReceivedEvent.ts b/packages/runtime-types/src/events/consumption/MailReceivedEvent.ts
similarity index 89%
rename from packages/runtime/src/events/consumption/MailReceivedEvent.ts
rename to packages/runtime-types/src/events/consumption/MailReceivedEvent.ts
index aa75888d2..083feabe2 100644
--- a/packages/runtime/src/events/consumption/MailReceivedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/MailReceivedEvent.ts
@@ -1,5 +1,5 @@
 import { Mail } from "@nmshd/content";
-import { MessageDTO } from "@nmshd/runtime-types";
+import { MessageDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class MailReceivedEvent extends DataEvent<MessageDTO> {
diff --git a/packages/runtime/src/events/consumption/MessageProcessedEvent.ts b/packages/runtime-types/src/events/consumption/MessageProcessedEvent.ts
similarity index 93%
rename from packages/runtime/src/events/consumption/MessageProcessedEvent.ts
rename to packages/runtime-types/src/events/consumption/MessageProcessedEvent.ts
index 3c6627c8a..0ef277d32 100644
--- a/packages/runtime/src/events/consumption/MessageProcessedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/MessageProcessedEvent.ts
@@ -1,4 +1,4 @@
-import { MessageDTO } from "@nmshd/runtime-types";
+import { MessageDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class MessageProcessedEvent extends DataEvent<MessageProcessedEventData> {
diff --git a/packages/runtime/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts
similarity index 89%
rename from packages/runtime/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts
rename to packages/runtime-types/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts
index 7a4cc6490..222c69813 100644
--- a/packages/runtime/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedAndCompletedEvent.ts
@@ -1,4 +1,4 @@
-import { LocalRequestDTO } from "@nmshd/runtime-types";
+import { LocalRequestDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class OutgoingRequestCreatedAndCompletedEvent extends DataEvent<LocalRequestDTO> {
diff --git a/packages/runtime/src/events/consumption/OutgoingRequestCreatedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedEvent.ts
similarity index 89%
rename from packages/runtime/src/events/consumption/OutgoingRequestCreatedEvent.ts
rename to packages/runtime-types/src/events/consumption/OutgoingRequestCreatedEvent.ts
index 86a7d78a6..4c5b36c17 100644
--- a/packages/runtime/src/events/consumption/OutgoingRequestCreatedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/OutgoingRequestCreatedEvent.ts
@@ -1,4 +1,4 @@
-import { LocalRequestDTO } from "@nmshd/runtime-types";
+import { LocalRequestDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class OutgoingRequestCreatedEvent extends DataEvent<LocalRequestDTO> {
diff --git a/packages/runtime/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts
similarity index 90%
rename from packages/runtime/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts
rename to packages/runtime-types/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts
index 8ef257daa..73483401f 100644
--- a/packages/runtime/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent.ts
@@ -1,4 +1,4 @@
-import { LocalRequestDTO } from "@nmshd/runtime-types";
+import { LocalRequestDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent extends DataEvent<LocalRequestDTO> {
diff --git a/packages/runtime/src/events/consumption/OutgoingRequestStatusChangedEvent.ts b/packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts
similarity index 85%
rename from packages/runtime/src/events/consumption/OutgoingRequestStatusChangedEvent.ts
rename to packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts
index b523184d8..03b46c21d 100644
--- a/packages/runtime/src/events/consumption/OutgoingRequestStatusChangedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/OutgoingRequestStatusChangedEvent.ts
@@ -1,5 +1,4 @@
-import { LocalRequestStatus } from "@nmshd/consumption";
-import { LocalRequestDTO } from "@nmshd/runtime-types";
+import { LocalRequestDTO, LocalRequestStatus } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export interface OutgoingRequestStatusChangedEventData {
diff --git a/packages/runtime/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts b/packages/runtime-types/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts
similarity index 86%
rename from packages/runtime/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts
rename to packages/runtime-types/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts
index ea9336141..4835c1caa 100644
--- a/packages/runtime/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts
+++ b/packages/runtime-types/src/events/consumption/OwnAttributeDeletedByOwnerEvent.ts
@@ -1,4 +1,4 @@
-import { LocalAttributeDTO } from "@nmshd/runtime-types";
+import { LocalAttributeDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class OwnAttributeDeletedByOwnerEvent extends DataEvent<LocalAttributeDTO> {
diff --git a/packages/runtime/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts b/packages/runtime-types/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts
similarity index 87%
rename from packages/runtime/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts
rename to packages/runtime-types/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts
index 63252c626..c00c32c23 100644
--- a/packages/runtime/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts
+++ b/packages/runtime-types/src/events/consumption/PeerRelationshipAttributeDeletedByPeerEvent.ts
@@ -1,4 +1,4 @@
-import { LocalAttributeDTO } from "@nmshd/runtime-types";
+import { LocalAttributeDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class PeerRelationshipAttributeDeletedByPeerEvent extends DataEvent<LocalAttributeDTO> {
diff --git a/packages/runtime/src/events/consumption/RelationshipEvent.ts b/packages/runtime-types/src/events/consumption/RelationshipEvent.ts
similarity index 88%
rename from packages/runtime/src/events/consumption/RelationshipEvent.ts
rename to packages/runtime-types/src/events/consumption/RelationshipEvent.ts
index e75cb6b83..f754502fc 100644
--- a/packages/runtime/src/events/consumption/RelationshipEvent.ts
+++ b/packages/runtime-types/src/events/consumption/RelationshipEvent.ts
@@ -1,5 +1,5 @@
 import { Event } from "@js-soft/ts-utils";
-import { RelationshipDTO } from "@nmshd/runtime-types";
+import { RelationshipDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class RelationshipEvent extends DataEvent<RelationshipDTO> {
diff --git a/packages/runtime/src/events/consumption/RelationshipTemplateProcessedEvent.ts b/packages/runtime-types/src/events/consumption/RelationshipTemplateProcessedEvent.ts
similarity index 96%
rename from packages/runtime/src/events/consumption/RelationshipTemplateProcessedEvent.ts
rename to packages/runtime-types/src/events/consumption/RelationshipTemplateProcessedEvent.ts
index 152ade1c5..3c827274e 100644
--- a/packages/runtime/src/events/consumption/RelationshipTemplateProcessedEvent.ts
+++ b/packages/runtime-types/src/events/consumption/RelationshipTemplateProcessedEvent.ts
@@ -1,4 +1,4 @@
-import { RelationshipTemplateDTO } from "@nmshd/runtime-types";
+import { RelationshipTemplateDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class RelationshipTemplateProcessedEvent extends DataEvent<RelationshipTemplateProcessedEventData> {
diff --git a/packages/runtime/src/events/consumption/index.ts b/packages/runtime-types/src/events/consumption/index.ts
similarity index 100%
rename from packages/runtime/src/events/consumption/index.ts
rename to packages/runtime-types/src/events/consumption/index.ts
diff --git a/packages/runtime/src/events/index.ts b/packages/runtime-types/src/events/index.ts
similarity index 100%
rename from packages/runtime/src/events/index.ts
rename to packages/runtime-types/src/events/index.ts
diff --git a/packages/runtime/src/events/runtime/ModulesInitializedEvent.ts b/packages/runtime-types/src/events/runtime/ModulesInitializedEvent.ts
similarity index 100%
rename from packages/runtime/src/events/runtime/ModulesInitializedEvent.ts
rename to packages/runtime-types/src/events/runtime/ModulesInitializedEvent.ts
diff --git a/packages/runtime/src/events/runtime/ModulesLoadedEvent.ts b/packages/runtime-types/src/events/runtime/ModulesLoadedEvent.ts
similarity index 100%
rename from packages/runtime/src/events/runtime/ModulesLoadedEvent.ts
rename to packages/runtime-types/src/events/runtime/ModulesLoadedEvent.ts
diff --git a/packages/runtime/src/events/runtime/ModulesStartedEvent.ts b/packages/runtime-types/src/events/runtime/ModulesStartedEvent.ts
similarity index 100%
rename from packages/runtime/src/events/runtime/ModulesStartedEvent.ts
rename to packages/runtime-types/src/events/runtime/ModulesStartedEvent.ts
diff --git a/packages/runtime/src/events/runtime/RuntimeInitializedEvent.ts b/packages/runtime-types/src/events/runtime/RuntimeInitializedEvent.ts
similarity index 100%
rename from packages/runtime/src/events/runtime/RuntimeInitializedEvent.ts
rename to packages/runtime-types/src/events/runtime/RuntimeInitializedEvent.ts
diff --git a/packages/runtime/src/events/runtime/RuntimeInitializingEvent.ts b/packages/runtime-types/src/events/runtime/RuntimeInitializingEvent.ts
similarity index 100%
rename from packages/runtime/src/events/runtime/RuntimeInitializingEvent.ts
rename to packages/runtime-types/src/events/runtime/RuntimeInitializingEvent.ts
diff --git a/packages/runtime/src/events/runtime/index.ts b/packages/runtime-types/src/events/runtime/index.ts
similarity index 100%
rename from packages/runtime/src/events/runtime/index.ts
rename to packages/runtime-types/src/events/runtime/index.ts
diff --git a/packages/runtime/src/events/transport/DatawalletSynchronizedEvent.ts b/packages/runtime-types/src/events/transport/DatawalletSynchronizedEvent.ts
similarity index 100%
rename from packages/runtime/src/events/transport/DatawalletSynchronizedEvent.ts
rename to packages/runtime-types/src/events/transport/DatawalletSynchronizedEvent.ts
diff --git a/packages/runtime/src/events/transport/FileOwnershipClaimedEvent.ts b/packages/runtime-types/src/events/transport/FileOwnershipClaimedEvent.ts
similarity index 87%
rename from packages/runtime/src/events/transport/FileOwnershipClaimedEvent.ts
rename to packages/runtime-types/src/events/transport/FileOwnershipClaimedEvent.ts
index 3d63cdd26..6771401fe 100644
--- a/packages/runtime/src/events/transport/FileOwnershipClaimedEvent.ts
+++ b/packages/runtime-types/src/events/transport/FileOwnershipClaimedEvent.ts
@@ -1,4 +1,4 @@
-import { FileDTO } from "@nmshd/runtime-types";
+import { FileDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class FileOwnershipClaimedEvent extends DataEvent<FileDTO> {
diff --git a/packages/runtime/src/events/transport/FileOwnershipLockedEvent.ts b/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts
similarity index 87%
rename from packages/runtime/src/events/transport/FileOwnershipLockedEvent.ts
rename to packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts
index e8fd9689c..81d011c49 100644
--- a/packages/runtime/src/events/transport/FileOwnershipLockedEvent.ts
+++ b/packages/runtime-types/src/events/transport/FileOwnershipLockedEvent.ts
@@ -1,4 +1,4 @@
-import { FileDTO } from "@nmshd/runtime-types";
+import { FileDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class FileOwnershipLockedEvent extends DataEvent<FileDTO> {
diff --git a/packages/runtime/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts b/packages/runtime-types/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts
similarity index 86%
rename from packages/runtime/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts
rename to packages/runtime-types/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts
index 3587f9522..1cdbc2dfc 100644
--- a/packages/runtime/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts
+++ b/packages/runtime-types/src/events/transport/IdentityDeletionProcessStatusChangedEvent.ts
@@ -1,4 +1,4 @@
-import { IdentityDeletionProcessDTO } from "@nmshd/runtime-types";
+import { IdentityDeletionProcessDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class IdentityDeletionProcessStatusChangedEvent extends DataEvent<IdentityDeletionProcessDTO | undefined> {
diff --git a/packages/runtime/src/events/transport/MessageDeliveredEvent.ts b/packages/runtime-types/src/events/transport/MessageDeliveredEvent.ts
similarity index 89%
rename from packages/runtime/src/events/transport/MessageDeliveredEvent.ts
rename to packages/runtime-types/src/events/transport/MessageDeliveredEvent.ts
index a20d2f2e7..d6569bfa7 100644
--- a/packages/runtime/src/events/transport/MessageDeliveredEvent.ts
+++ b/packages/runtime-types/src/events/transport/MessageDeliveredEvent.ts
@@ -1,4 +1,4 @@
-import { MessageDTO } from "@nmshd/runtime-types";
+import { MessageDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 // This event is currently not triggered because it is disabled in the Backbone. (JSSNMSHDD-2372)
diff --git a/packages/runtime/src/events/transport/MessageReceivedEvent.ts b/packages/runtime-types/src/events/transport/MessageReceivedEvent.ts
similarity index 86%
rename from packages/runtime/src/events/transport/MessageReceivedEvent.ts
rename to packages/runtime-types/src/events/transport/MessageReceivedEvent.ts
index 1759735f9..deeb23efb 100644
--- a/packages/runtime/src/events/transport/MessageReceivedEvent.ts
+++ b/packages/runtime-types/src/events/transport/MessageReceivedEvent.ts
@@ -1,4 +1,4 @@
-import { MessageDTO } from "@nmshd/runtime-types";
+import { MessageDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class MessageReceivedEvent extends DataEvent<MessageDTO> {
diff --git a/packages/runtime/src/events/transport/MessageSentEvent.ts b/packages/runtime-types/src/events/transport/MessageSentEvent.ts
similarity index 86%
rename from packages/runtime/src/events/transport/MessageSentEvent.ts
rename to packages/runtime-types/src/events/transport/MessageSentEvent.ts
index ee6f68a8e..80a028097 100644
--- a/packages/runtime/src/events/transport/MessageSentEvent.ts
+++ b/packages/runtime-types/src/events/transport/MessageSentEvent.ts
@@ -1,4 +1,4 @@
-import { MessageDTO } from "@nmshd/runtime-types";
+import { MessageDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class MessageSentEvent extends DataEvent<MessageDTO> {
diff --git a/packages/runtime/src/events/transport/MessageWasReadAtChangedEvent.ts b/packages/runtime-types/src/events/transport/MessageWasReadAtChangedEvent.ts
similarity index 87%
rename from packages/runtime/src/events/transport/MessageWasReadAtChangedEvent.ts
rename to packages/runtime-types/src/events/transport/MessageWasReadAtChangedEvent.ts
index 42142ea8e..8ddc16e64 100644
--- a/packages/runtime/src/events/transport/MessageWasReadAtChangedEvent.ts
+++ b/packages/runtime-types/src/events/transport/MessageWasReadAtChangedEvent.ts
@@ -1,4 +1,4 @@
-import { MessageDTO } from "@nmshd/runtime-types";
+import { MessageDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class MessageWasReadAtChangedEvent extends DataEvent<MessageDTO> {
diff --git a/packages/runtime/src/events/transport/PeerDeletedEvent.ts b/packages/runtime-types/src/events/transport/PeerDeletedEvent.ts
similarity index 85%
rename from packages/runtime/src/events/transport/PeerDeletedEvent.ts
rename to packages/runtime-types/src/events/transport/PeerDeletedEvent.ts
index 3887db15d..b5843d4ec 100644
--- a/packages/runtime/src/events/transport/PeerDeletedEvent.ts
+++ b/packages/runtime-types/src/events/transport/PeerDeletedEvent.ts
@@ -1,4 +1,4 @@
-import { RelationshipDTO } from "@nmshd/runtime-types";
+import { RelationshipDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class PeerDeletedEvent extends DataEvent<RelationshipDTO> {
diff --git a/packages/runtime/src/events/transport/PeerDeletionCancelledEvent.ts b/packages/runtime-types/src/events/transport/PeerDeletionCancelledEvent.ts
similarity index 86%
rename from packages/runtime/src/events/transport/PeerDeletionCancelledEvent.ts
rename to packages/runtime-types/src/events/transport/PeerDeletionCancelledEvent.ts
index 8c48f3afd..80762e0d1 100644
--- a/packages/runtime/src/events/transport/PeerDeletionCancelledEvent.ts
+++ b/packages/runtime-types/src/events/transport/PeerDeletionCancelledEvent.ts
@@ -1,4 +1,4 @@
-import { RelationshipDTO } from "@nmshd/runtime-types";
+import { RelationshipDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class PeerDeletionCancelledEvent extends DataEvent<RelationshipDTO> {
diff --git a/packages/runtime/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts b/packages/runtime-types/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts
similarity index 86%
rename from packages/runtime/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts
rename to packages/runtime-types/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts
index 14fee707d..efc6285e9 100644
--- a/packages/runtime/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts
+++ b/packages/runtime-types/src/events/transport/PeerRelationshipTemplateLoadedEvent.ts
@@ -1,4 +1,4 @@
-import { RelationshipTemplateDTO } from "@nmshd/runtime-types";
+import { RelationshipTemplateDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class PeerRelationshipTemplateLoadedEvent extends DataEvent<RelationshipTemplateDTO> {
diff --git a/packages/runtime/src/events/transport/PeerToBeDeletedEvent.ts b/packages/runtime-types/src/events/transport/PeerToBeDeletedEvent.ts
similarity index 85%
rename from packages/runtime/src/events/transport/PeerToBeDeletedEvent.ts
rename to packages/runtime-types/src/events/transport/PeerToBeDeletedEvent.ts
index c51fd1604..6999e86e5 100644
--- a/packages/runtime/src/events/transport/PeerToBeDeletedEvent.ts
+++ b/packages/runtime-types/src/events/transport/PeerToBeDeletedEvent.ts
@@ -1,4 +1,4 @@
-import { RelationshipDTO } from "@nmshd/runtime-types";
+import { RelationshipDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class PeerToBeDeletedEvent extends DataEvent<RelationshipDTO> {
diff --git a/packages/runtime/src/events/transport/RelationshipChangedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipChangedEvent.ts
similarity index 86%
rename from packages/runtime/src/events/transport/RelationshipChangedEvent.ts
rename to packages/runtime-types/src/events/transport/RelationshipChangedEvent.ts
index 676f1ecd7..a3483b1f9 100644
--- a/packages/runtime/src/events/transport/RelationshipChangedEvent.ts
+++ b/packages/runtime-types/src/events/transport/RelationshipChangedEvent.ts
@@ -1,4 +1,4 @@
-import { RelationshipDTO } from "@nmshd/runtime-types";
+import { RelationshipDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class RelationshipChangedEvent extends DataEvent<RelationshipDTO> {
diff --git a/packages/runtime/src/events/transport/RelationshipDecomposedBySelfEvent.ts b/packages/runtime-types/src/events/transport/RelationshipDecomposedBySelfEvent.ts
similarity index 100%
rename from packages/runtime/src/events/transport/RelationshipDecomposedBySelfEvent.ts
rename to packages/runtime-types/src/events/transport/RelationshipDecomposedBySelfEvent.ts
diff --git a/packages/runtime/src/events/transport/RelationshipReactivationCompletedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipReactivationCompletedEvent.ts
similarity index 87%
rename from packages/runtime/src/events/transport/RelationshipReactivationCompletedEvent.ts
rename to packages/runtime-types/src/events/transport/RelationshipReactivationCompletedEvent.ts
index 2b68d43c9..8402ef721 100644
--- a/packages/runtime/src/events/transport/RelationshipReactivationCompletedEvent.ts
+++ b/packages/runtime-types/src/events/transport/RelationshipReactivationCompletedEvent.ts
@@ -1,4 +1,4 @@
-import { RelationshipDTO } from "@nmshd/runtime-types";
+import { RelationshipDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class RelationshipReactivationCompletedEvent extends DataEvent<RelationshipDTO> {
diff --git a/packages/runtime/src/events/transport/RelationshipReactivationRequestedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipReactivationRequestedEvent.ts
similarity index 87%
rename from packages/runtime/src/events/transport/RelationshipReactivationRequestedEvent.ts
rename to packages/runtime-types/src/events/transport/RelationshipReactivationRequestedEvent.ts
index da5180bf8..49a4180b8 100644
--- a/packages/runtime/src/events/transport/RelationshipReactivationRequestedEvent.ts
+++ b/packages/runtime-types/src/events/transport/RelationshipReactivationRequestedEvent.ts
@@ -1,4 +1,4 @@
-import { RelationshipDTO } from "@nmshd/runtime-types";
+import { RelationshipDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class RelationshipReactivationRequestedEvent extends DataEvent<RelationshipDTO> {
diff --git a/packages/runtime/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts b/packages/runtime-types/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts
similarity index 87%
rename from packages/runtime/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts
rename to packages/runtime-types/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts
index 0f69a49e6..eb1e1cfef 100644
--- a/packages/runtime/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts
+++ b/packages/runtime-types/src/events/transport/RelationshipTemplateAllocationsExhaustedEvent.ts
@@ -1,4 +1,4 @@
-import { RelationshipTemplateDTO } from "@nmshd/runtime-types";
+import { RelationshipTemplateDTO } from "../../dtos";
 import { DataEvent } from "../DataEvent";
 
 export class RelationshipTemplateAllocationsExhaustedEvent extends DataEvent<RelationshipTemplateDTO> {
diff --git a/packages/runtime/src/events/transport/index.ts b/packages/runtime-types/src/events/transport/index.ts
similarity index 100%
rename from packages/runtime/src/events/transport/index.ts
rename to packages/runtime-types/src/events/transport/index.ts
diff --git a/packages/runtime-types/src/index.ts b/packages/runtime-types/src/index.ts
index 330fa3c56..699f02314 100644
--- a/packages/runtime-types/src/index.ts
+++ b/packages/runtime-types/src/index.ts
@@ -1,3 +1,3 @@
-export * from "./consumption";
+export * from "./dtos";
+export * from "./events";
 export * from "./RuntimeHealth";
-export * from "./transport";
diff --git a/packages/runtime-types/tsconfig.json b/packages/runtime-types/tsconfig.json
index a0c1fcab3..748e37916 100644
--- a/packages/runtime-types/tsconfig.json
+++ b/packages/runtime-types/tsconfig.json
@@ -6,5 +6,5 @@
     },
     "include": ["src/**/*.ts"],
     "exclude": [],
-    "references": []
+    "references": [{ "path": "../content" }]
 }
diff --git a/packages/runtime/src/Runtime.ts b/packages/runtime/src/Runtime.ts
index b240d61b1..f8b11a409 100644
--- a/packages/runtime/src/Runtime.ts
+++ b/packages/runtime/src/Runtime.ts
@@ -12,7 +12,7 @@ import {
     SettingsController
 } from "@nmshd/consumption";
 import { ICoreAddress } from "@nmshd/core-types";
-import { RuntimeHealth } from "@nmshd/runtime-types";
+import { ModulesInitializedEvent, ModulesLoadedEvent, ModulesStartedEvent, RuntimeHealth, RuntimeInitializedEvent, RuntimeInitializingEvent } from "@nmshd/runtime-types";
 import {
     AccountController,
     AnnouncementController,
@@ -38,7 +38,6 @@ import { buildInformation } from "./buildInformation";
 import { ConfigHolder } from "./ConfigHolder";
 import { DatabaseSchemaUpgrader } from "./DatabaseSchemaUpgrader";
 import { DataViewExpander } from "./dataViews";
-import { ModulesInitializedEvent, ModulesLoadedEvent, ModulesStartedEvent, RuntimeInitializedEvent, RuntimeInitializingEvent } from "./events";
 import { EventProxy } from "./events/EventProxy";
 import { AnonymousServices, ConsumptionServices, ModuleConfiguration, RuntimeModuleRegistry, TransportServices } from "./extensibility";
 import { DeciderModule, MessageModule, NotificationModule, RequestModule } from "./modules";
diff --git a/packages/runtime/src/events/EventProxy.ts b/packages/runtime/src/events/EventProxy.ts
index ed9ecfc4b..b4302f9de 100644
--- a/packages/runtime/src/events/EventProxy.ts
+++ b/packages/runtime/src/events/EventProxy.ts
@@ -1,34 +1,30 @@
 import { EventBus, EventHandler, SubscriptionTarget } from "@js-soft/ts-utils";
 import * as consumption from "@nmshd/consumption";
-import * as transport from "@nmshd/transport";
-import { AttributeMapper, FileMapper, IdentityDeletionProcessMapper, MessageMapper, RelationshipMapper, RelationshipTemplateMapper, RequestMapper } from "../useCases";
 import {
     AttributeCreatedEvent,
     AttributeDeletedEvent,
     AttributeForwardingDetailsChangedEvent,
     AttributeSucceededEvent,
     AttributeWasViewedAtChangedEvent,
-    ForwardedAttributeDeletedByPeerEvent,
-    IncomingRequestReceivedEvent,
-    IncomingRequestStatusChangedEvent,
-    OutgoingRequestCreatedAndCompletedEvent,
-    OutgoingRequestCreatedEvent,
-    OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent,
-    OutgoingRequestStatusChangedEvent,
-    OwnAttributeDeletedByOwnerEvent,
-    PeerRelationshipAttributeDeletedByPeerEvent
-} from "./consumption";
-import {
     DatawalletSynchronizedEvent,
     FileOwnershipClaimedEvent,
     FileOwnershipLockedEvent,
+    ForwardedAttributeDeletedByPeerEvent,
     IdentityDeletionProcessStatusChangedEvent,
+    IncomingRequestReceivedEvent,
+    IncomingRequestStatusChangedEvent,
     MessageDeliveredEvent,
     MessageReceivedEvent,
     MessageSentEvent,
     MessageWasReadAtChangedEvent,
+    OutgoingRequestCreatedAndCompletedEvent,
+    OutgoingRequestCreatedEvent,
+    OutgoingRequestFromRelationshipCreationCreatedAndCompletedEvent,
+    OutgoingRequestStatusChangedEvent,
+    OwnAttributeDeletedByOwnerEvent,
     PeerDeletedEvent,
     PeerDeletionCancelledEvent,
+    PeerRelationshipAttributeDeletedByPeerEvent,
     PeerRelationshipTemplateLoadedEvent,
     PeerToBeDeletedEvent,
     RelationshipChangedEvent,
@@ -36,7 +32,9 @@ import {
     RelationshipReactivationCompletedEvent,
     RelationshipReactivationRequestedEvent,
     RelationshipTemplateAllocationsExhaustedEvent
-} from "./transport";
+} from "@nmshd/runtime-types";
+import * as transport from "@nmshd/transport";
+import { AttributeMapper, FileMapper, IdentityDeletionProcessMapper, MessageMapper, RelationshipMapper, RelationshipTemplateMapper, RequestMapper } from "../useCases";
 
 export class EventProxy {
     private readonly subscriptionIds: number[] = [];
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
index bb607e1dd..09ed29b75 100644
--- a/packages/runtime/src/index.ts
+++ b/packages/runtime/src/index.ts
@@ -1,7 +1,6 @@
 export * from "@nmshd/runtime-types";
 export * from "./buildInformation";
 export * from "./dataViews";
-export * from "./events";
 export * from "./extensibility";
 export * from "./modules";
 export * from "./Runtime";
diff --git a/packages/runtime/src/modules/DeciderModule.ts b/packages/runtime/src/modules/DeciderModule.ts
index b42cca3bf..99e34555e 100644
--- a/packages/runtime/src/modules/DeciderModule.ts
+++ b/packages/runtime/src/modules/DeciderModule.ts
@@ -2,14 +2,14 @@ import { ApplicationError } from "@js-soft/ts-utils";
 import { DecideRequestItemGroupParametersJSON, DecideRequestItemParametersJSON, LocalRequestStatus } from "@nmshd/consumption";
 import { isRequestItemDerivation, RequestItemGroupJSON, RequestItemJSONDerivations } from "@nmshd/content";
 import { CoreDate } from "@nmshd/core-types";
-import { LocalRequestDTO } from "@nmshd/runtime-types";
 import {
     IncomingRequestStatusChangedEvent,
+    LocalRequestDTO,
     MessageProcessedEvent,
     MessageProcessedResult,
     RelationshipTemplateProcessedEvent,
     RelationshipTemplateProcessedResult
-} from "../events";
+} from "@nmshd/runtime-types";
 import { ModuleConfiguration, RuntimeModule } from "../extensibility";
 import { RuntimeServices } from "../Runtime";
 import { RuntimeErrors } from "../useCases/common/RuntimeErrors";
diff --git a/packages/runtime/src/modules/MessageModule.ts b/packages/runtime/src/modules/MessageModule.ts
index a06f68c81..2cbeac3db 100644
--- a/packages/runtime/src/modules/MessageModule.ts
+++ b/packages/runtime/src/modules/MessageModule.ts
@@ -1,6 +1,6 @@
 import { Event } from "@js-soft/ts-utils";
 import { Mail, MailJSON } from "@nmshd/content";
-import { MailReceivedEvent, MessageReceivedEvent, RelationshipEvent } from "../events";
+import { MailReceivedEvent, MessageReceivedEvent, RelationshipEvent } from "@nmshd/runtime-types";
 import { ModuleConfiguration, RuntimeModule } from "../extensibility/modules/RuntimeModule";
 
 export interface MessageModuleConfiguration extends ModuleConfiguration {}
diff --git a/packages/runtime/src/modules/NotificationModule.ts b/packages/runtime/src/modules/NotificationModule.ts
index 923a7380a..8af530500 100644
--- a/packages/runtime/src/modules/NotificationModule.ts
+++ b/packages/runtime/src/modules/NotificationModule.ts
@@ -1,4 +1,4 @@
-import { MessageReceivedEvent, MessageSentEvent } from "../events";
+import { MessageReceivedEvent, MessageSentEvent } from "@nmshd/runtime-types";
 import { RuntimeModule } from "../extensibility/modules/RuntimeModule";
 
 export class NotificationModule extends RuntimeModule {
diff --git a/packages/runtime/src/modules/RequestModule.ts b/packages/runtime/src/modules/RequestModule.ts
index 24e6ac912..0a3dadcc0 100644
--- a/packages/runtime/src/modules/RequestModule.ts
+++ b/packages/runtime/src/modules/RequestModule.ts
@@ -1,17 +1,19 @@
 import { LocalRequestStatus } from "@nmshd/consumption";
 import { RelationshipCreationContent, RequestJSON, ResponseJSON, ResponseResult, ResponseWrapper } from "@nmshd/content";
 import { CoreDate } from "@nmshd/core-types";
-import { LocalRequestDTO, RelationshipStatus } from "@nmshd/runtime-types";
 import {
     IncomingRequestStatusChangedEvent,
+    LocalRequestDTO,
     MessageProcessedEvent,
     MessageProcessedResult,
     MessageReceivedEvent,
     MessageSentEvent,
     PeerRelationshipTemplateLoadedEvent,
-    RelationshipChangedEvent
-} from "../events";
-import { RelationshipTemplateProcessedEvent, RelationshipTemplateProcessedResult } from "../events/consumption/RelationshipTemplateProcessedEvent";
+    RelationshipChangedEvent,
+    RelationshipStatus,
+    RelationshipTemplateProcessedEvent,
+    RelationshipTemplateProcessedResult
+} from "@nmshd/runtime-types";
 import { RuntimeModule } from "../extensibility/modules/RuntimeModule";
 import { RuntimeServices } from "../Runtime";
 
diff --git a/packages/runtime/test/consumption/iqlQuery.test.ts b/packages/runtime/test/consumption/iqlQuery.test.ts
index 2e6e5a5c9..709f1e8ba 100644
--- a/packages/runtime/test/consumption/iqlQuery.test.ts
+++ b/packages/runtime/test/consumption/iqlQuery.test.ts
@@ -4,13 +4,14 @@ import { DateTime } from "luxon";
 import {
     ConsumptionServices,
     CreateOutgoingRequestRequest,
+    IncomingRequestReceivedEvent,
+    IncomingRequestStatusChangedEvent,
     LocalAttributeDTO,
     LocalRequestStatus,
     OutgoingRequestCreatedEvent,
     OutgoingRequestStatusChangedEvent,
     TransportServices
 } from "../../src";
-import { IncomingRequestReceivedEvent, IncomingRequestStatusChangedEvent } from "../../src/events";
 import { RuntimeServiceProvider, TestRuntimeServices, establishRelationship, exchangeMessageWithRequest, sendMessageWithRequest } from "../lib";
 import { exchangeMessageWithRequestAndRequireManualDecision, exchangeMessageWithRequestAndSendResponse } from "../lib/testUtilsWithInactiveModules";
 
diff --git a/packages/runtime/test/consumption/requests.test.ts b/packages/runtime/test/consumption/requests.test.ts
index 946438294..d19413f3b 100644
--- a/packages/runtime/test/consumption/requests.test.ts
+++ b/packages/runtime/test/consumption/requests.test.ts
@@ -5,12 +5,13 @@ import { DateTime } from "luxon";
 import {
     ConsumptionServices,
     CreateOutgoingRequestRequest,
+    IncomingRequestReceivedEvent,
+    IncomingRequestStatusChangedEvent,
     LocalRequestStatus,
     OutgoingRequestCreatedEvent,
     OutgoingRequestStatusChangedEvent,
     TransportServices
 } from "../../src";
-import { IncomingRequestReceivedEvent, IncomingRequestStatusChangedEvent } from "../../src/events";
 import {
     establishRelationship,
     exchangeMessageWithRequest,
diff --git a/packages/runtime/tsconfig.json b/packages/runtime/tsconfig.json
index cb7f37b00..8f55001d1 100644
--- a/packages/runtime/tsconfig.json
+++ b/packages/runtime/tsconfig.json
@@ -6,5 +6,5 @@
     },
     "include": ["src/**/*.ts"],
     "exclude": [],
-    "references": [{ "path": "../transport" }, { "path": "../content" }, { "path": "../consumption" }]
+    "references": [{ "path": "../transport" }, { "path": "../content" }, { "path": "../consumption" }, { "path": "../runtime-types" }]
 }