From 68233f43efa0aa82b9410d6ae94f2721aeabef77 Mon Sep 17 00:00:00 2001
From: Konstantinos Arvanitakis <arvanitakis@radical-elements.com>
Date: Wed, 16 Sep 2026 01:21:22 +0300
Subject: [PATCH] Feat: Privacy Concern redesign to match project structure

---
 docs/privacy.md                                     |  2 +-
 src/Command/ProcessErasureRequestsCommand.php       |  2 +-
 src/Privacy/Contracts/PersonalDataProvider.php      |  8 ++++----
 src/Privacy/{ => DTOs}/CustomerSubject.php          |  2 +-
 src/Privacy/{ => DTOs}/ErasureReport.php            |  4 +++-
 src/Privacy/{ => DTOs}/ExportReport.php             |  2 +-
 src/Privacy/{ => DTOs}/ProviderErasureResult.php    |  4 +++-
 src/Privacy/{ => DTOs}/ProviderExportResult.php     |  2 +-
 src/Privacy/{ => DTOs}/UserSubject.php              |  2 +-
 src/Privacy/{ => Enums}/ErasureOutcome.php          |  2 +-
 src/Privacy/{ => Enums}/ErasureRequestStatus.php    |  2 +-
 src/Privacy/{ => Enums}/ExportRequestStatus.php     |  2 +-
 src/Privacy/Events/PersonalDataGathered.php         |  2 +-
 .../Extensions/CustomerErasureActionsExtension.php  |  2 +-
 .../Resources/DataErasureRequestResource.php        |  4 ++--
 .../Resources/DataExportRequestResource.php         |  2 +-
 src/Privacy/Jobs/EraseDataSubjectJob.php            |  2 +-
 src/Privacy/Jobs/ExportDataSubjectJob.php           | 12 ++++++------
 .../Listeners/CancelErasureOnLoginListener.php      |  4 ++--
 .../Listeners/CascadeCustomerErasureListener.php    |  2 +-
 src/Privacy/Listeners/WriteExportToCsvListener.php  |  2 +-
 src/Privacy/Models/DataErasureRequest.php           |  4 ++--
 src/Privacy/Models/DataExportRequest.php            |  2 +-
 src/Privacy/Providers/AddressDataProvider.php       | 13 +++++++------
 src/Privacy/Providers/CartDataProvider.php          | 10 +++++-----
 src/Privacy/Providers/CustomerDataProvider.php      | 10 +++++-----
 src/Privacy/Providers/OrderDataProvider.php         | 10 +++++-----
 src/Privacy/Providers/ReviewDataProvider.php        | 10 +++++-----
 .../ErasureRequestsRelationManager.php              |  4 ++--
 .../ExportRequestsRelationManager.php               |  2 +-
 .../RelationManagers/UserRelationManager.php        |  2 +-
 src/Privacy/{ => Services}/PrivacyManager.php       |  2 +-
 src/Privacy/{ => Services}/PrivacyService.php       |  8 +++++++-
 33 files changed, 77 insertions(+), 66 deletions(-)
 rename src/Privacy/{ => DTOs}/CustomerSubject.php (96%)
 rename src/Privacy/{ => DTOs}/ErasureReport.php (90%)
 rename src/Privacy/{ => DTOs}/ExportReport.php (95%)
 rename src/Privacy/{ => DTOs}/ProviderErasureResult.php (85%)
 rename src/Privacy/{ => DTOs}/ProviderExportResult.php (92%)
 rename src/Privacy/{ => DTOs}/UserSubject.php (96%)
 rename src/Privacy/{ => Enums}/ErasureOutcome.php (91%)
 rename src/Privacy/{ => Enums}/ErasureRequestStatus.php (79%)
 rename src/Privacy/{ => Enums}/ExportRequestStatus.php (78%)
 rename src/Privacy/{ => Services}/PrivacyManager.php (97%)
 rename src/Privacy/{ => Services}/PrivacyService.php (97%)

diff --git a/docs/privacy.md b/docs/privacy.md
index 1cc4dba..c74db14 100644
--- a/docs/privacy.md
+++ b/docs/privacy.md
@@ -169,7 +169,7 @@ no one — a business-account erasure must never block anyone's access.
 `Modules\Core\Auth\Services\UserOtpService` — nothing else changes).
 
 ```php
-use Modules\Core\Privacy\PrivacyService;
+use Modules\Core\Privacy\Services\PrivacyService;
 
 $service = app(PrivacyService::class);
 
diff --git a/src/Command/ProcessErasureRequestsCommand.php b/src/Command/ProcessErasureRequestsCommand.php
index ff13523..59e6962 100644
--- a/src/Command/ProcessErasureRequestsCommand.php
+++ b/src/Command/ProcessErasureRequestsCommand.php
@@ -3,7 +3,7 @@
 namespace Modules\Core\Command;
 
 use Illuminate\Console\Command;
-use Modules\Core\Privacy\ErasureRequestStatus;
+use Modules\Core\Privacy\Enums\ErasureRequestStatus;
 use Modules\Core\Privacy\Jobs\EraseDataSubjectJob;
 use Modules\Core\Privacy\Models\DataErasureRequest;
 
diff --git a/src/Privacy/Contracts/PersonalDataProvider.php b/src/Privacy/Contracts/PersonalDataProvider.php
index 02e24b7..abd0023 100644
--- a/src/Privacy/Contracts/PersonalDataProvider.php
+++ b/src/Privacy/Contracts/PersonalDataProvider.php
@@ -2,10 +2,10 @@
 
 namespace Modules\Core\Privacy\Contracts;
 
-use Modules\Core\Privacy\CustomerSubject;
-use Modules\Core\Privacy\ProviderErasureResult;
-use Modules\Core\Privacy\ProviderExportResult;
-use Modules\Core\Privacy\UserSubject;
+use Modules\Core\Privacy\DTOs\CustomerSubject;
+use Modules\Core\Privacy\DTOs\ProviderErasureResult;
+use Modules\Core\Privacy\DTOs\ProviderExportResult;
+use Modules\Core\Privacy\DTOs\UserSubject;
 
 /**
  * Implemented by any module that holds personal data and wants it included in
diff --git a/src/Privacy/CustomerSubject.php b/src/Privacy/DTOs/CustomerSubject.php
similarity index 96%
rename from src/Privacy/CustomerSubject.php
rename to src/Privacy/DTOs/CustomerSubject.php
index d8d00c9..0f2cd5a 100644
--- a/src/Privacy/CustomerSubject.php
+++ b/src/Privacy/DTOs/CustomerSubject.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Privacy;
+namespace Modules\Core\Privacy\DTOs;
 
 use Lunar\Models\Customer;
 
diff --git a/src/Privacy/ErasureReport.php b/src/Privacy/DTOs/ErasureReport.php
similarity index 90%
rename from src/Privacy/ErasureReport.php
rename to src/Privacy/DTOs/ErasureReport.php
index da5b83d..b236fee 100644
--- a/src/Privacy/ErasureReport.php
+++ b/src/Privacy/DTOs/ErasureReport.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Modules\Core\Privacy;
+namespace Modules\Core\Privacy\DTOs;
+
+use Modules\Core\Privacy\Enums\ErasureOutcome;
 
 /**
  * Every registered provider's outcome, assembled into one right-of-erasure response
diff --git a/src/Privacy/ExportReport.php b/src/Privacy/DTOs/ExportReport.php
similarity index 95%
rename from src/Privacy/ExportReport.php
rename to src/Privacy/DTOs/ExportReport.php
index 3d59573..70f2271 100644
--- a/src/Privacy/ExportReport.php
+++ b/src/Privacy/DTOs/ExportReport.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Privacy;
+namespace Modules\Core\Privacy\DTOs;
 
 /**
  * Every registered provider's export, assembled into one right-of-access response.
diff --git a/src/Privacy/ProviderErasureResult.php b/src/Privacy/DTOs/ProviderErasureResult.php
similarity index 85%
rename from src/Privacy/ProviderErasureResult.php
rename to src/Privacy/DTOs/ProviderErasureResult.php
index 56051dd..0440723 100644
--- a/src/Privacy/ProviderErasureResult.php
+++ b/src/Privacy/DTOs/ProviderErasureResult.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Modules\Core\Privacy;
+namespace Modules\Core\Privacy\DTOs;
+
+use Modules\Core\Privacy\Enums\ErasureOutcome;
 
 /**
  * One provider's outcome on an erasure request. `reason` is required whenever
diff --git a/src/Privacy/ProviderExportResult.php b/src/Privacy/DTOs/ProviderExportResult.php
similarity index 92%
rename from src/Privacy/ProviderExportResult.php
rename to src/Privacy/DTOs/ProviderExportResult.php
index 7714fc2..05c7ef2 100644
--- a/src/Privacy/ProviderExportResult.php
+++ b/src/Privacy/DTOs/ProviderExportResult.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Privacy;
+namespace Modules\Core\Privacy\DTOs;
 
 /**
  * One provider's contribution to a right-of-access export. `provider` is a short,
diff --git a/src/Privacy/UserSubject.php b/src/Privacy/DTOs/UserSubject.php
similarity index 96%
rename from src/Privacy/UserSubject.php
rename to src/Privacy/DTOs/UserSubject.php
index f0962bc..440bc63 100644
--- a/src/Privacy/UserSubject.php
+++ b/src/Privacy/DTOs/UserSubject.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Privacy;
+namespace Modules\Core\Privacy\DTOs;
 
 use Illuminate\Contracts\Auth\Authenticatable;
 use Lunar\Base\LunarUser;
diff --git a/src/Privacy/ErasureOutcome.php b/src/Privacy/Enums/ErasureOutcome.php
similarity index 91%
rename from src/Privacy/ErasureOutcome.php
rename to src/Privacy/Enums/ErasureOutcome.php
index e2532e0..22dd0b9 100644
--- a/src/Privacy/ErasureOutcome.php
+++ b/src/Privacy/Enums/ErasureOutcome.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Privacy;
+namespace Modules\Core\Privacy\Enums;
 
 /**
  * What actually happened to a provider's data on an erasure request. None of these
diff --git a/src/Privacy/ErasureRequestStatus.php b/src/Privacy/Enums/ErasureRequestStatus.php
similarity index 79%
rename from src/Privacy/ErasureRequestStatus.php
rename to src/Privacy/Enums/ErasureRequestStatus.php
index 7b6507a..486327e 100644
--- a/src/Privacy/ErasureRequestStatus.php
+++ b/src/Privacy/Enums/ErasureRequestStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Privacy;
+namespace Modules\Core\Privacy\Enums;
 
 enum ErasureRequestStatus: string
 {
diff --git a/src/Privacy/ExportRequestStatus.php b/src/Privacy/Enums/ExportRequestStatus.php
similarity index 78%
rename from src/Privacy/ExportRequestStatus.php
rename to src/Privacy/Enums/ExportRequestStatus.php
index 1c966da..e8fd2f0 100644
--- a/src/Privacy/ExportRequestStatus.php
+++ b/src/Privacy/Enums/ExportRequestStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Privacy;
+namespace Modules\Core\Privacy\Enums;
 
 enum ExportRequestStatus: string
 {
diff --git a/src/Privacy/Events/PersonalDataGathered.php b/src/Privacy/Events/PersonalDataGathered.php
index 37318e6..e08f126 100644
--- a/src/Privacy/Events/PersonalDataGathered.php
+++ b/src/Privacy/Events/PersonalDataGathered.php
@@ -2,7 +2,7 @@
 
 namespace Modules\Core\Privacy\Events;
 
-use Modules\Core\Privacy\ExportReport;
+use Modules\Core\Privacy\DTOs\ExportReport;
 use Modules\Core\Privacy\Models\DataExportRequest;
 
 /**
diff --git a/src/Privacy/Filament/Extensions/CustomerErasureActionsExtension.php b/src/Privacy/Filament/Extensions/CustomerErasureActionsExtension.php
index 795a59e..e9eddd7 100644
--- a/src/Privacy/Filament/Extensions/CustomerErasureActionsExtension.php
+++ b/src/Privacy/Filament/Extensions/CustomerErasureActionsExtension.php
@@ -8,7 +8,7 @@ use Filament\Notifications\Notification;
 use Lunar\Admin\Support\Extending\BaseExtension;
 use Lunar\Models\Customer;
 use Modules\Core\Auth\Models\Staff;
-use Modules\Core\Privacy\PrivacyService;
+use Modules\Core\Privacy\Services\PrivacyService;
 
 /**
  * Adds "Request erasure" / "Request export" header actions to the Customer
diff --git a/src/Privacy/Filament/Resources/DataErasureRequestResource.php b/src/Privacy/Filament/Resources/DataErasureRequestResource.php
index 490e9f2..d339aec 100644
--- a/src/Privacy/Filament/Resources/DataErasureRequestResource.php
+++ b/src/Privacy/Filament/Resources/DataErasureRequestResource.php
@@ -15,10 +15,10 @@ use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
 use Lunar\Models\Customer;
-use Modules\Core\Privacy\ErasureRequestStatus;
+use Modules\Core\Privacy\Enums\ErasureRequestStatus;
 use Modules\Core\Privacy\Filament\Resources\DataErasureRequestResource\Pages;
 use Modules\Core\Privacy\Models\DataErasureRequest;
-use Modules\Core\Privacy\PrivacyService;
+use Modules\Core\Privacy\Services\PrivacyService;
 
 /**
  * Read-mostly audit view over data_erasure_requests — staff can see every request
diff --git a/src/Privacy/Filament/Resources/DataExportRequestResource.php b/src/Privacy/Filament/Resources/DataExportRequestResource.php
index e34e93d..2db16fa 100644
--- a/src/Privacy/Filament/Resources/DataExportRequestResource.php
+++ b/src/Privacy/Filament/Resources/DataExportRequestResource.php
@@ -13,7 +13,7 @@ use Filament\Resources\Resource;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
-use Modules\Core\Privacy\ExportRequestStatus;
+use Modules\Core\Privacy\Enums\ExportRequestStatus;
 use Modules\Core\Privacy\Filament\Resources\DataExportRequestResource\Pages;
 use Modules\Core\Privacy\Models\DataErasureRequest;
 use Modules\Core\Privacy\Models\DataExportRequest;
diff --git a/src/Privacy/Jobs/EraseDataSubjectJob.php b/src/Privacy/Jobs/EraseDataSubjectJob.php
index c616a1e..79ee473 100644
--- a/src/Privacy/Jobs/EraseDataSubjectJob.php
+++ b/src/Privacy/Jobs/EraseDataSubjectJob.php
@@ -8,7 +8,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Modules\Core\Privacy\Models\DataErasureRequest;
-use Modules\Core\Privacy\PrivacyService;
+use Modules\Core\Privacy\Services\PrivacyService;
 
 /**
  * Runs PrivacyService::completeErasure() for one due DataErasureRequest, dispatched
diff --git a/src/Privacy/Jobs/ExportDataSubjectJob.php b/src/Privacy/Jobs/ExportDataSubjectJob.php
index a9cbfef..d9bda4e 100644
--- a/src/Privacy/Jobs/ExportDataSubjectJob.php
+++ b/src/Privacy/Jobs/ExportDataSubjectJob.php
@@ -9,13 +9,13 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Event;
-use Modules\Core\Privacy\CustomerSubject;
+use Modules\Core\Privacy\DTOs\CustomerSubject;
 use Modules\Core\Privacy\Events\PersonalDataGathered;
-use Modules\Core\Privacy\ExportReport;
-use Modules\Core\Privacy\ExportRequestStatus;
+use Modules\Core\Privacy\DTOs\ExportReport;
+use Modules\Core\Privacy\Enums\ExportRequestStatus;
 use Modules\Core\Privacy\Models\DataExportRequest;
-use Modules\Core\Privacy\PrivacyManager;
-use Modules\Core\Privacy\UserSubject;
+use Modules\Core\Privacy\Services\PrivacyManager;
+use Modules\Core\Privacy\DTOs\UserSubject;
 
 /**
  * Gathers every registered PersonalDataProvider's export data for one request, all
@@ -27,7 +27,7 @@ use Modules\Core\Privacy\UserSubject;
  * generated PDF), that's the point to reconsider — not before.
  *
  * Calls each provider's *ForCustomer() or *ForUser() method depending on the
- * request's polymorphic subject — see Modules\Core\Privacy\PrivacyService and
+ * request's polymorphic subject — see Modules\Core\Privacy\Services\PrivacyService and
  * docs/privacy.md "User-scope vs Customer-scope".
  *
  * Writing the gathered data to a file is intentionally NOT done here — see
diff --git a/src/Privacy/Listeners/CancelErasureOnLoginListener.php b/src/Privacy/Listeners/CancelErasureOnLoginListener.php
index 1143ede..5819e30 100644
--- a/src/Privacy/Listeners/CancelErasureOnLoginListener.php
+++ b/src/Privacy/Listeners/CancelErasureOnLoginListener.php
@@ -4,9 +4,9 @@ namespace Modules\Core\Privacy\Listeners;
 
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Modules\Core\Auth\Events\UserAuthenticated;
-use Modules\Core\Privacy\ErasureRequestStatus;
+use Modules\Core\Privacy\Enums\ErasureRequestStatus;
 use Modules\Core\Privacy\Models\DataErasureRequest;
-use Modules\Core\Privacy\PrivacyService;
+use Modules\Core\Privacy\Services\PrivacyService;
 
 /**
  * Logging back in during a pending erasure request's grace period IS the "I
diff --git a/src/Privacy/Listeners/CascadeCustomerErasureListener.php b/src/Privacy/Listeners/CascadeCustomerErasureListener.php
index 9e43b63..a8cd9d2 100644
--- a/src/Privacy/Listeners/CascadeCustomerErasureListener.php
+++ b/src/Privacy/Listeners/CascadeCustomerErasureListener.php
@@ -7,7 +7,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Lunar\Base\LunarUser;
 use Lunar\Models\Customer;
 use Modules\Core\Privacy\Events\UserErasureRequested;
-use Modules\Core\Privacy\PrivacyService;
+use Modules\Core\Privacy\Services\PrivacyService;
 
 /**
  * When a User's erasure leaves a Customer account with no remaining User at all,
diff --git a/src/Privacy/Listeners/WriteExportToCsvListener.php b/src/Privacy/Listeners/WriteExportToCsvListener.php
index 6c053cf..3c902ca 100644
--- a/src/Privacy/Listeners/WriteExportToCsvListener.php
+++ b/src/Privacy/Listeners/WriteExportToCsvListener.php
@@ -8,7 +8,7 @@ use Modules\Core\Export\CsvColumn;
 use Modules\Core\Export\CsvWriter;
 use Modules\Core\Privacy\Events\PersonalDataExportFileWritten;
 use Modules\Core\Privacy\Events\PersonalDataGathered;
-use Modules\Core\Privacy\ExportRequestStatus;
+use Modules\Core\Privacy\Enums\ExportRequestStatus;
 use ZipArchive;
 
 /**
diff --git a/src/Privacy/Models/DataErasureRequest.php b/src/Privacy/Models/DataErasureRequest.php
index 6b5a8f9..0343f15 100644
--- a/src/Privacy/Models/DataErasureRequest.php
+++ b/src/Privacy/Models/DataErasureRequest.php
@@ -7,12 +7,12 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Lunar\Models\Customer;
-use Modules\Core\Privacy\ErasureRequestStatus;
+use Modules\Core\Privacy\Enums\ErasureRequestStatus;
 
 /**
  * A pending, cancelled, or completed right-of-erasure request — the grace-period
  * record between "subject/staff asked for this" and "providers actually erased
- * their data" (see Modules\Core\Privacy\PrivacyService, which creates/processes
+ * their data" (see Modules\Core\Privacy\Services\PrivacyService, which creates/processes
  * these).
  *
  * `subject` is polymorphic — either a Lunar Customer (business account) or a User
diff --git a/src/Privacy/Models/DataExportRequest.php b/src/Privacy/Models/DataExportRequest.php
index 74158de..f5c409c 100644
--- a/src/Privacy/Models/DataExportRequest.php
+++ b/src/Privacy/Models/DataExportRequest.php
@@ -5,7 +5,7 @@ namespace Modules\Core\Privacy\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Lunar\Models\Customer;
-use Modules\Core\Privacy\ExportRequestStatus;
+use Modules\Core\Privacy\Enums\ExportRequestStatus;
 
 /**
  * A right-of-access export request. Created synchronously (fast — one insert), then
diff --git a/src/Privacy/Providers/AddressDataProvider.php b/src/Privacy/Providers/AddressDataProvider.php
index 9dd4138..18e0184 100644
--- a/src/Privacy/Providers/AddressDataProvider.php
+++ b/src/Privacy/Providers/AddressDataProvider.php
@@ -4,11 +4,11 @@ namespace Modules\Core\Privacy\Providers;
 
 use Lunar\Models\Address;
 use Modules\Core\Privacy\Contracts\PersonalDataProvider;
-use Modules\Core\Privacy\CustomerSubject;
-use Modules\Core\Privacy\ErasureOutcome;
-use Modules\Core\Privacy\ProviderErasureResult;
-use Modules\Core\Privacy\ProviderExportResult;
-use Modules\Core\Privacy\UserSubject;
+use Modules\Core\Privacy\DTOs\CustomerSubject;
+use Modules\Core\Privacy\Enums\ErasureOutcome;
+use Modules\Core\Privacy\DTOs\ProviderErasureResult;
+use Modules\Core\Privacy\DTOs\ProviderExportResult;
+use Modules\Core\Privacy\DTOs\UserSubject;
 
 /**
  * A customer's saved addresses (lunar_addresses) — belong to the Customer
@@ -17,7 +17,8 @@ use Modules\Core\Privacy\UserSubject;
  * OrderAddress, handled by OrderDataProvider), so they're freely deleted outright
  * rather than pseudonymized in place.
  */
-class AddressDataProvider implements PersonalDataProvider
+class 
+AddressDataProvider implements PersonalDataProvider
 {
     public function name(): string
     {
diff --git a/src/Privacy/Providers/CartDataProvider.php b/src/Privacy/Providers/CartDataProvider.php
index 8ec2835..fd1043e 100644
--- a/src/Privacy/Providers/CartDataProvider.php
+++ b/src/Privacy/Providers/CartDataProvider.php
@@ -5,11 +5,11 @@ namespace Modules\Core\Privacy\Providers;
 use Lunar\Models\Cart;
 use Lunar\Models\CartAddress;
 use Modules\Core\Privacy\Contracts\PersonalDataProvider;
-use Modules\Core\Privacy\CustomerSubject;
-use Modules\Core\Privacy\ErasureOutcome;
-use Modules\Core\Privacy\ProviderErasureResult;
-use Modules\Core\Privacy\ProviderExportResult;
-use Modules\Core\Privacy\UserSubject;
+use Modules\Core\Privacy\DTOs\CustomerSubject;
+use Modules\Core\Privacy\Enums\ErasureOutcome;
+use Modules\Core\Privacy\DTOs\ProviderErasureResult;
+use Modules\Core\Privacy\DTOs\ProviderExportResult;
+use Modules\Core\Privacy\DTOs\UserSubject;
 
 /**
  * Carts and cart addresses (lunar_carts, lunar_cart_addresses) belong to the
diff --git a/src/Privacy/Providers/CustomerDataProvider.php b/src/Privacy/Providers/CustomerDataProvider.php
index 876d956..d2ad6e2 100644
--- a/src/Privacy/Providers/CustomerDataProvider.php
+++ b/src/Privacy/Providers/CustomerDataProvider.php
@@ -4,11 +4,11 @@ namespace Modules\Core\Privacy\Providers;
 
 use Lunar\Models\Customer;
 use Modules\Core\Privacy\Contracts\PersonalDataProvider;
-use Modules\Core\Privacy\CustomerSubject;
-use Modules\Core\Privacy\ErasureOutcome;
-use Modules\Core\Privacy\ProviderErasureResult;
-use Modules\Core\Privacy\ProviderExportResult;
-use Modules\Core\Privacy\UserSubject;
+use Modules\Core\Privacy\DTOs\CustomerSubject;
+use Modules\Core\Privacy\Enums\ErasureOutcome;
+use Modules\Core\Privacy\DTOs\ProviderErasureResult;
+use Modules\Core\Privacy\DTOs\ProviderExportResult;
+use Modules\Core\Privacy\DTOs\UserSubject;
 
 /**
  * The Customer record itself (lunar_customers) and, on the User side, the User's
diff --git a/src/Privacy/Providers/OrderDataProvider.php b/src/Privacy/Providers/OrderDataProvider.php
index f3d8f16..c73fd1c 100644
--- a/src/Privacy/Providers/OrderDataProvider.php
+++ b/src/Privacy/Providers/OrderDataProvider.php
@@ -5,11 +5,11 @@ namespace Modules\Core\Privacy\Providers;
 use Lunar\Models\Order;
 use Lunar\Models\OrderAddress;
 use Modules\Core\Privacy\Contracts\PersonalDataProvider;
-use Modules\Core\Privacy\CustomerSubject;
-use Modules\Core\Privacy\ErasureOutcome;
-use Modules\Core\Privacy\ProviderErasureResult;
-use Modules\Core\Privacy\ProviderExportResult;
-use Modules\Core\Privacy\UserSubject;
+use Modules\Core\Privacy\DTOs\CustomerSubject;
+use Modules\Core\Privacy\Enums\ErasureOutcome;
+use Modules\Core\Privacy\DTOs\ProviderErasureResult;
+use Modules\Core\Privacy\DTOs\ProviderExportResult;
+use Modules\Core\Privacy\DTOs\UserSubject;
 
 /**
  * Orders and order addresses (lunar_orders, lunar_order_addresses) belong to the
diff --git a/src/Privacy/Providers/ReviewDataProvider.php b/src/Privacy/Providers/ReviewDataProvider.php
index a3bebbe..a9bcc59 100644
--- a/src/Privacy/Providers/ReviewDataProvider.php
+++ b/src/Privacy/Providers/ReviewDataProvider.php
@@ -4,11 +4,11 @@ namespace Modules\Core\Privacy\Providers;
 
 use Illuminate\Database\Eloquent\Builder;
 use Modules\Core\Privacy\Contracts\PersonalDataProvider;
-use Modules\Core\Privacy\CustomerSubject;
-use Modules\Core\Privacy\ErasureOutcome;
-use Modules\Core\Privacy\ProviderErasureResult;
-use Modules\Core\Privacy\ProviderExportResult;
-use Modules\Core\Privacy\UserSubject;
+use Modules\Core\Privacy\DTOs\CustomerSubject;
+use Modules\Core\Privacy\Enums\ErasureOutcome;
+use Modules\Core\Privacy\DTOs\ProviderErasureResult;
+use Modules\Core\Privacy\DTOs\ProviderExportResult;
+use Modules\Core\Privacy\DTOs\UserSubject;
 use Modules\Core\Review\Models\ProductReview;
 
 /**
diff --git a/src/Privacy/RelationManagers/ErasureRequestsRelationManager.php b/src/Privacy/RelationManagers/ErasureRequestsRelationManager.php
index c8b4798..340db1b 100644
--- a/src/Privacy/RelationManagers/ErasureRequestsRelationManager.php
+++ b/src/Privacy/RelationManagers/ErasureRequestsRelationManager.php
@@ -8,10 +8,10 @@ use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
-use Modules\Core\Privacy\ErasureRequestStatus;
+use Modules\Core\Privacy\Enums\ErasureRequestStatus;
 use Modules\Core\Privacy\Filament\Resources\DataErasureRequestResource;
 use Modules\Core\Privacy\Models\DataErasureRequest;
-use Modules\Core\Privacy\PrivacyService;
+use Modules\Core\Privacy\Services\PrivacyService;
 
 /**
  * Lists erasure requests where the record being viewed (Customer or User) is the
diff --git a/src/Privacy/RelationManagers/ExportRequestsRelationManager.php b/src/Privacy/RelationManagers/ExportRequestsRelationManager.php
index 91ace45..ed4cb2d 100644
--- a/src/Privacy/RelationManagers/ExportRequestsRelationManager.php
+++ b/src/Privacy/RelationManagers/ExportRequestsRelationManager.php
@@ -8,7 +8,7 @@ use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
-use Modules\Core\Privacy\ExportRequestStatus;
+use Modules\Core\Privacy\Enums\ExportRequestStatus;
 use Modules\Core\Privacy\Filament\Resources\DataExportRequestResource;
 use Modules\Core\Privacy\Models\DataExportRequest;
 
diff --git a/src/Privacy/RelationManagers/UserRelationManager.php b/src/Privacy/RelationManagers/UserRelationManager.php
index f22016b..121644b 100644
--- a/src/Privacy/RelationManagers/UserRelationManager.php
+++ b/src/Privacy/RelationManagers/UserRelationManager.php
@@ -11,7 +11,7 @@ use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Model;
 use Modules\Core\Customer\RelationManagers\UserRelationManager as CoreUserRelationManager;
 use Modules\Core\Privacy\Models\DataErasureRequest;
-use Modules\Core\Privacy\PrivacyService;
+use Modules\Core\Privacy\Services\PrivacyService;
 
 /**
  * Extends core's own Customer -> User relation manager to add:
diff --git a/src/Privacy/PrivacyManager.php b/src/Privacy/Services/PrivacyManager.php
similarity index 97%
rename from src/Privacy/PrivacyManager.php
rename to src/Privacy/Services/PrivacyManager.php
index dbea65b..06432dd 100644
--- a/src/Privacy/PrivacyManager.php
+++ b/src/Privacy/Services/PrivacyManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Privacy;
+namespace Modules\Core\Privacy\Services;
 
 use LogicException;
 use Illuminate\Contracts\Container\Container;
diff --git a/src/Privacy/PrivacyService.php b/src/Privacy/Services/PrivacyService.php
similarity index 97%
rename from src/Privacy/PrivacyService.php
rename to src/Privacy/Services/PrivacyService.php
index 830600f..663871c 100644
--- a/src/Privacy/PrivacyService.php
+++ b/src/Privacy/Services/PrivacyService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Core\Privacy;
+namespace Modules\Core\Privacy\Services;
 
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Database\Eloquent\Model;
@@ -8,6 +8,12 @@ use Illuminate\Support\Facades\Event;
 use Lunar\Base\LunarUser;
 use Lunar\Models\Customer;
 use Modules\Core\Auth\Models\Staff;
+use Modules\Core\Privacy\DTOs\CustomerSubject;
+use Modules\Core\Privacy\DTOs\ErasureReport;
+use Modules\Core\Privacy\DTOs\ProviderErasureResult;
+use Modules\Core\Privacy\DTOs\UserSubject;
+use Modules\Core\Privacy\Enums\ErasureRequestStatus;
+use Modules\Core\Privacy\Enums\ExportRequestStatus;
 use Modules\Core\Privacy\Events\UserErasureRequested;
 use Modules\Core\Privacy\Jobs\ExportDataSubjectJob;
 use Modules\Core\Privacy\Models\DataErasureRequest;