diff --git a/apps/cli/src/tools/export.command.ts b/apps/cli/src/tools/export.command.ts
index fd35b845bec..3418baa3129 100644
--- a/apps/cli/src/tools/export.command.ts
+++ b/apps/cli/src/tools/export.command.ts
@@ -4,12 +4,11 @@ import { OptionValues } from "commander";
 import * as inquirer from "inquirer";
 import { firstValueFrom, switchMap } from "rxjs";
 
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { EventType } from "@bitwarden/common/enums";
+import { EventCollectionService, EventType } from "@bitwarden/common/dirt/event-logs";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import {
   ExportFormat,
diff --git a/apps/web/src/app/tools/event-export/event-export.service.ts b/apps/web/src/app/tools/event-export/event-export.service.ts
index d888af51edf..4472a633472 100644
--- a/apps/web/src/app/tools/event-export/event-export.service.ts
+++ b/apps/web/src/app/tools/event-export/event-export.service.ts
@@ -3,7 +3,7 @@
 import { Injectable } from "@angular/core";
 import * as papa from "papaparse";
 
-import { EventView } from "@bitwarden/common/models/view/event.view";
+import { EventView } from "@bitwarden/common/dirt/event-logs";
 import { ExportHelper } from "@bitwarden/vault-export-core";
 
 import { EventExport } from "./event.export";
diff --git a/apps/web/src/app/tools/event-export/event.export.ts b/apps/web/src/app/tools/event-export/event.export.ts
index b68f67d3d87..b80f6b93096 100644
--- a/apps/web/src/app/tools/event-export/event.export.ts
+++ b/apps/web/src/app/tools/event-export/event.export.ts
@@ -1,5 +1,4 @@
-import { EventType } from "@bitwarden/common/enums";
-import { EventView } from "@bitwarden/common/models/view/event.view";
+import { EventView, EventType } from "@bitwarden/common/dirt/event-logs";
 
 export class EventExport {
   message: string;
diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
index 5503b4e9ee6..108074dfe11 100644
--- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
+++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts
@@ -33,14 +33,14 @@ import {
 import { CollectionService } from "@bitwarden/admin-console/common";
 import { PasswordStrengthV2Component } from "@bitwarden/angular/tools/password-strength/password-strength-v2.component";
 import { UserVerificationDialogComponent } from "@bitwarden/auth/angular";
-import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { ClientType, EventType } from "@bitwarden/common/enums";
+import { EventCollectionService, EventType } from "@bitwarden/common/dirt/event-logs";
+import { ClientType } from "@bitwarden/common/enums";
 import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";