nmshd · Milena-Czierlinski · Mar 6, 2026 · Mar 5, 2026 · Mar 5, 2026 · Mar 5, 2026
diff --git a/package-lock.json b/package-lock.json
diff --git 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/.../consumption/AttributeTagCollectionDTO.ts → .../consumption/AttributeTagCollectionDTO.ts b/.../consumption/AttributeTagCollectionDTO.ts → .../consumption/AttributeTagCollectionDTO.ts
diff --git a/...runtime-types/src/consumption/DraftDTO.ts → ...me-types/src/dtos/consumption/DraftDTO.ts b/...runtime-types/src/consumption/DraftDTO.ts → ...me-types/src/dtos/consumption/DraftDTO.ts
diff --git a/...es/src/consumption/IdentityMetadataDTO.ts → ...c/dtos/consumption/IdentityMetadataDTO.ts b/...es/src/consumption/IdentityMetadataDTO.ts → ...c/dtos/consumption/IdentityMetadataDTO.ts
diff --git a/...ypes/src/consumption/LocalAttributeDTO.ts → ...src/dtos/consumption/LocalAttributeDTO.ts b/...ypes/src/consumption/LocalAttributeDTO.ts → ...src/dtos/consumption/LocalAttributeDTO.ts
diff --git a/...sumption/LocalAttributeDeletionInfoDTO.ts → ...sumption/LocalAttributeDeletionInfoDTO.ts b/...sumption/LocalAttributeDeletionInfoDTO.ts → ...sumption/LocalAttributeDeletionInfoDTO.ts
diff --git a/...ion/LocalAttributeForwardingDetailsDTO.ts → ...ion/LocalAttributeForwardingDetailsDTO.ts b/...ion/LocalAttributeForwardingDetailsDTO.ts → ...ion/LocalAttributeForwardingDetailsDTO.ts
diff --git a/...s/src/consumption/LocalNotificationDTO.ts → .../dtos/consumption/LocalNotificationDTO.ts b/...s/src/consumption/LocalNotificationDTO.ts → .../dtos/consumption/LocalNotificationDTO.ts
diff --git a/...-types/src/consumption/LocalRequestDTO.ts → ...s/src/dtos/consumption/LocalRequestDTO.ts b/...-types/src/consumption/LocalRequestDTO.ts → ...s/src/dtos/consumption/LocalRequestDTO.ts
diff --git a/...consumption/RequestValidationResultDTO.ts → ...consumption/RequestValidationResultDTO.ts b/...consumption/RequestValidationResultDTO.ts → ...consumption/RequestValidationResultDTO.ts
diff --git a/...ntime-types/src/consumption/SettingDTO.ts → ...-types/src/dtos/consumption/SettingDTO.ts b/...ntime-types/src/consumption/SettingDTO.ts → ...-types/src/dtos/consumption/SettingDTO.ts
diff --git a/...es/runtime-types/src/consumption/index.ts → ...ntime-types/src/dtos/consumption/index.ts b/...es/runtime-types/src/consumption/index.ts → ...ntime-types/src/dtos/consumption/index.ts
diff --git a/packages/runtime-types/src/dtos/index.ts b/packages/runtime-types/src/dtos/index.ts
@@ -0,0 +1,2 @@
+export * from "./consumption";
+export * from "./transport";
diff --git a/...me-types/src/transport/AnnouncementDTO.ts → ...pes/src/dtos/transport/AnnouncementDTO.ts b/...me-types/src/transport/AnnouncementDTO.ts → ...pes/src/dtos/transport/AnnouncementDTO.ts
diff --git a/...ntime-types/src/transport/ChallengeDTO.ts → ...-types/src/dtos/transport/ChallengeDTO.ts b/...ntime-types/src/transport/ChallengeDTO.ts → ...-types/src/dtos/transport/ChallengeDTO.ts
diff --git a/.../runtime-types/src/transport/DeviceDTO.ts → ...ime-types/src/dtos/transport/DeviceDTO.ts b/.../runtime-types/src/transport/DeviceDTO.ts → ...ime-types/src/dtos/transport/DeviceDTO.ts
diff --git a/.../src/transport/DeviceOnboardingInfoDTO.ts → ...dtos/transport/DeviceOnboardingInfoDTO.ts b/.../src/transport/DeviceOnboardingInfoDTO.ts → ...dtos/transport/DeviceOnboardingInfoDTO.ts
diff --git a/...time-types/src/transport/EmptyTokenDTO.ts → ...types/src/dtos/transport/EmptyTokenDTO.ts b/...time-types/src/transport/EmptyTokenDTO.ts → ...types/src/dtos/transport/EmptyTokenDTO.ts
diff --git a/...es/runtime-types/src/transport/FileDTO.ts → ...ntime-types/src/dtos/transport/FileDTO.ts b/...es/runtime-types/src/transport/FileDTO.ts → ...ntime-types/src/dtos/transport/FileDTO.ts
diff --git a/...untime-types/src/transport/IdentityDTO.ts → ...e-types/src/dtos/transport/IdentityDTO.ts b/...untime-types/src/transport/IdentityDTO.ts → ...e-types/src/dtos/transport/IdentityDTO.ts
diff --git a/...c/transport/IdentityDeletionProcessDTO.ts → ...s/transport/IdentityDeletionProcessDTO.ts b/...c/transport/IdentityDeletionProcessDTO.ts → ...s/transport/IdentityDeletionProcessDTO.ts
diff --git a/...runtime-types/src/transport/MessageDTO.ts → ...me-types/src/dtos/transport/MessageDTO.ts b/...runtime-types/src/transport/MessageDTO.ts → ...me-types/src/dtos/transport/MessageDTO.ts
diff --git a/...rc/transport/MessageWithAttachmentsDTO.ts → ...os/transport/MessageWithAttachmentsDTO.ts b/...rc/transport/MessageWithAttachmentsDTO.ts → ...os/transport/MessageWithAttachmentsDTO.ts
diff --git a/...es/src/transport/PasswordProtectionDTO.ts → ...c/dtos/transport/PasswordProtectionDTO.ts b/...es/src/transport/PasswordProtectionDTO.ts → ...c/dtos/transport/PasswordProtectionDTO.ts
diff --git a/...PublicRelationshipTemplateReferenceDTO.ts → ...PublicRelationshipTemplateReferenceDTO.ts b/...PublicRelationshipTemplateReferenceDTO.ts → ...PublicRelationshipTemplateReferenceDTO.ts
diff --git a/...ntime-types/src/transport/RecipientDTO.ts → ...-types/src/dtos/transport/RecipientDTO.ts b/...ntime-types/src/transport/RecipientDTO.ts → ...-types/src/dtos/transport/RecipientDTO.ts
diff --git a/...me-types/src/transport/RelationshipDTO.ts → ...pes/src/dtos/transport/RelationshipDTO.ts b/...me-types/src/transport/RelationshipDTO.ts → ...pes/src/dtos/transport/RelationshipDTO.ts
diff --git a/.../src/transport/RelationshipTemplateDTO.ts → ...dtos/transport/RelationshipTemplateDTO.ts b/.../src/transport/RelationshipTemplateDTO.ts → ...dtos/transport/RelationshipTemplateDTO.ts
diff --git a/...s/runtime-types/src/transport/TokenDTO.ts → ...time-types/src/dtos/transport/TokenDTO.ts b/...s/runtime-types/src/transport/TokenDTO.ts → ...time-types/src/dtos/transport/TokenDTO.ts
diff --git a/...ages/runtime-types/src/transport/index.ts → ...runtime-types/src/dtos/transport/index.ts b/...ages/runtime-types/src/transport/index.ts → ...runtime-types/src/dtos/transport/index.ts
diff --git a/packages/runtime/src/events/DataEvent.ts → ...ges/runtime-types/src/events/DataEvent.ts b/packages/runtime/src/events/DataEvent.ts → ...ges/runtime-types/src/events/DataEvent.ts
diff --git a/...ents/consumption/AttributeCreatedEvent.ts → ...ents/consumption/AttributeCreatedEvent.ts b/...ents/consumption/AttributeCreatedEvent.ts → ...ents/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/...ents/consumption/AttributeDeletedEvent.ts → ...ents/consumption/AttributeDeletedEvent.ts b/...ents/consumption/AttributeDeletedEvent.ts → ...ents/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/...AttributeForwardingDetailsChangedEvent.ts → ...AttributeForwardingDetailsChangedEvent.ts b/...AttributeForwardingDetailsChangedEvent.ts → ...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/...ts/consumption/AttributeSucceededEvent.ts → ...ts/consumption/AttributeSucceededEvent.ts b/...ts/consumption/AttributeSucceededEvent.ts → ...ts/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/...ption/AttributeWasViewedAtChangedEvent.ts → ...ption/AttributeWasViewedAtChangedEvent.ts b/...ption/AttributeWasViewedAtChangedEvent.ts → ...ption/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/...n/ForwardedAttributeDeletedByPeerEvent.ts → ...n/ForwardedAttributeDeletedByPeerEvent.ts b/...n/ForwardedAttributeDeletedByPeerEvent.ts → ...n/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/...nsumption/IncomingRequestReceivedEvent.ts → ...nsumption/IncomingRequestReceivedEvent.ts b/...nsumption/IncomingRequestReceivedEvent.ts → ...nsumption/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/...tion/IncomingRequestStatusChangedEvent.ts → ...tion/IncomingRequestStatusChangedEvent.ts b/...tion/IncomingRequestStatusChangedEvent.ts → ...tion/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/...c/events/consumption/MailReceivedEvent.ts → ...c/events/consumption/MailReceivedEvent.ts b/...c/events/consumption/MailReceivedEvent.ts → ...c/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/...ents/consumption/MessageProcessedEvent.ts → ...ents/consumption/MessageProcessedEvent.ts b/...ents/consumption/MessageProcessedEvent.ts → ...ents/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/...utgoingRequestCreatedAndCompletedEvent.ts → ...utgoingRequestCreatedAndCompletedEvent.ts b/...utgoingRequestCreatedAndCompletedEvent.ts → ...utgoingRequestCreatedAndCompletedEvent.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/...onsumption/OutgoingRequestCreatedEvent.ts → ...onsumption/OutgoingRequestCreatedEvent.ts b/...onsumption/OutgoingRequestCreatedEvent.ts → ...onsumption/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/...onshipCreationCreatedAndCompletedEvent.ts → ...onshipCreationCreatedAndCompletedEvent.ts b/...onshipCreationCreatedAndCompletedEvent.ts → ...onshipCreationCreatedAndCompletedEvent.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/...tion/OutgoingRequestStatusChangedEvent.ts → ...tion/OutgoingRequestStatusChangedEvent.ts b/...tion/OutgoingRequestStatusChangedEvent.ts → ...tion/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/...mption/OwnAttributeDeletedByOwnerEvent.ts → ...mption/OwnAttributeDeletedByOwnerEvent.ts b/...mption/OwnAttributeDeletedByOwnerEvent.ts → ...mption/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/...elationshipAttributeDeletedByPeerEvent.ts → ...elationshipAttributeDeletedByPeerEvent.ts b/...elationshipAttributeDeletedByPeerEvent.ts → ...elationshipAttributeDeletedByPeerEvent.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/...c/events/consumption/RelationshipEvent.ts → ...c/events/consumption/RelationshipEvent.ts b/...c/events/consumption/RelationshipEvent.ts → ...c/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/...ion/RelationshipTemplateProcessedEvent.ts → ...ion/RelationshipTemplateProcessedEvent.ts b/...ion/RelationshipTemplateProcessedEvent.ts → ...ion/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/...s/runtime/src/events/consumption/index.ts → ...ime-types/src/events/consumption/index.ts b/...s/runtime/src/events/consumption/index.ts → ...ime-types/src/events/consumption/index.ts
diff --git a/packages/runtime/src/events/index.ts → packages/runtime-types/src/events/index.ts b/packages/runtime/src/events/index.ts → packages/runtime-types/src/events/index.ts
diff --git a/...events/runtime/ModulesInitializedEvent.ts → ...events/runtime/ModulesInitializedEvent.ts b/...events/runtime/ModulesInitializedEvent.ts → ...events/runtime/ModulesInitializedEvent.ts
diff --git a/.../src/events/runtime/ModulesLoadedEvent.ts → .../src/events/runtime/ModulesLoadedEvent.ts b/.../src/events/runtime/ModulesLoadedEvent.ts → .../src/events/runtime/ModulesLoadedEvent.ts
diff --git a/...src/events/runtime/ModulesStartedEvent.ts → ...src/events/runtime/ModulesStartedEvent.ts b/...src/events/runtime/ModulesStartedEvent.ts → ...src/events/runtime/ModulesStartedEvent.ts
diff --git a/...events/runtime/RuntimeInitializedEvent.ts → ...events/runtime/RuntimeInitializedEvent.ts b/...events/runtime/RuntimeInitializedEvent.ts → ...events/runtime/RuntimeInitializedEvent.ts
diff --git a/...vents/runtime/RuntimeInitializingEvent.ts → ...vents/runtime/RuntimeInitializingEvent.ts b/...vents/runtime/RuntimeInitializingEvent.ts → ...vents/runtime/RuntimeInitializingEvent.ts
diff --git a/packages/runtime/src/events/runtime/index.ts → ...runtime-types/src/events/runtime/index.ts b/packages/runtime/src/events/runtime/index.ts → ...runtime-types/src/events/runtime/index.ts
diff --git a/.../transport/DatawalletSynchronizedEvent.ts → .../transport/DatawalletSynchronizedEvent.ts b/.../transport/DatawalletSynchronizedEvent.ts → .../transport/DatawalletSynchronizedEvent.ts
diff --git a/...ts/transport/FileOwnershipClaimedEvent.ts → ...ts/transport/FileOwnershipClaimedEvent.ts b/...ts/transport/FileOwnershipClaimedEvent.ts → ...ts/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/...nts/transport/FileOwnershipLockedEvent.ts → ...nts/transport/FileOwnershipLockedEvent.ts b/...nts/transport/FileOwnershipLockedEvent.ts → ...nts/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/...ntityDeletionProcessStatusChangedEvent.ts → ...ntityDeletionProcessStatusChangedEvent.ts b/...ntityDeletionProcessStatusChangedEvent.ts → ...ntityDeletionProcessStatusChangedEvent.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/...events/transport/MessageDeliveredEvent.ts → ...events/transport/MessageDeliveredEvent.ts b/...events/transport/MessageDeliveredEvent.ts → ...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/.../events/transport/MessageReceivedEvent.ts → .../events/transport/MessageReceivedEvent.ts b/.../events/transport/MessageReceivedEvent.ts → .../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/.../src/events/transport/MessageSentEvent.ts → .../src/events/transport/MessageSentEvent.ts b/.../src/events/transport/MessageSentEvent.ts → .../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/...transport/MessageWasReadAtChangedEvent.ts → ...transport/MessageWasReadAtChangedEvent.ts b/...transport/MessageWasReadAtChangedEvent.ts → ...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/.../src/events/transport/PeerDeletedEvent.ts → .../src/events/transport/PeerDeletedEvent.ts b/.../src/events/transport/PeerDeletedEvent.ts → .../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/...s/transport/PeerDeletionCancelledEvent.ts → ...s/transport/PeerDeletionCancelledEvent.ts b/...s/transport/PeerDeletionCancelledEvent.ts → ...s/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/...rt/PeerRelationshipTemplateLoadedEvent.ts → ...rt/PeerRelationshipTemplateLoadedEvent.ts b/...rt/PeerRelationshipTemplateLoadedEvent.ts → ...rt/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/.../events/transport/PeerToBeDeletedEvent.ts → .../events/transport/PeerToBeDeletedEvent.ts b/.../events/transport/PeerToBeDeletedEvent.ts → .../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/...nts/transport/RelationshipChangedEvent.ts → ...nts/transport/RelationshipChangedEvent.ts b/...nts/transport/RelationshipChangedEvent.ts → ...nts/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/...port/RelationshipDecomposedBySelfEvent.ts → ...port/RelationshipDecomposedBySelfEvent.ts b/...port/RelationshipDecomposedBySelfEvent.ts → ...port/RelationshipDecomposedBySelfEvent.ts
diff --git a/...RelationshipReactivationCompletedEvent.ts → ...RelationshipReactivationCompletedEvent.ts b/...RelationshipReactivationCompletedEvent.ts → ...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/...RelationshipReactivationRequestedEvent.ts → ...RelationshipReactivationRequestedEvent.ts b/...RelationshipReactivationRequestedEvent.ts → ...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/...nshipTemplateAllocationsExhaustedEvent.ts → ...nshipTemplateAllocationsExhaustedEvent.ts b/...nshipTemplateAllocationsExhaustedEvent.ts → ...nshipTemplateAllocationsExhaustedEvent.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/...ges/runtime/src/events/transport/index.ts → ...ntime-types/src/events/transport/index.ts b/...ges/runtime/src/events/transport/index.ts → ...ntime-types/src/events/transport/index.ts
diff --git 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
@@ -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
@@ -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
@@ -1,42 +1,40 @@
 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,
     RelationshipDecomposedBySelfEvent,
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from "./consumption";
		export * from "./transport";