diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
index 96833671..46f7054d 100644
--- a/.github/workflows/check.yaml
+++ b/.github/workflows/check.yaml
@@ -101,7 +101,9 @@ jobs:
               uses: ramsey/composer-install@4.0.0
 
             - name: Apply tests ${{ matrix.php-version }} (parallel)
-              run: php artisan test --parallel --exclude-group=modules
+              run: php artisan test --parallel --exclude-group=modules --exclude-group=architecture
 
-            - name: Apply module tests ${{ matrix.php-version }} (serial)
-              run: php artisan test --group=modules
+            - name: Apply module and architecture tests ${{ matrix.php-version }} (serial)
+              run: |
+                  php artisan test --group=modules
+                  php artisan test --group=architecture
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index e0a248d7..5048b3ca 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -33,7 +33,9 @@ jobs:
         uses: ramsey/composer-install@4.0.0
 
       - name: Apply tests ${{ matrix.php-version }} (parallel)
-        run: php artisan test --parallel --exclude-group=modules
+        run: php artisan test --parallel --exclude-group=modules --exclude-group=architecture
 
-      - name: Apply module tests ${{ matrix.php-version }} (serial)
-        run: php artisan test --group=modules
+      - name: Apply module and architecture tests ${{ matrix.php-version }} (serial)
+        run: |
+          php artisan test --group=modules
+          php artisan test --group=architecture
diff --git a/app/Adapters/Accounts/EloquentBusinessDefaultsProvisioner.php b/app/Adapters/Accounts/EloquentBusinessDefaultsProvisioner.php
new file mode 100644
index 00000000..3b6771c1
--- /dev/null
+++ b/app/Adapters/Accounts/EloquentBusinessDefaultsProvisioner.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Adapters\Accounts;
+
+use App\Domains\Accounts\Contracts\CompanyDefaultsProvisioner;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Catalog\Models\Unit;
+use App\Domains\Receivables\Models\PaymentMethod;
+
+class EloquentBusinessDefaultsProvisioner implements CompanyDefaultsProvisioner
+{
+    public function provision(Company $company): void
+    {
+        foreach (['Cash', 'Check', 'Credit Card', 'Bank Transfer'] as $name) {
+            PaymentMethod::create([
+                'name' => $name,
+                'company_id' => $company->id,
+            ]);
+        }
+
+        foreach (['box', 'cm', 'dz', 'ft', 'g', 'in', 'kg', 'km', 'lb', 'mg', 'pc'] as $name) {
+            Unit::create([
+                'name' => $name,
+                'company_id' => $company->id,
+            ]);
+        }
+    }
+}
diff --git a/app/Adapters/Accounts/EloquentCompanyAddressWriter.php b/app/Adapters/Accounts/EloquentCompanyAddressWriter.php
new file mode 100644
index 00000000..5a04f777
--- /dev/null
+++ b/app/Adapters/Accounts/EloquentCompanyAddressWriter.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Adapters\Accounts;
+
+use App\Domains\Accounts\Contracts\CompanyAddressWriter;
+use App\Domains\Accounts\Models\Company;
+
+class EloquentCompanyAddressWriter implements CompanyAddressWriter
+{
+    public function upsert(Company $company, array $attributes): void
+    {
+        $company->address()->updateOrCreate(
+            ['company_id' => $company->id],
+            $attributes,
+        );
+    }
+}
diff --git a/app/Adapters/Accounts/EloquentCompanyDataPurger.php b/app/Adapters/Accounts/EloquentCompanyDataPurger.php
new file mode 100644
index 00000000..27d179f8
--- /dev/null
+++ b/app/Adapters/Accounts/EloquentCompanyDataPurger.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Adapters\Accounts;
+
+use App\Domains\Accounts\Contracts\CompanyDataPurger;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use Illuminate\Database\Eloquent\Model;
+
+class EloquentCompanyDataPurger implements CompanyDataPurger
+{
+    public function purge(Company $company): void
+    {
+        $company->exchangeRateLogs()->delete();
+        $company->exchangeRateProviders()->delete();
+        $company->expenses->each->delete();
+        $company->expenseCategories()->delete();
+
+        PaymentAllocation::query()
+            ->whereIn('payment_id', $company->payments()->select('id'))
+            ->delete();
+        $company->payments()->delete();
+        $company->paymentMethods()->delete();
+        $company->customFieldValues()->delete();
+        $company->customFields()->delete();
+
+        $company->invoices->each(function (Model $invoice): void {
+            $this->clearDocumentData($invoice);
+            $invoice->transactions()->delete();
+        });
+        $company->invoices()->delete();
+
+        $company->recurringInvoices->each(fn (Model $invoice) => $this->clearDocumentData($invoice));
+        $company->recurringInvoices()->delete();
+
+        $company->estimates->each(fn (Model $estimate) => $this->clearDocumentData($estimate));
+        $company->estimates()->delete();
+
+        $company->items()->delete();
+        $company->taxTypes()->delete();
+
+        $company->customers->each(function (Model $customer): void {
+            $customer->addresses()->delete();
+            $customer->delete();
+        });
+
+        $company->address()->delete();
+    }
+
+    private function clearDocumentData(Model $document): void
+    {
+        $document->items->each(function (Model $item): void {
+            $item->taxes()->delete();
+            $item->delete();
+        });
+
+        $document->taxes()->delete();
+    }
+}
diff --git a/app/Adapters/Accounts/EloquentMemberReferencesCleaner.php b/app/Adapters/Accounts/EloquentMemberReferencesCleaner.php
new file mode 100644
index 00000000..91a11767
--- /dev/null
+++ b/app/Adapters/Accounts/EloquentMemberReferencesCleaner.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Adapters\Accounts;
+
+use App\Domains\Accounts\Contracts\MemberReferencesCleaner;
+use App\Domains\Accounts\Models\User;
+
+class EloquentMemberReferencesCleaner implements MemberReferencesCleaner
+{
+    public function clear(User $user): void
+    {
+        $user->invoices()->update(['creator_id' => null]);
+        $user->estimates()->update(['creator_id' => null]);
+        $user->customers()->update(['creator_id' => null]);
+        $user->recurringInvoices()->update(['creator_id' => null]);
+        $user->expenses()->update(['creator_id' => null]);
+        $user->payments()->update(['creator_id' => null]);
+        $user->items()->update(['creator_id' => null]);
+    }
+}
diff --git a/app/Adapters/Accounts/LaravelCompanyInvitationSender.php b/app/Adapters/Accounts/LaravelCompanyInvitationSender.php
new file mode 100644
index 00000000..ca56120f
--- /dev/null
+++ b/app/Adapters/Accounts/LaravelCompanyInvitationSender.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Adapters\Accounts;
+
+use App\Domains\Accounts\Contracts\CompanyInvitationSender;
+use App\Domains\Accounts\Mail\CompanyInvitationMail;
+use App\Domains\Accounts\Models\CompanyInvitation;
+use Illuminate\Support\Facades\Mail;
+
+class LaravelCompanyInvitationSender implements CompanyInvitationSender
+{
+    public function send(CompanyInvitation $invitation): void
+    {
+        Mail::to($invitation->email)->send(new CompanyInvitationMail($invitation));
+    }
+}
diff --git a/app/Adapters/Accounts/MediaLibraryCompanyLogoManager.php b/app/Adapters/Accounts/MediaLibraryCompanyLogoManager.php
new file mode 100644
index 00000000..4e254424
--- /dev/null
+++ b/app/Adapters/Accounts/MediaLibraryCompanyLogoManager.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Adapters\Accounts;
+
+use App\Domains\Accounts\Contracts\CompanyLogoManager;
+use App\Domains\Accounts\Models\Company;
+
+class MediaLibraryCompanyLogoManager implements CompanyLogoManager
+{
+    private const COLLECTION = 'logo';
+
+    public function clear(Company $company): void
+    {
+        $company->clearMediaCollection(self::COLLECTION);
+    }
+
+    public function replaceBase64(Company $company, string $contents, string $fileName): void
+    {
+        $this->clear($company);
+        $company->addMediaFromBase64($contents)
+            ->usingFileName($fileName)
+            ->toMediaCollection(self::COLLECTION);
+    }
+}
diff --git a/app/Adapters/Accounts/MediaLibraryUserAvatarManager.php b/app/Adapters/Accounts/MediaLibraryUserAvatarManager.php
new file mode 100644
index 00000000..bc6366dd
--- /dev/null
+++ b/app/Adapters/Accounts/MediaLibraryUserAvatarManager.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Adapters\Accounts;
+
+use App\Domains\Accounts\Contracts\UserAvatarManager;
+use App\Domains\Accounts\Models\User;
+
+class MediaLibraryUserAvatarManager implements UserAvatarManager
+{
+    private const COLLECTION = 'admin_avatar';
+
+    public function clear(User $user): void
+    {
+        $user->clearMediaCollection(self::COLLECTION);
+    }
+
+    public function replaceFile(User $user, string $path, string $fileName): void
+    {
+        $this->clear($user);
+        $user->addMedia($path)
+            ->usingFileName($fileName)
+            ->toMediaCollection(self::COLLECTION);
+    }
+
+    public function replaceBase64(User $user, string $contents, string $fileName): void
+    {
+        $this->clear($user);
+        $user->addMediaFromBase64($contents)
+            ->usingFileName($fileName)
+            ->toMediaCollection(self::COLLECTION);
+    }
+}
diff --git a/app/Adapters/Catalog/TaxationItemTaxManager.php b/app/Adapters/Catalog/TaxationItemTaxManager.php
new file mode 100644
index 00000000..f7e7acec
--- /dev/null
+++ b/app/Adapters/Catalog/TaxationItemTaxManager.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Adapters\Catalog;
+
+use App\Domains\Catalog\Contracts\ItemTaxManager;
+use App\Domains\Catalog\Models\Item;
+
+class TaxationItemTaxManager implements ItemTaxManager
+{
+    public function attach(Item $item, array $taxes, int $companyId): void
+    {
+        if ($taxes === []) {
+            return;
+        }
+
+        $item->update(['tax_per_item' => true]);
+
+        foreach ($taxes as $tax) {
+            $item->taxes()->create([
+                ...$tax,
+                'company_id' => $companyId,
+            ]);
+        }
+    }
+
+    public function replace(Item $item, array $taxes, int $companyId): void
+    {
+        $item->taxes()->delete();
+
+        $this->attach($item, $taxes, $companyId);
+    }
+}
diff --git a/app/Adapters/Contacts/EloquentCustomerDataPurger.php b/app/Adapters/Contacts/EloquentCustomerDataPurger.php
new file mode 100644
index 00000000..603380af
--- /dev/null
+++ b/app/Adapters/Contacts/EloquentCustomerDataPurger.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Adapters\Contacts;
+
+use App\Domains\Contacts\Contracts\CustomerDataPurger;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Models\Invoice;
+use Illuminate\Database\Eloquent\Model;
+
+class EloquentCustomerDataPurger implements CustomerDataPurger
+{
+    public function purge(Customer $customer): void
+    {
+        $customer->estimates->each(function (Model $estimate): void {
+            $this->clearDocumentData($estimate);
+            $estimate->delete();
+        });
+
+        PaymentAllocation::query()
+            ->whereIn('payment_id', $customer->payments()->select('id'))
+            ->delete();
+        $customer->payments->each->delete();
+
+        $invoiceIds = $customer->invoices()->pluck('id');
+        $customer->invoices->each(function (Invoice $invoice): void {
+            $this->clearDocumentData($invoice);
+            $invoice->transactions()->delete();
+            $invoice->delete();
+        });
+        Invoice::query()->whereIn('related_invoice_id', $invoiceIds)->update(['related_invoice_id' => null]);
+
+        $customer->expenses->each->delete();
+
+        $customer->recurringInvoices->each(function (Model $recurringInvoice): void {
+            $this->clearDocumentData($recurringInvoice);
+            $recurringInvoice->delete();
+        });
+    }
+
+    private function clearDocumentData(Model $document): void
+    {
+        $document->items->each(function (Model $item): void {
+            $item->taxes()->delete();
+            $item->delete();
+        });
+
+        $document->taxes()->delete();
+    }
+}
diff --git a/app/Adapters/Contacts/EloquentCustomerPortalDashboardProvider.php b/app/Adapters/Contacts/EloquentCustomerPortalDashboardProvider.php
new file mode 100644
index 00000000..064e1b32
--- /dev/null
+++ b/app/Adapters/Contacts/EloquentCustomerPortalDashboardProvider.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Adapters\Contacts;
+
+use App\Domains\Contacts\Contracts\CustomerPortalDashboardProvider;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+
+class EloquentCustomerPortalDashboardProvider implements CustomerPortalDashboardProvider
+{
+    public function get(Customer $customer): array
+    {
+        $issuedInvoices = Invoice::whereCustomer($customer->id)
+            ->where('status', '<>', 'DRAFT');
+
+        return [
+            'due_amount' => (clone $issuedInvoices)->sum('due_amount'),
+            'recentInvoices' => (clone $issuedInvoices)->take(5)->latest()->get(),
+            'recentEstimates' => Estimate::whereCustomer($customer->id)
+                ->where('status', '<>', 'DRAFT')
+                ->take(5)
+                ->latest()
+                ->get(),
+            'invoice_count' => (clone $issuedInvoices)->where('type', Invoice::TYPE_INVOICE)->count(),
+            'estimate_count' => Estimate::whereCustomer($customer->id)
+                ->where('status', '<>', 'DRAFT')
+                ->count(),
+            'payment_count' => Payment::whereCustomer($customer->id)->count(),
+        ];
+    }
+}
diff --git a/app/Adapters/Contacts/EloquentCustomerStatsProvider.php b/app/Adapters/Contacts/EloquentCustomerStatsProvider.php
new file mode 100644
index 00000000..965c5a6f
--- /dev/null
+++ b/app/Adapters/Contacts/EloquentCustomerStatsProvider.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Adapters\Contacts;
+
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Contracts\CustomerStatsProvider;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Invoice;
+use Carbon\Carbon;
+
+class EloquentCustomerStatsProvider implements CustomerStatsProvider
+{
+    public function get(Customer $customer, int $companyId, bool $previousYear = false): array
+    {
+        $i = 0;
+        $months = [];
+        $invoiceTotals = [];
+        $expenseTotals = [];
+        $receiptTotals = [];
+        $netProfits = [];
+        $monthCounter = 0;
+        $fiscalYear = CompanySetting::getSetting('fiscal_year', $companyId);
+        $startDate = Carbon::now();
+        $start = Carbon::now();
+        $end = Carbon::now();
+        $terms = explode('-', $fiscalYear);
+        $companyStartMonth = intval($terms[0]);
+
+        if ($companyStartMonth <= $start->month) {
+            $startDate->month($companyStartMonth)->startOfMonth();
+            $start->month($companyStartMonth)->startOfMonth();
+            $end->month($companyStartMonth)->endOfMonth();
+        } else {
+            $startDate->subYear()->month($companyStartMonth)->startOfMonth();
+            $start->subYear()->month($companyStartMonth)->startOfMonth();
+            $end->subYear()->month($companyStartMonth)->endOfMonth();
+        }
+
+        if ($previousYear) {
+            $startDate->subYear()->startOfMonth();
+            $start->subYear()->startOfMonth();
+            $end->subYear()->endOfMonth();
+        }
+
+        while ($monthCounter < 12) {
+            $invoiceTotals[] = Invoice::whereBetween(
+                'invoice_date',
+                [$start->format('Y-m-d'), $end->format('Y-m-d')]
+            )
+                ->whereCompany()
+                ->whereCustomer($customer->id)
+                ->sum('base_total') ?? 0;
+            $expenseTotals[] = Expense::whereBetween(
+                'expense_date',
+                [$start->format('Y-m-d'), $end->format('Y-m-d')]
+            )
+                ->whereCompany()
+                ->whereUser($customer->id)
+                ->sum('base_amount') ?? 0;
+            $receiptTotals[] = Payment::whereBetween(
+                'payment_date',
+                [$start->format('Y-m-d'), $end->format('Y-m-d')]
+            )
+                ->whereCompany()
+                ->whereCustomer($customer->id)
+                ->sum('base_amount') ?? 0;
+            $netProfits[] = $receiptTotals[$i] - $expenseTotals[$i];
+            $i++;
+            $months[] = $start->translatedFormat('M');
+            $monthCounter++;
+            $end->startOfMonth();
+            $start->addMonth()->startOfMonth();
+            $end->addMonth()->endOfMonth();
+        }
+
+        $start->subMonth()->endOfMonth();
+
+        $salesTotal = Invoice::whereBetween(
+            'invoice_date',
+            [$startDate->format('Y-m-d'), $start->format('Y-m-d')]
+        )
+            ->whereCompany()
+            ->whereCustomer($customer->id)
+            ->sum('base_total');
+        $totalReceipts = Payment::whereBetween(
+            'payment_date',
+            [$startDate->format('Y-m-d'), $start->format('Y-m-d')]
+        )
+            ->whereCompany()
+            ->whereCustomer($customer->id)
+            ->sum('base_amount');
+        $totalExpenses = Expense::whereBetween(
+            'expense_date',
+            [$startDate->format('Y-m-d'), $start->format('Y-m-d')]
+        )
+            ->whereCompany()
+            ->whereUser($customer->id)
+            ->sum('base_amount');
+
+        return [
+            'months' => $months,
+            'invoiceTotals' => $invoiceTotals,
+            'expenseTotals' => $expenseTotals,
+            'receiptTotals' => $receiptTotals,
+            'netProfit' => (int) $totalReceipts - (int) $totalExpenses,
+            'netProfits' => $netProfits,
+            'salesTotal' => $salesTotal,
+            'totalReceipts' => $totalReceipts,
+            'totalExpenses' => $totalExpenses,
+        ];
+    }
+}
diff --git a/app/Adapters/Contacts/MediaLibraryCustomerAvatarManager.php b/app/Adapters/Contacts/MediaLibraryCustomerAvatarManager.php
new file mode 100644
index 00000000..6d0e34d4
--- /dev/null
+++ b/app/Adapters/Contacts/MediaLibraryCustomerAvatarManager.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Adapters\Contacts;
+
+use App\Domains\Contacts\Contracts\CustomerAvatarManager;
+use App\Domains\Contacts\Models\Customer;
+
+class MediaLibraryCustomerAvatarManager implements CustomerAvatarManager
+{
+    private const COLLECTION = 'customer_avatar';
+
+    public function clear(Customer $customer): void
+    {
+        $customer->clearMediaCollection(self::COLLECTION);
+    }
+
+    public function replace(Customer $customer, string $path, string $fileName): void
+    {
+        $this->clear($customer);
+        $customer->addMedia($path)
+            ->usingFileName($fileName)
+            ->toMediaCollection(self::COLLECTION);
+    }
+}
diff --git a/app/Adapters/Money/EloquentExchangeRateBackfill.php b/app/Adapters/Money/EloquentExchangeRateBackfill.php
new file mode 100644
index 00000000..5f18e8f5
--- /dev/null
+++ b/app/Adapters/Money/EloquentExchangeRateBackfill.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Adapters\Money;
+
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Money\Contracts\ExchangeRateBackfill;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Taxation\Models\Tax;
+
+/**
+ * Coordinates the one-time exchange-rate backfill across durable document
+ * tables while the Money context owns the workflow contract.
+ */
+class EloquentExchangeRateBackfill implements ExchangeRateBackfill
+{
+    public function currencyIdsMissingRates(): array
+    {
+        return array_merge(
+            Invoice::whereNull('exchange_rate')->pluck('currency_id')->all(),
+            Tax::whereNull('exchange_rate')->pluck('currency_id')->all(),
+            Estimate::whereNull('exchange_rate')->pluck('currency_id')->all(),
+            Payment::whereNull('exchange_rate')->pluck('currency_id')->all(),
+        );
+    }
+
+    public function apply(int $companyId, array $currencies): bool
+    {
+        if (CompanySetting::getSetting('bulk_exchange_rate_configured', $companyId) !== 'NO') {
+            return false;
+        }
+
+        foreach ($currencies as $currency) {
+            $rate = $currency['exchange_rate'] ?? 1;
+
+            foreach (Invoice::where('currency_id', $currency['id'])->get() as $invoice) {
+                $invoice->update([
+                    'exchange_rate' => $rate,
+                    'base_discount_val' => $invoice->sub_total * $rate,
+                    'base_sub_total' => $invoice->sub_total * $rate,
+                    'base_total' => $invoice->total * $rate,
+                    'base_tax' => $invoice->tax * $rate,
+                    'base_due_amount' => $invoice->due_amount * $rate,
+                ]);
+
+                $this->updateItemsExchangeRate($invoice);
+            }
+
+            foreach (Estimate::where('currency_id', $currency['id'])->get() as $estimate) {
+                $estimate->update([
+                    'exchange_rate' => $rate,
+                    'base_discount_val' => $estimate->sub_total * $rate,
+                    'base_sub_total' => $estimate->sub_total * $rate,
+                    'base_total' => $estimate->total * $rate,
+                    'base_tax' => $estimate->tax * $rate,
+                ]);
+
+                $this->updateItemsExchangeRate($estimate);
+            }
+
+            foreach (Tax::where('currency_id', $currency['id'])->get() as $tax) {
+                $tax->update(['base_amount' => $tax->base_amount * $rate]);
+            }
+
+            foreach (Payment::where('currency_id', $currency['id'])->get() as $payment) {
+                $payment->update([
+                    'exchange_rate' => $rate,
+                    'base_amount' => $payment->amount * $rate,
+                ]);
+            }
+        }
+
+        CompanySetting::setSettings([
+            'bulk_exchange_rate_configured' => 'YES',
+        ], $companyId);
+
+        return true;
+    }
+
+    private function updateItemsExchangeRate(mixed $document): void
+    {
+        foreach ($document->items as $item) {
+            $item->update([
+                'exchange_rate' => $document->exchange_rate,
+                'base_discount_val' => $item->discount_val * $document->exchange_rate,
+                'base_price' => $item->price * $document->exchange_rate,
+                'base_tax' => $item->tax * $document->exchange_rate,
+                'base_total' => $item->total * $document->exchange_rate,
+            ]);
+
+            $this->updateTaxesExchangeRate($item);
+        }
+
+        $this->updateTaxesExchangeRate($document);
+    }
+
+    private function updateTaxesExchangeRate(mixed $taxable): void
+    {
+        if (! $taxable->taxes()->exists()) {
+            return;
+        }
+
+        $taxable->taxes->each(function ($tax) use ($taxable): void {
+            $tax->update([
+                'exchange_rate' => $taxable->exchange_rate,
+                'base_amount' => $tax->amount * $taxable->exchange_rate,
+            ]);
+        });
+    }
+}
diff --git a/app/Adapters/Purchases/MediaLibraryExpenseReceiptManager.php b/app/Adapters/Purchases/MediaLibraryExpenseReceiptManager.php
new file mode 100644
index 00000000..aea4301e
--- /dev/null
+++ b/app/Adapters/Purchases/MediaLibraryExpenseReceiptManager.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Adapters\Purchases;
+
+use App\Domains\Purchases\Contracts\ExpenseReceiptManager;
+use App\Domains\Purchases\Data\PendingExpenseReceipt;
+use App\Domains\Purchases\Data\StoredExpenseReceipt;
+use App\Domains\Purchases\Models\Expense;
+
+class MediaLibraryExpenseReceiptManager implements ExpenseReceiptManager
+{
+    private const COLLECTION = 'receipts';
+
+    public function attach(Expense $expense, PendingExpenseReceipt $receipt): void
+    {
+        $expense->addMedia($receipt->path)
+            ->usingFileName($receipt->fileName)
+            ->toMediaCollection(self::COLLECTION);
+    }
+
+    public function replace(Expense $expense, PendingExpenseReceipt $receipt): void
+    {
+        $this->clear($expense);
+        $this->attach($expense, $receipt);
+    }
+
+    public function attachBase64(
+        Expense $expense,
+        string $contents,
+        string $fileName,
+        bool $replaceExisting,
+    ): void {
+        if ($replaceExisting) {
+            $this->clear($expense);
+        }
+
+        $expense->addMediaFromBase64($contents)
+            ->usingFileName($fileName)
+            ->toMediaCollection(self::COLLECTION);
+    }
+
+    public function clear(Expense $expense): void
+    {
+        $expense->clearMediaCollection(self::COLLECTION);
+    }
+
+    public function first(Expense $expense): ?StoredExpenseReceipt
+    {
+        $media = $expense->getFirstMedia(self::COLLECTION);
+
+        if (! $media) {
+            return null;
+        }
+
+        return new StoredExpenseReceipt($media->getPath(), $media->file_name);
+    }
+}
diff --git a/app/Adapters/Purchases/MoneyExpenseExchangeRateRecorder.php b/app/Adapters/Purchases/MoneyExpenseExchangeRateRecorder.php
new file mode 100644
index 00000000..97029078
--- /dev/null
+++ b/app/Adapters/Purchases/MoneyExpenseExchangeRateRecorder.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Adapters\Purchases;
+
+use App\Domains\Money\Models\ExchangeRateLog;
+use App\Domains\Purchases\Contracts\ExpenseExchangeRateRecorder;
+use App\Domains\Purchases\Models\Expense;
+
+class MoneyExpenseExchangeRateRecorder implements ExpenseExchangeRateRecorder
+{
+    public function record(Expense $expense): void
+    {
+        ExchangeRateLog::addExchangeRateLog($expense);
+    }
+}
diff --git a/app/Adapters/Purchases/TaxationExpenseTaxManager.php b/app/Adapters/Purchases/TaxationExpenseTaxManager.php
new file mode 100644
index 00000000..99b8380a
--- /dev/null
+++ b/app/Adapters/Purchases/TaxationExpenseTaxManager.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Adapters\Purchases;
+
+use App\Domains\Purchases\Contracts\ExpenseTaxManager;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Taxation\Models\TaxType;
+
+class TaxationExpenseTaxManager implements ExpenseTaxManager
+{
+    public function replace(Expense $expense, array $taxes): void
+    {
+        $this->clear($expense);
+
+        if ($taxes === []) {
+            return;
+        }
+
+        $taxTypes = TaxType::query()
+            ->where('company_id', $expense->company_id)
+            ->where('type', TaxType::TYPE_GENERAL)
+            ->whereTransactionType(TaxType::TRANSACTION_TYPE_PURCHASES)
+            ->whereIn('id', collect($taxes)->pluck('tax_type_id'))
+            ->get()
+            ->keyBy('id');
+
+        foreach ($taxes as $tax) {
+            $taxType = $taxTypes->get($tax['tax_type_id']);
+
+            $expense->taxes()->create([
+                'tax_type_id' => $taxType->id,
+                'company_id' => $expense->company_id,
+                'currency_id' => $expense->currency_id,
+                'exchange_rate' => $expense->exchange_rate,
+                'amount' => (int) $tax['amount'],
+                'base_amount' => (int) round($tax['amount'] * $expense->exchange_rate),
+                'name' => $taxType->name,
+                'percent' => $taxType->percent,
+                'fixed_amount' => $taxType->fixed_amount,
+                'calculation_type' => $taxType->calculation_type,
+                'compound_tax' => $taxType->compound_tax,
+            ]);
+        }
+    }
+
+    public function clear(Expense $expense): void
+    {
+        $expense->taxes()->delete();
+    }
+}
diff --git a/app/Adapters/Receivables/LaravelPaymentEmailSender.php b/app/Adapters/Receivables/LaravelPaymentEmailSender.php
new file mode 100644
index 00000000..285b6d5f
--- /dev/null
+++ b/app/Adapters/Receivables/LaravelPaymentEmailSender.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Adapters\Receivables;
+
+use App\Domains\Receivables\Contracts\PaymentEmailSender;
+use App\Domains\Receivables\Mail\SendPaymentMail;
+use Illuminate\Support\Facades\Mail;
+
+class LaravelPaymentEmailSender implements PaymentEmailSender
+{
+    public function send(array $data): void
+    {
+        $mail = Mail::to($data['to']);
+
+        if (! empty($data['cc'])) {
+            $mail->cc($data['cc']);
+        }
+
+        if (! empty($data['bcc'])) {
+            $mail->bcc($data['bcc']);
+        }
+
+        $mail->send(new SendPaymentMail($data));
+    }
+}
diff --git a/app/Adapters/Receivables/MoneyPaymentExchangeRateRecorder.php b/app/Adapters/Receivables/MoneyPaymentExchangeRateRecorder.php
new file mode 100644
index 00000000..c6ee1204
--- /dev/null
+++ b/app/Adapters/Receivables/MoneyPaymentExchangeRateRecorder.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Adapters\Receivables;
+
+use App\Domains\Money\Models\ExchangeRateLog;
+use App\Domains\Receivables\Contracts\PaymentExchangeRateRecorder;
+use App\Domains\Receivables\Models\Payment;
+
+class MoneyPaymentExchangeRateRecorder implements PaymentExchangeRateRecorder
+{
+    public function record(Payment $payment): void
+    {
+        ExchangeRateLog::addExchangeRateLog($payment);
+    }
+}
diff --git a/app/Adapters/Receivables/SalesInvoiceBalanceUpdater.php b/app/Adapters/Receivables/SalesInvoiceBalanceUpdater.php
new file mode 100644
index 00000000..8f8907a8
--- /dev/null
+++ b/app/Adapters/Receivables/SalesInvoiceBalanceUpdater.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Adapters\Receivables;
+
+use App\Domains\Receivables\Contracts\InvoiceBalanceUpdater;
+use App\Domains\Sales\Application\InvoiceBalanceService;
+use App\Domains\Sales\Models\Invoice;
+
+class SalesInvoiceBalanceUpdater implements InvoiceBalanceUpdater
+{
+    public function __construct(
+        private readonly InvoiceBalanceService $invoiceBalanceService,
+    ) {}
+
+    public function creditedTotal(Invoice $invoice): int
+    {
+        return $this->invoiceBalanceService->creditedTotal($invoice);
+    }
+
+    public function recalculate(Invoice $invoice): void
+    {
+        $this->invoiceBalanceService->recalculate($invoice);
+    }
+}
diff --git a/app/Adapters/Receivables/SalesPaymentNumberAssigner.php b/app/Adapters/Receivables/SalesPaymentNumberAssigner.php
new file mode 100644
index 00000000..e1b7ac55
--- /dev/null
+++ b/app/Adapters/Receivables/SalesPaymentNumberAssigner.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Adapters\Receivables;
+
+use App\Domains\Receivables\Contracts\PaymentNumberAssigner;
+use App\Domains\Receivables\Data\PaymentNumberAssignment;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Application\SerialNumberService;
+
+class SalesPaymentNumberAssigner implements PaymentNumberAssigner
+{
+    public function next(
+        Payment $payment,
+        int $companyId,
+        int $customerId,
+        bool $generateNumber = false,
+    ): PaymentNumberAssignment {
+        $serial = (new SerialNumberService)
+            ->setModel($payment)
+            ->setCompany($companyId)
+            ->setCustomer($customerId)
+            ->setModelObject($payment->getKey());
+
+        $number = null;
+
+        if ($generateNumber) {
+            $number = $serial->getNextNumber();
+        } else {
+            $serial->setNextNumbers();
+        }
+
+        return new PaymentNumberAssignment(
+            $number,
+            (int) $serial->nextSequenceNumber,
+            (int) $serial->nextCustomerSequenceNumber,
+        );
+    }
+}
diff --git a/app/Adapters/Sales/LaravelEstimateEmailSender.php b/app/Adapters/Sales/LaravelEstimateEmailSender.php
new file mode 100644
index 00000000..60a9a8c8
--- /dev/null
+++ b/app/Adapters/Sales/LaravelEstimateEmailSender.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Adapters\Sales;
+
+use App\Domains\Sales\Contracts\EstimateEmailSender;
+use App\Domains\Sales\Mail\SendEstimateMail;
+use Illuminate\Support\Facades\Mail;
+
+class LaravelEstimateEmailSender implements EstimateEmailSender
+{
+    public function send(array $data): void
+    {
+        $mail = Mail::to($data['to']);
+
+        if (! empty($data['cc'])) {
+            $mail->cc($data['cc']);
+        }
+
+        if (! empty($data['bcc'])) {
+            $mail->bcc($data['bcc']);
+        }
+
+        $mail->send(new SendEstimateMail($data));
+    }
+}
diff --git a/app/Adapters/Sales/LaravelInvoiceEmailSender.php b/app/Adapters/Sales/LaravelInvoiceEmailSender.php
new file mode 100644
index 00000000..ab201f4d
--- /dev/null
+++ b/app/Adapters/Sales/LaravelInvoiceEmailSender.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Adapters\Sales;
+
+use App\Domains\Sales\Contracts\InvoiceEmailSender;
+use App\Domains\Sales\Mail\SendCreditNoteMail;
+use App\Domains\Sales\Mail\SendInvoiceMail;
+use Illuminate\Support\Facades\Mail;
+
+class LaravelInvoiceEmailSender implements InvoiceEmailSender
+{
+    public function send(array $data, bool $creditNote): void
+    {
+        $mail = Mail::to($data['to']);
+
+        if (! empty($data['cc'])) {
+            $mail->cc($data['cc']);
+        }
+
+        if (! empty($data['bcc'])) {
+            $mail->bcc($data['bcc']);
+        }
+
+        $mail->send($creditNote
+            ? new SendCreditNoteMail($data)
+            : new SendInvoiceMail($data));
+    }
+}
diff --git a/app/Adapters/Sales/MoneyDocumentExchangeRateRecorder.php b/app/Adapters/Sales/MoneyDocumentExchangeRateRecorder.php
new file mode 100644
index 00000000..40e7171b
--- /dev/null
+++ b/app/Adapters/Sales/MoneyDocumentExchangeRateRecorder.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Adapters\Sales;
+
+use App\Domains\Money\Models\ExchangeRateLog;
+use App\Domains\Sales\Contracts\DocumentExchangeRateRecorder;
+use Illuminate\Database\Eloquent\Model;
+
+class MoneyDocumentExchangeRateRecorder implements DocumentExchangeRateRecorder
+{
+    public function record(Model $document): void
+    {
+        ExchangeRateLog::addExchangeRateLog($document);
+    }
+}
diff --git a/app/Domains/Accounts/AccountsServiceProvider.php b/app/Domains/Accounts/AccountsServiceProvider.php
new file mode 100644
index 00000000..3f7a6b69
--- /dev/null
+++ b/app/Domains/Accounts/AccountsServiceProvider.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Domains\Accounts;
+
+use App\Adapters\Accounts\EloquentBusinessDefaultsProvisioner;
+use App\Adapters\Accounts\EloquentCompanyAddressWriter;
+use App\Adapters\Accounts\EloquentCompanyDataPurger;
+use App\Adapters\Accounts\EloquentMemberReferencesCleaner;
+use App\Adapters\Accounts\LaravelCompanyInvitationSender;
+use App\Adapters\Accounts\MediaLibraryCompanyLogoManager;
+use App\Adapters\Accounts\MediaLibraryUserAvatarManager;
+use App\Domains\Accounts\Contracts\CompanyAddressWriter;
+use App\Domains\Accounts\Contracts\CompanyDataPurger;
+use App\Domains\Accounts\Contracts\CompanyDefaultsProvisioner;
+use App\Domains\Accounts\Contracts\CompanyInvitationSender;
+use App\Domains\Accounts\Contracts\CompanyLogoManager;
+use App\Domains\Accounts\Contracts\MemberReferencesCleaner;
+use App\Domains\Accounts\Contracts\UserAvatarManager;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Accounts\Policies\CompanyPolicy;
+use App\Domains\Accounts\Policies\OwnerPolicy;
+use App\Domains\Accounts\Policies\RolePolicy;
+use App\Domains\Accounts\Policies\SettingsPolicy;
+use App\Domains\Accounts\Policies\UserPolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+use Silber\Bouncer\Database\Role;
+
+class AccountsServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->bind(CompanyAddressWriter::class, EloquentCompanyAddressWriter::class);
+        $this->app->bind(CompanyDataPurger::class, EloquentCompanyDataPurger::class);
+        $this->app->bind(CompanyDefaultsProvisioner::class, EloquentBusinessDefaultsProvisioner::class);
+        $this->app->bind(CompanyInvitationSender::class, LaravelCompanyInvitationSender::class);
+        $this->app->bind(CompanyLogoManager::class, MediaLibraryCompanyLogoManager::class);
+        $this->app->bind(MemberReferencesCleaner::class, EloquentMemberReferencesCleaner::class);
+        $this->app->bind(UserAvatarManager::class, MediaLibraryUserAvatarManager::class);
+    }
+
+    public function boot(): void
+    {
+        Gate::policy(Company::class, CompanyPolicy::class);
+        Gate::policy(User::class, UserPolicy::class);
+        Gate::policy(Role::class, RolePolicy::class);
+
+        Gate::define('create company', [CompanyPolicy::class, 'create']);
+        Gate::define('transfer company ownership', [CompanyPolicy::class, 'transferOwnership']);
+        Gate::define('delete company', [CompanyPolicy::class, 'delete']);
+        Gate::define('manage company', [SettingsPolicy::class, 'manageCompany']);
+        Gate::define('delete multiple users', [UserPolicy::class, 'deleteMultiple']);
+        Gate::define('owner only', [OwnerPolicy::class, 'managedByOwner']);
+    }
+}
diff --git a/app/Services/Company/CompanyService.php b/app/Domains/Accounts/Application/CompanyService.php
similarity index 50%
rename from app/Services/Company/CompanyService.php
rename to app/Domains/Accounts/Application/CompanyService.php
index b2c3e1d4..2713a09e 100644
--- a/app/Services/Company/CompanyService.php
+++ b/app/Domains/Accounts/Application/CompanyService.php
@@ -1,24 +1,26 @@
 <?php
 
-namespace App\Services\Company;
+namespace App\Domains\Accounts\Application;
 
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\PaymentAllocation;
-use App\Models\PaymentMethod;
-use App\Models\Unit;
-use App\Models\User;
+use App\Domains\Accounts\Contracts\CompanyDataPurger;
+use App\Domains\Accounts\Contracts\CompanyDefaultsProvisioner;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
 use Silber\Bouncer\BouncerFacade;
 use Silber\Bouncer\Database\Role;
 
 class CompanyService
 {
-    public function setupDefaults(Company $company): bool
+    public function __construct(
+        private readonly CompanyDefaultsProvisioner $companyDefaultsProvisioner,
+        private readonly CompanyDataPurger $companyDataPurger,
+    ) {}
+
+    public function setupDefaults(Company $company, int $currencyId = 13): bool
     {
         $this->setupRoles($company);
-        $this->setupDefaultPaymentMethods($company);
-        $this->setupDefaultUnits($company);
-        $this->setupDefaultSettings($company);
+        $this->companyDefaultsProvisioner->provision($company);
+        $this->setupDefaultSettings($company, $currencyId);
 
         return true;
     }
@@ -38,88 +40,9 @@ class CompanyService
         }
     }
 
-    public function delete(Company $company, User $user): bool
+    public function delete(Company $company): bool
     {
-        if ($company->exchangeRateLogs()->exists()) {
-            $company->exchangeRateLogs()->delete();
-        }
-
-        if ($company->exchangeRateProviders()->exists()) {
-            $company->exchangeRateProviders()->delete();
-        }
-
-        if ($company->expenses()->exists()) {
-            $company->expenses->each->delete();
-        }
-
-        if ($company->expenseCategories()->exists()) {
-            $company->expenseCategories()->delete();
-        }
-
-        if ($company->payments()->exists()) {
-            PaymentAllocation::query()
-                ->whereIn('payment_id', $company->payments()->select('id'))
-                ->delete();
-            $company->payments()->delete();
-        }
-
-        if ($company->paymentMethods()->exists()) {
-            $company->paymentMethods()->delete();
-        }
-
-        if ($company->customFieldValues()->exists()) {
-            $company->customFieldValues()->delete();
-        }
-
-        if ($company->customFields()->exists()) {
-            $company->customFields()->delete();
-        }
-
-        if ($company->invoices()->exists()) {
-            $company->invoices->map(function ($invoice) {
-                $this->checkModelData($invoice);
-
-                if ($invoice->transactions()->exists()) {
-                    $invoice->transactions()->delete();
-                }
-            });
-
-            $company->invoices()->delete();
-        }
-
-        if ($company->recurringInvoices()->exists()) {
-            $company->recurringInvoices->map(function ($recurringInvoice) {
-                $this->checkModelData($recurringInvoice);
-            });
-
-            $company->recurringInvoices()->delete();
-        }
-
-        if ($company->estimates()->exists()) {
-            $company->estimates->map(function ($estimate) {
-                $this->checkModelData($estimate);
-            });
-
-            $company->estimates()->delete();
-        }
-
-        if ($company->items()->exists()) {
-            $company->items()->delete();
-        }
-
-        if ($company->taxTypes()->exists()) {
-            $company->taxTypes()->delete();
-        }
-
-        if ($company->customers()->exists()) {
-            $company->customers->map(function ($customer) {
-                if ($customer->addresses()->exists()) {
-                    $customer->addresses()->delete();
-                }
-
-                $customer->delete();
-            });
-        }
+        $this->companyDataPurger->purge($company);
 
         $roles = Role::when($company->id, function ($query) use ($company) {
             return $query->where('scope', $company->id);
@@ -131,43 +54,15 @@ class CompanyService
             });
         }
 
-        if ($company->users()->exists()) {
-            $user->companies()->detach($company->id);
-        }
+        $company->users()->detach();
 
         $company->settings()->delete();
-
-        $company->address()->delete();
-
         $company->delete();
 
         return true;
     }
 
-    private function setupDefaultPaymentMethods(Company $company): void
-    {
-        PaymentMethod::create(['name' => 'Cash', 'company_id' => $company->id]);
-        PaymentMethod::create(['name' => 'Check', 'company_id' => $company->id]);
-        PaymentMethod::create(['name' => 'Credit Card', 'company_id' => $company->id]);
-        PaymentMethod::create(['name' => 'Bank Transfer', 'company_id' => $company->id]);
-    }
-
-    private function setupDefaultUnits(Company $company): void
-    {
-        Unit::create(['name' => 'box', 'company_id' => $company->id]);
-        Unit::create(['name' => 'cm', 'company_id' => $company->id]);
-        Unit::create(['name' => 'dz', 'company_id' => $company->id]);
-        Unit::create(['name' => 'ft', 'company_id' => $company->id]);
-        Unit::create(['name' => 'g', 'company_id' => $company->id]);
-        Unit::create(['name' => 'in', 'company_id' => $company->id]);
-        Unit::create(['name' => 'kg', 'company_id' => $company->id]);
-        Unit::create(['name' => 'km', 'company_id' => $company->id]);
-        Unit::create(['name' => 'lb', 'company_id' => $company->id]);
-        Unit::create(['name' => 'mg', 'company_id' => $company->id]);
-        Unit::create(['name' => 'pc', 'company_id' => $company->id]);
-    }
-
-    private function setupDefaultSettings(Company $company): void
+    private function setupDefaultSettings(Company $company, int $currencyId): void
     {
         $defaultInvoiceEmailBody = 'You have received a new invoice from <b>{COMPANY_NAME}</b>.</br> Please download using the button below:';
         $defaultEstimateEmailBody = 'You have received a new estimate from <b>{COMPANY_NAME}</b>.</br> Please download using the button below:';
@@ -189,7 +84,7 @@ class CompanyService
             'estimate_billing_address_format' => $billingAddressFormat,
             'payment_company_address_format' => $companyAddressFormat,
             'payment_from_customer_address_format' => $paymentFromCustomerAddress,
-            'currency' => request()->currency ?? 13,
+            'currency' => $currencyId,
             'time_zone' => 'Asia/Kolkata',
             'language' => 'en',
             'fiscal_year' => '1-12',
@@ -223,19 +118,4 @@ class CompanyService
 
         CompanySetting::setSettings($settings, $company->id);
     }
-
-    private function checkModelData($model): void
-    {
-        $model->items->map(function ($item) {
-            if ($item->taxes()->exists()) {
-                $item->taxes()->delete();
-            }
-
-            $item->delete();
-        });
-
-        if ($model->taxes()->exists()) {
-            $model->taxes()->delete();
-        }
-    }
 }
diff --git a/app/Services/Company/InvitationService.php b/app/Domains/Accounts/Application/InvitationService.php
similarity index 89%
rename from app/Services/Company/InvitationService.php
rename to app/Domains/Accounts/Application/InvitationService.php
index cf7eac7f..1eab76e4 100644
--- a/app/Services/Company/InvitationService.php
+++ b/app/Domains/Accounts/Application/InvitationService.php
@@ -1,14 +1,13 @@
 <?php
 
-namespace App\Services\Company;
+namespace App\Domains\Accounts\Application;
 
-use App\Mail\CompanyInvitationMail;
-use App\Models\Company;
-use App\Models\CompanyInvitation;
-use App\Models\User;
+use App\Domains\Accounts\Contracts\CompanyInvitationSender;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanyInvitation;
+use App\Domains\Accounts\Models\User;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
 use Silber\Bouncer\BouncerFacade;
@@ -16,6 +15,10 @@ use Silber\Bouncer\Database\Role;
 
 class InvitationService
 {
+    public function __construct(
+        private readonly CompanyInvitationSender $companyInvitationSender,
+    ) {}
+
     /**
      * Invite a user to a company by email with a specific role.
      */
@@ -55,7 +58,7 @@ class InvitationService
         $invitation->load(['company', 'role', 'invitedBy']);
 
         try {
-            Mail::to($email)->send(new CompanyInvitationMail($invitation));
+            $this->companyInvitationSender->send($invitation);
         } catch (\Exception $e) {
             \Log::warning('Failed to send invitation email to '.$email.': '.$e->getMessage());
         }
diff --git a/app/Domains/Accounts/Application/MemberService.php b/app/Domains/Accounts/Application/MemberService.php
new file mode 100644
index 00000000..c0924f8c
--- /dev/null
+++ b/app/Domains/Accounts/Application/MemberService.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Domains\Accounts\Application;
+
+use App\Domains\Accounts\Contracts\MemberReferencesCleaner;
+use App\Domains\Accounts\Models\User;
+use Silber\Bouncer\BouncerFacade;
+
+class MemberService
+{
+    public function __construct(
+        private readonly MemberReferencesCleaner $memberReferencesCleaner,
+    ) {}
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  iterable<int, array{id: int, role: string}>  $companies
+     */
+    public function create(array $attributes, iterable $companies): User
+    {
+        $user = User::create($attributes);
+
+        $user->setSettings([
+            'language' => 'default',
+        ]);
+
+        $companies = collect($companies);
+        $user->companies()->sync($companies->pluck('id'));
+
+        foreach ($companies as $company) {
+            BouncerFacade::scope()->to($company['id']);
+
+            BouncerFacade::sync($user)->roles([$company['role']]);
+        }
+
+        return $user;
+    }
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  iterable<int, array{id: int, role: string}>  $companies
+     */
+    public function update(User $user, array $attributes, iterable $companies): User
+    {
+        $user->update($attributes);
+
+        $companies = collect($companies);
+        $user->companies()->sync($companies->pluck('id'));
+
+        foreach ($companies as $company) {
+            BouncerFacade::scope()->to($company['id']);
+
+            BouncerFacade::sync($user)->roles([$company['role']]);
+        }
+
+        return $user;
+    }
+
+    public function delete(array $ids): bool
+    {
+        foreach ($ids as $id) {
+            $user = User::find($id);
+
+            if (! $user) {
+                continue;
+            }
+
+            $this->memberReferencesCleaner->clear($user);
+
+            if ($user->settings()->exists()) {
+                $user->settings()->delete();
+            }
+
+            $user->delete();
+        }
+
+        return true;
+    }
+}
diff --git a/app/Domains/Accounts/Contracts/CompanyAddressWriter.php b/app/Domains/Accounts/Contracts/CompanyAddressWriter.php
new file mode 100644
index 00000000..57a671fd
--- /dev/null
+++ b/app/Domains/Accounts/Contracts/CompanyAddressWriter.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Domains\Accounts\Contracts;
+
+use App\Domains\Accounts\Models\Company;
+
+interface CompanyAddressWriter
+{
+    /** @param array<string, mixed> $attributes */
+    public function upsert(Company $company, array $attributes): void;
+}
diff --git a/app/Domains/Accounts/Contracts/CompanyDataPurger.php b/app/Domains/Accounts/Contracts/CompanyDataPurger.php
new file mode 100644
index 00000000..72e2ccad
--- /dev/null
+++ b/app/Domains/Accounts/Contracts/CompanyDataPurger.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Accounts\Contracts;
+
+use App\Domains\Accounts\Models\Company;
+
+interface CompanyDataPurger
+{
+    public function purge(Company $company): void;
+}
diff --git a/app/Domains/Accounts/Contracts/CompanyDefaultsProvisioner.php b/app/Domains/Accounts/Contracts/CompanyDefaultsProvisioner.php
new file mode 100644
index 00000000..94693fb9
--- /dev/null
+++ b/app/Domains/Accounts/Contracts/CompanyDefaultsProvisioner.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Accounts\Contracts;
+
+use App\Domains\Accounts\Models\Company;
+
+interface CompanyDefaultsProvisioner
+{
+    public function provision(Company $company): void;
+}
diff --git a/app/Domains/Accounts/Contracts/CompanyInvitationSender.php b/app/Domains/Accounts/Contracts/CompanyInvitationSender.php
new file mode 100644
index 00000000..e7428740
--- /dev/null
+++ b/app/Domains/Accounts/Contracts/CompanyInvitationSender.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Accounts\Contracts;
+
+use App\Domains\Accounts\Models\CompanyInvitation;
+
+interface CompanyInvitationSender
+{
+    public function send(CompanyInvitation $invitation): void;
+}
diff --git a/app/Domains/Accounts/Contracts/CompanyLogoManager.php b/app/Domains/Accounts/Contracts/CompanyLogoManager.php
new file mode 100644
index 00000000..0842cb07
--- /dev/null
+++ b/app/Domains/Accounts/Contracts/CompanyLogoManager.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Domains\Accounts\Contracts;
+
+use App\Domains\Accounts\Models\Company;
+
+interface CompanyLogoManager
+{
+    public function clear(Company $company): void;
+
+    public function replaceBase64(Company $company, string $contents, string $fileName): void;
+}
diff --git a/app/Domains/Accounts/Contracts/MemberReferencesCleaner.php b/app/Domains/Accounts/Contracts/MemberReferencesCleaner.php
new file mode 100644
index 00000000..2220b882
--- /dev/null
+++ b/app/Domains/Accounts/Contracts/MemberReferencesCleaner.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Accounts\Contracts;
+
+use App\Domains\Accounts\Models\User;
+
+interface MemberReferencesCleaner
+{
+    public function clear(User $user): void;
+}
diff --git a/app/Domains/Accounts/Contracts/UserAvatarManager.php b/app/Domains/Accounts/Contracts/UserAvatarManager.php
new file mode 100644
index 00000000..5bb32fa7
--- /dev/null
+++ b/app/Domains/Accounts/Contracts/UserAvatarManager.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Domains\Accounts\Contracts;
+
+use App\Domains\Accounts\Models\User;
+
+interface UserAvatarManager
+{
+    public function clear(User $user): void;
+
+    public function replaceFile(User $user, string $path, string $fileName): void;
+
+    public function replaceBase64(User $user, string $contents, string $fileName): void;
+}
diff --git a/app/Http/Controllers/Admin/CompaniesController.php b/app/Domains/Accounts/Http/Controllers/Admin/CompaniesController.php
similarity index 72%
rename from app/Http/Controllers/Admin/CompaniesController.php
rename to app/Domains/Accounts/Http/Controllers/Admin/CompaniesController.php
index db48052f..a66c4c39 100644
--- a/app/Http/Controllers/Admin/CompaniesController.php
+++ b/app/Domains/Accounts/Http/Controllers/Admin/CompaniesController.php
@@ -1,14 +1,16 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Domains\Accounts\Http\Controllers\Admin;
 
+use App\Domains\Accounts\Application\CompanyService;
+use App\Domains\Accounts\Contracts\CompanyAddressWriter;
+use App\Domains\Accounts\Http\Requests\AdminCompanyUpdateRequest;
+use App\Domains\Accounts\Http\Requests\CompaniesRequest;
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Accounts\Models\Company;
 use App\Facades\Hashids;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\AdminCompanyUpdateRequest;
-use App\Http\Requests\CompaniesRequest;
-use App\Http\Resources\CompanyResource;
-use App\Models\Company;
-use App\Services\Company\CompanyService;
+use App\Platform\Http\Controller;
+use App\Support\Hashids\HashidConnection;
 use Illuminate\Http\Request;
 use Silber\Bouncer\BouncerFacade;
 
@@ -16,6 +18,7 @@ class CompaniesController extends Controller
 {
     public function __construct(
         private readonly CompanyService $companyService,
+        private readonly CompanyAddressWriter $companyAddressWriter,
     ) {}
 
     public function index(Request $request)
@@ -52,10 +55,7 @@ class CompaniesController extends Controller
         ]);
 
         if ($request->has('address')) {
-            $company->address()->updateOrCreate(
-                ['company_id' => $company->id],
-                $request->address,
-            );
+            $this->companyAddressWriter->upsert($company, $request->validated('address'));
         }
 
         $company->load(['owner', 'address']);
@@ -70,16 +70,16 @@ class CompaniesController extends Controller
         $user = $request->user();
 
         $company = Company::create($request->getCompanyPayload());
-        $company->unique_hash = Hashids::connection(Company::class)->encode($company->id);
+        $company->unique_hash = Hashids::connection(HashidConnection::Company->value)->encode($company->id);
         $company->save();
-        $this->companyService->setupDefaults($company);
+        $this->companyService->setupDefaults($company, (int) $request->validated('currency'));
         $user->companies()->attach($company->id);
 
         BouncerFacade::scope()->to($company->id);
         $user->assign('owner');
 
         if ($request->address) {
-            $company->address()->create($request->address);
+            $this->companyAddressWriter->upsert($company, $request->validated('address'));
         }
 
         return new CompanyResource($company);
@@ -91,13 +91,11 @@ class CompaniesController extends Controller
 
         $this->authorize('delete company', $company);
 
-        $user = $request->user();
-
         if ($request->name !== $company->name) {
             return respondJson('company_name_must_match_with_given_name', 'Company name must match with given name');
         }
 
-        $this->companyService->delete($company, $user);
+        $this->companyService->delete($company);
 
         return response()->json([
             'success' => true,
diff --git a/app/Http/Controllers/Admin/UsersController.php b/app/Domains/Accounts/Http/Controllers/Admin/UsersController.php
similarity index 89%
rename from app/Http/Controllers/Admin/UsersController.php
rename to app/Domains/Accounts/Http/Controllers/Admin/UsersController.php
index 396a3109..661f7384 100644
--- a/app/Http/Controllers/Admin/UsersController.php
+++ b/app/Domains/Accounts/Http/Controllers/Admin/UsersController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Domains\Accounts\Http\Controllers\Admin;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\AdminUserUpdateRequest;
-use App\Http\Resources\UserResource;
-use App\Models\ImpersonationLog;
-use App\Models\User;
+use App\Domains\Accounts\Http\Requests\AdminUserUpdateRequest;
+use App\Domains\Accounts\Http\Resources\UserResource;
+use App\Domains\Accounts\Models\ImpersonationLog;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Laravel\Sanctum\PersonalAccessToken;
 
diff --git a/app/Http/Controllers/Company/Auth/AuthController.php b/app/Domains/Accounts/Http/Controllers/Auth/AuthController.php
similarity index 83%
rename from app/Http/Controllers/Company/Auth/AuthController.php
rename to app/Domains/Accounts/Http/Controllers/Auth/AuthController.php
index 29c6dd40..505a5e41 100644
--- a/app/Http/Controllers/Company/Auth/AuthController.php
+++ b/app/Domains/Accounts/Http/Controllers/Auth/AuthController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Company\Auth;
+namespace App\Domains\Accounts\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\LoginRequest;
-use App\Models\CompanyInvitation;
-use App\Models\User;
-use App\Services\Company\InvitationService;
+use App\Domains\Accounts\Application\InvitationService;
+use App\Domains\Accounts\Http\Requests\LoginRequest;
+use App\Domains\Accounts\Models\CompanyInvitation;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
diff --git a/app/Http/Controllers/Company/Auth/ForgotPasswordController.php b/app/Domains/Accounts/Http/Controllers/Auth/ForgotPasswordController.php
similarity index 94%
rename from app/Http/Controllers/Company/Auth/ForgotPasswordController.php
rename to app/Domains/Accounts/Http/Controllers/Auth/ForgotPasswordController.php
index 991225e7..3ea53018 100644
--- a/app/Http/Controllers/Company/Auth/ForgotPasswordController.php
+++ b/app/Domains/Accounts/Http/Controllers/Auth/ForgotPasswordController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Company\Auth;
+namespace App\Domains\Accounts\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
diff --git a/app/Http/Controllers/Company/Auth/InvitationRegistrationController.php b/app/Domains/Accounts/Http/Controllers/Auth/InvitationRegistrationController.php
similarity index 90%
rename from app/Http/Controllers/Company/Auth/InvitationRegistrationController.php
rename to app/Domains/Accounts/Http/Controllers/Auth/InvitationRegistrationController.php
index 610b5f7c..d8beec7c 100644
--- a/app/Http/Controllers/Company/Auth/InvitationRegistrationController.php
+++ b/app/Domains/Accounts/Http/Controllers/Auth/InvitationRegistrationController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Company\Auth;
+namespace App\Domains\Accounts\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
-use App\Models\CompanyInvitation;
-use App\Models\User;
-use App\Services\Company\InvitationService;
+use App\Domains\Accounts\Application\InvitationService;
+use App\Domains\Accounts\Models\CompanyInvitation;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Http/Controllers/Company/Auth/LoginController.php b/app/Domains/Accounts/Http/Controllers/Auth/LoginController.php
similarity index 74%
rename from app/Http/Controllers/Company/Auth/LoginController.php
rename to app/Domains/Accounts/Http/Controllers/Auth/LoginController.php
index 3d68f837..ddb9021c 100644
--- a/app/Http/Controllers/Company/Auth/LoginController.php
+++ b/app/Domains/Accounts/Http/Controllers/Auth/LoginController.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Company\Auth;
+namespace App\Domains\Accounts\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use App\Providers\AppServiceProvider;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
 
 class LoginController extends Controller
 {
@@ -37,4 +38,11 @@ class LoginController extends Controller
     {
         $this->middleware('guest')->except('logout');
     }
+
+    public function logout(Request $request): void
+    {
+        auth()->guard('web')->logout();
+        $request->session()->invalidate();
+        $request->session()->regenerateToken();
+    }
 }
diff --git a/app/Http/Controllers/Company/Auth/ResetPasswordController.php b/app/Domains/Accounts/Http/Controllers/Auth/ResetPasswordController.php
similarity index 95%
rename from app/Http/Controllers/Company/Auth/ResetPasswordController.php
rename to app/Domains/Accounts/Http/Controllers/Auth/ResetPasswordController.php
index cb5bdc83..4a01a014 100644
--- a/app/Http/Controllers/Company/Auth/ResetPasswordController.php
+++ b/app/Domains/Accounts/Http/Controllers/Auth/ResetPasswordController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Company\Auth;
+namespace App\Domains\Accounts\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use App\Providers\AppServiceProvider;
 use Illuminate\Auth\Events\PasswordReset;
 use Illuminate\Contracts\Auth\CanResetPassword;
diff --git a/app/Http/Controllers/Company/Role/AbilitiesController.php b/app/Domains/Accounts/Http/Controllers/Company/AbilitiesController.php
similarity index 78%
rename from app/Http/Controllers/Company/Role/AbilitiesController.php
rename to app/Domains/Accounts/Http/Controllers/Company/AbilitiesController.php
index 7f8b087f..e5c093a6 100644
--- a/app/Http/Controllers/Company/Role/AbilitiesController.php
+++ b/app/Domains/Accounts/Http/Controllers/Company/AbilitiesController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Company\Role;
+namespace App\Domains\Accounts\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
diff --git a/app/Domains/Accounts/Http/Controllers/Company/CompanyController.php b/app/Domains/Accounts/Http/Controllers/Company/CompanyController.php
new file mode 100644
index 00000000..a34073b0
--- /dev/null
+++ b/app/Domains/Accounts/Http/Controllers/Company/CompanyController.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Domains\Accounts\Http\Controllers\Company;
+
+use App\Domains\Accounts\Contracts\CompanyAddressWriter;
+use App\Domains\Accounts\Contracts\CompanyLogoManager;
+use App\Domains\Accounts\Http\Requests\CompanyLogoRequest;
+use App\Domains\Accounts\Http\Requests\CompanyRequest;
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Accounts\Models\Company;
+use App\Platform\Http\Controller;
+
+class CompanyController extends Controller
+{
+    public function __construct(
+        private readonly CompanyAddressWriter $companyAddressWriter,
+        private readonly CompanyLogoManager $companyLogoManager,
+    ) {}
+
+    public function updateCompany(CompanyRequest $request)
+    {
+        $company = Company::find($request->header('company'));
+
+        $this->authorize('manage company', $company);
+
+        $company->update($request->getCompanyPayload());
+
+        $this->companyAddressWriter->upsert($company, (array) $request->input('address'));
+
+        return new CompanyResource($company);
+    }
+
+    public function uploadCompanyLogo(CompanyLogoRequest $request)
+    {
+        $company = Company::find($request->header('company'));
+
+        $this->authorize('manage company', $company);
+
+        $data = json_decode($request->company_logo);
+
+        if (isset($request->is_company_logo_removed) && (bool) $request->is_company_logo_removed) {
+            $this->companyLogoManager->clear($company);
+        }
+        if ($data) {
+            $this->companyLogoManager->replaceBase64($company, $data->data, $data->name);
+        }
+
+        return response()->json([
+            'success' => true,
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/Company/Settings/CompanySettingsController.php b/app/Domains/Accounts/Http/Controllers/Company/CompanySettingsController.php
similarity index 86%
rename from app/Http/Controllers/Company/Settings/CompanySettingsController.php
rename to app/Domains/Accounts/Http/Controllers/Company/CompanySettingsController.php
index 4f8507ad..45fbe390 100644
--- a/app/Http/Controllers/Company/Settings/CompanySettingsController.php
+++ b/app/Domains/Accounts/Http/Controllers/Company/CompanySettingsController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Company\Settings;
+namespace App\Domains\Accounts\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\GetSettingsRequest;
-use App\Http\Requests\UpdateSettingsRequest;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\User;
+use App\Domains\Accounts\Http\Requests\GetSettingsRequest;
+use App\Domains\Accounts\Http\Requests\UpdateSettingsRequest;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
diff --git a/app/Http/Controllers/Company/Settings/InvitationController.php b/app/Domains/Accounts/Http/Controllers/Company/InvitationController.php
similarity index 85%
rename from app/Http/Controllers/Company/Settings/InvitationController.php
rename to app/Domains/Accounts/Http/Controllers/Company/InvitationController.php
index 041ba587..2be451b5 100644
--- a/app/Http/Controllers/Company/Settings/InvitationController.php
+++ b/app/Domains/Accounts/Http/Controllers/Company/InvitationController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Company\Settings;
+namespace App\Domains\Accounts\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\CompanyInvitationResource;
-use App\Models\Company;
-use App\Models\CompanyInvitation;
-use App\Services\Company\InvitationService;
+use App\Domains\Accounts\Application\InvitationService;
+use App\Domains\Accounts\Http\Resources\CompanyInvitationResource;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanyInvitation;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Company/General/InvitationResponseController.php b/app/Domains/Accounts/Http/Controllers/Company/InvitationResponseController.php
similarity index 81%
rename from app/Http/Controllers/Company/General/InvitationResponseController.php
rename to app/Domains/Accounts/Http/Controllers/Company/InvitationResponseController.php
index e4c21148..c1059fbc 100644
--- a/app/Http/Controllers/Company/General/InvitationResponseController.php
+++ b/app/Domains/Accounts/Http/Controllers/Company/InvitationResponseController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Company\General;
+namespace App\Domains\Accounts\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\CompanyInvitationResource;
-use App\Models\CompanyInvitation;
-use App\Services\Company\InvitationService;
+use App\Domains\Accounts\Application\InvitationService;
+use App\Domains\Accounts\Http\Resources\CompanyInvitationResource;
+use App\Domains\Accounts\Models\CompanyInvitation;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Company/Members/MembersController.php b/app/Domains/Accounts/Http/Controllers/Company/MembersController.php
similarity index 78%
rename from app/Http/Controllers/Company/Members/MembersController.php
rename to app/Domains/Accounts/Http/Controllers/Company/MembersController.php
index 81d503e1..21683059 100644
--- a/app/Http/Controllers/Company/Members/MembersController.php
+++ b/app/Domains/Accounts/Http/Controllers/Company/MembersController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Company\Members;
+namespace App\Domains\Accounts\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\DeleteMemberRequest;
-use App\Http\Requests\MemberRequest;
-use App\Http\Resources\UserResource;
-use App\Models\User;
-use App\Services\Company\MemberService;
+use App\Domains\Accounts\Application\MemberService;
+use App\Domains\Accounts\Http\Requests\DeleteMemberRequest;
+use App\Domains\Accounts\Http\Requests\MemberRequest;
+use App\Domains\Accounts\Http\Resources\UserResource;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -51,7 +51,10 @@ class MembersController extends Controller
     {
         $this->authorize('create', User::class);
 
-        $user = $this->memberService->create($request);
+        $user = $this->memberService->create(
+            $request->getUserPayload(),
+            $request->validated('companies'),
+        );
 
         return new UserResource($user);
     }
@@ -77,7 +80,11 @@ class MembersController extends Controller
     {
         $this->authorize('update', $member);
 
-        $this->memberService->update($member, $request);
+        $this->memberService->update(
+            $member,
+            $request->getUserPayload(),
+            $request->validated('companies'),
+        );
 
         return new UserResource($member);
     }
diff --git a/app/Http/Controllers/Company/Role/RolesController.php b/app/Domains/Accounts/Http/Controllers/Company/RolesController.php
similarity index 92%
rename from app/Http/Controllers/Company/Role/RolesController.php
rename to app/Domains/Accounts/Http/Controllers/Company/RolesController.php
index ba88e418..657cb592 100644
--- a/app/Http/Controllers/Company/Role/RolesController.php
+++ b/app/Domains/Accounts/Http/Controllers/Company/RolesController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Company\Role;
+namespace App\Domains\Accounts\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\RoleRequest;
-use App\Http\Resources\RoleResource;
-use App\Models\User;
+use App\Domains\Accounts\Http\Requests\RoleRequest;
+use App\Domains\Accounts\Http\Resources\RoleResource;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Silber\Bouncer\BouncerFacade;
diff --git a/app/Http/Controllers/Company/Settings/UserProfileController.php b/app/Domains/Accounts/Http/Controllers/Company/UserProfileController.php
similarity index 59%
rename from app/Http/Controllers/Company/Settings/UserProfileController.php
rename to app/Domains/Accounts/Http/Controllers/Company/UserProfileController.php
index a8a705a3..fe8f7f53 100644
--- a/app/Http/Controllers/Company/Settings/UserProfileController.php
+++ b/app/Domains/Accounts/Http/Controllers/Company/UserProfileController.php
@@ -1,18 +1,23 @@
 <?php
 
-namespace App\Http\Controllers\Company\Settings;
+namespace App\Domains\Accounts\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\AvatarRequest;
-use App\Http\Requests\GetSettingsRequest;
-use App\Http\Requests\ProfileRequest;
-use App\Http\Requests\UpdateSettingsRequest;
-use App\Http\Resources\UserResource;
+use App\Domains\Accounts\Contracts\UserAvatarManager;
+use App\Domains\Accounts\Http\Requests\AvatarRequest;
+use App\Domains\Accounts\Http\Requests\GetSettingsRequest;
+use App\Domains\Accounts\Http\Requests\ProfileRequest;
+use App\Domains\Accounts\Http\Requests\UpdateSettingsRequest;
+use App\Domains\Accounts\Http\Resources\UserResource;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
 class UserProfileController extends Controller
 {
+    public function __construct(
+        private readonly UserAvatarManager $userAvatarManager,
+    ) {}
+
     public function show(Request $request)
     {
         return new UserResource($request->user());
@@ -32,22 +37,20 @@ class UserProfileController extends Controller
         $user = auth()->user();
 
         if (isset($request->is_admin_avatar_removed) && (bool) $request->is_admin_avatar_removed) {
-            $user->clearMediaCollection('admin_avatar');
+            $this->userAvatarManager->clear($user);
         }
         if ($user && $request->hasFile('admin_avatar')) {
-            $user->clearMediaCollection('admin_avatar');
-
-            $user->addMediaFromRequest('admin_avatar')
-                ->toMediaCollection('admin_avatar');
+            $file = $request->file('admin_avatar');
+            $this->userAvatarManager->replaceFile(
+                $user,
+                $file->getRealPath(),
+                $file->getClientOriginalName(),
+            );
         }
 
         if ($user && $request->has('avatar')) {
             $data = json_decode($request->avatar);
-            $user->clearMediaCollection('admin_avatar');
-
-            $user->addMediaFromBase64($data->data)
-                ->usingFileName($data->name)
-                ->toMediaCollection('admin_avatar');
+            $this->userAvatarManager->replaceBase64($user, $data->data, $data->name);
         }
 
         return new UserResource($user);
diff --git a/app/Domains/Accounts/Http/Controllers/InvitationDeclineController.php b/app/Domains/Accounts/Http/Controllers/InvitationDeclineController.php
new file mode 100644
index 00000000..b5cebd7d
--- /dev/null
+++ b/app/Domains/Accounts/Http/Controllers/InvitationDeclineController.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Domains\Accounts\Http\Controllers;
+
+use App\Domains\Accounts\Models\CompanyInvitation;
+use App\Platform\Http\Controller;
+use Illuminate\Contracts\View\View;
+
+class InvitationDeclineController extends Controller
+{
+    public function __invoke(string $token): View
+    {
+        $invitation = CompanyInvitation::query()
+            ->where('token', $token)
+            ->pending()
+            ->first();
+
+        if (! $invitation) {
+            return view('app')->with(['message' => 'Invitation not found or already expired.']);
+        }
+
+        $invitation->update(['status' => CompanyInvitation::STATUS_DECLINED]);
+
+        return view('app')->with(['message' => 'Invitation declined.']);
+    }
+}
diff --git a/app/Http/Middleware/Authenticate.php b/app/Domains/Accounts/Http/Middleware/Authenticate.php
similarity index 90%
rename from app/Http/Middleware/Authenticate.php
rename to app/Domains/Accounts/Http/Middleware/Authenticate.php
index 59537904..70289077 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Domains/Accounts/Http/Middleware/Authenticate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Domains\Accounts\Http\Middleware;
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
 use Illuminate\Http\Request;
diff --git a/app/Http/Middleware/CompanyMiddleware.php b/app/Domains/Accounts/Http/Middleware/CompanyMiddleware.php
similarity index 95%
rename from app/Http/Middleware/CompanyMiddleware.php
rename to app/Domains/Accounts/Http/Middleware/CompanyMiddleware.php
index 0137d71d..d6871f95 100644
--- a/app/Http/Middleware/CompanyMiddleware.php
+++ b/app/Domains/Accounts/Http/Middleware/CompanyMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Domains\Accounts\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Domains/Accounts/Http/Middleware/RedirectIfAuthenticated.php
similarity index 91%
rename from app/Http/Middleware/RedirectIfAuthenticated.php
rename to app/Domains/Accounts/Http/Middleware/RedirectIfAuthenticated.php
index d7ff5e9a..0f8c804f 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Domains/Accounts/Http/Middleware/RedirectIfAuthenticated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Domains\Accounts\Http\Middleware;
 
 use App\Providers\RouteServiceProvider;
 use Closure;
diff --git a/app/Http/Middleware/RedirectIfUnauthorized.php b/app/Domains/Accounts/Http/Middleware/RedirectIfUnauthorized.php
similarity index 90%
rename from app/Http/Middleware/RedirectIfUnauthorized.php
rename to app/Domains/Accounts/Http/Middleware/RedirectIfUnauthorized.php
index 6a63ec42..d64bcd98 100644
--- a/app/Http/Middleware/RedirectIfUnauthorized.php
+++ b/app/Domains/Accounts/Http/Middleware/RedirectIfUnauthorized.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Domains\Accounts\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
diff --git a/app/Http/Middleware/ScopeBouncer.php b/app/Domains/Accounts/Http/Middleware/ScopeBouncer.php
similarity index 95%
rename from app/Http/Middleware/ScopeBouncer.php
rename to app/Domains/Accounts/Http/Middleware/ScopeBouncer.php
index 308bf384..b7f03ea9 100644
--- a/app/Http/Middleware/ScopeBouncer.php
+++ b/app/Domains/Accounts/Http/Middleware/ScopeBouncer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Domains\Accounts\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
diff --git a/app/Http/Middleware/SuperAdminMiddleware.php b/app/Domains/Accounts/Http/Middleware/SuperAdminMiddleware.php
similarity index 89%
rename from app/Http/Middleware/SuperAdminMiddleware.php
rename to app/Domains/Accounts/Http/Middleware/SuperAdminMiddleware.php
index 765448e7..c81a7c4d 100644
--- a/app/Http/Middleware/SuperAdminMiddleware.php
+++ b/app/Domains/Accounts/Http/Middleware/SuperAdminMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Domains\Accounts\Http\Middleware;
 
 use Auth;
 use Closure;
diff --git a/app/Http/Requests/AdminCompanyUpdateRequest.php b/app/Domains/Accounts/Http/Requests/AdminCompanyUpdateRequest.php
similarity index 96%
rename from app/Http/Requests/AdminCompanyUpdateRequest.php
rename to app/Domains/Accounts/Http/Requests/AdminCompanyUpdateRequest.php
index 887e332e..3d8bb1ff 100644
--- a/app/Http/Requests/AdminCompanyUpdateRequest.php
+++ b/app/Domains/Accounts/Http/Requests/AdminCompanyUpdateRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/AdminUserUpdateRequest.php b/app/Domains/Accounts/Http/Requests/AdminUserUpdateRequest.php
similarity index 93%
rename from app/Http/Requests/AdminUserUpdateRequest.php
rename to app/Domains/Accounts/Http/Requests/AdminUserUpdateRequest.php
index 0a66efd4..d2165ed5 100644
--- a/app/Http/Requests/AdminUserUpdateRequest.php
+++ b/app/Domains/Accounts/Http/Requests/AdminUserUpdateRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use App\Rules\IdnEmail;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Requests/AvatarRequest.php b/app/Domains/Accounts/Http/Requests/AvatarRequest.php
similarity index 93%
rename from app/Http/Requests/AvatarRequest.php
rename to app/Domains/Accounts/Http/Requests/AvatarRequest.php
index 0280af52..175800e7 100644
--- a/app/Http/Requests/AvatarRequest.php
+++ b/app/Domains/Accounts/Http/Requests/AvatarRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use App\Rules\Base64Mime;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Requests/CompaniesRequest.php b/app/Domains/Accounts/Http/Requests/CompaniesRequest.php
similarity index 97%
rename from app/Http/Requests/CompaniesRequest.php
rename to app/Domains/Accounts/Http/Requests/CompaniesRequest.php
index cf4798cd..22a09267 100644
--- a/app/Http/Requests/CompaniesRequest.php
+++ b/app/Domains/Accounts/Http/Requests/CompaniesRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Str;
diff --git a/app/Http/Requests/CompanyLogoRequest.php b/app/Domains/Accounts/Http/Requests/CompanyLogoRequest.php
similarity index 92%
rename from app/Http/Requests/CompanyLogoRequest.php
rename to app/Domains/Accounts/Http/Requests/CompanyLogoRequest.php
index 7b5bebd3..6bdd83ce 100644
--- a/app/Http/Requests/CompanyLogoRequest.php
+++ b/app/Domains/Accounts/Http/Requests/CompanyLogoRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use App\Rules\Base64Mime;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Requests/CompanyRequest.php b/app/Domains/Accounts/Http/Requests/CompanyRequest.php
similarity index 96%
rename from app/Http/Requests/CompanyRequest.php
rename to app/Domains/Accounts/Http/Requests/CompanyRequest.php
index d0b818b9..05ce4a01 100644
--- a/app/Http/Requests/CompanyRequest.php
+++ b/app/Domains/Accounts/Http/Requests/CompanyRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Str;
diff --git a/app/Http/Requests/DeleteMemberRequest.php b/app/Domains/Accounts/Http/Requests/DeleteMemberRequest.php
similarity index 93%
rename from app/Http/Requests/DeleteMemberRequest.php
rename to app/Domains/Accounts/Http/Requests/DeleteMemberRequest.php
index 772b9fed..89e5f5c0 100644
--- a/app/Http/Requests/DeleteMemberRequest.php
+++ b/app/Domains/Accounts/Http/Requests/DeleteMemberRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/GetSettingsRequest.php b/app/Domains/Accounts/Http/Requests/GetSettingsRequest.php
similarity index 92%
rename from app/Http/Requests/GetSettingsRequest.php
rename to app/Domains/Accounts/Http/Requests/GetSettingsRequest.php
index 4600ffb5..77f9333b 100644
--- a/app/Http/Requests/GetSettingsRequest.php
+++ b/app/Domains/Accounts/Http/Requests/GetSettingsRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/LoginRequest.php b/app/Domains/Accounts/Http/Requests/LoginRequest.php
similarity index 93%
rename from app/Http/Requests/LoginRequest.php
rename to app/Domains/Accounts/Http/Requests/LoginRequest.php
index 2a637b10..c725447f 100644
--- a/app/Http/Requests/LoginRequest.php
+++ b/app/Domains/Accounts/Http/Requests/LoginRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/MemberRequest.php b/app/Domains/Accounts/Http/Requests/MemberRequest.php
similarity index 89%
rename from app/Http/Requests/MemberRequest.php
rename to app/Domains/Accounts/Http/Requests/MemberRequest.php
index dff566dc..200981e6 100644
--- a/app/Http/Requests/MemberRequest.php
+++ b/app/Domains/Accounts/Http/Requests/MemberRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use App\Rules\IdnEmail;
 use Illuminate\Foundation\Http\FormRequest;
@@ -66,6 +66,12 @@ class MemberRequest extends FormRequest
     public function getUserPayload()
     {
         return collect($this->validated())
+            ->only([
+                'name',
+                'email',
+                'phone',
+                'password',
+            ])
             ->merge([
                 'creator_id' => $this->user()->id,
             ])
diff --git a/app/Http/Requests/ProfileRequest.php b/app/Domains/Accounts/Http/Requests/ProfileRequest.php
similarity index 94%
rename from app/Http/Requests/ProfileRequest.php
rename to app/Domains/Accounts/Http/Requests/ProfileRequest.php
index 502892fb..a78a4adb 100644
--- a/app/Http/Requests/ProfileRequest.php
+++ b/app/Domains/Accounts/Http/Requests/ProfileRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use App\Rules\IdnEmail;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Requests/RoleRequest.php b/app/Domains/Accounts/Http/Requests/RoleRequest.php
similarity index 96%
rename from app/Http/Requests/RoleRequest.php
rename to app/Domains/Accounts/Http/Requests/RoleRequest.php
index 03d8bad9..f03ee6c2 100644
--- a/app/Http/Requests/RoleRequest.php
+++ b/app/Domains/Accounts/Http/Requests/RoleRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/UpdateSettingsRequest.php b/app/Domains/Accounts/Http/Requests/UpdateSettingsRequest.php
similarity index 91%
rename from app/Http/Requests/UpdateSettingsRequest.php
rename to app/Domains/Accounts/Http/Requests/UpdateSettingsRequest.php
index 83f4ae5c..c319ad9f 100644
--- a/app/Http/Requests/UpdateSettingsRequest.php
+++ b/app/Domains/Accounts/Http/Requests/UpdateSettingsRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Accounts\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Resources/CompanyInvitationResource.php b/app/Domains/Accounts/Http/Resources/CompanyInvitationResource.php
similarity index 95%
rename from app/Http/Resources/CompanyInvitationResource.php
rename to app/Domains/Accounts/Http/Resources/CompanyInvitationResource.php
index ca978b69..30109486 100644
--- a/app/Http/Resources/CompanyInvitationResource.php
+++ b/app/Domains/Accounts/Http/Resources/CompanyInvitationResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Accounts\Http\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Http/Resources/CompanyResource.php b/app/Domains/Accounts/Http/Resources/CompanyResource.php
similarity index 90%
rename from app/Http/Resources/CompanyResource.php
rename to app/Domains/Accounts/Http/Resources/CompanyResource.php
index 7d7348af..c10ce951 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Domains/Accounts/Http/Resources/CompanyResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Accounts\Http\Resources;
 
+use App\Domains\Contacts\Http\Resources\AddressResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\Auth;
@@ -50,7 +51,7 @@ class CompanyResource extends JsonResource
         return DB::table('assigned_roles')
             ->join('roles', 'roles.id', '=', 'assigned_roles.role_id')
             ->where('assigned_roles.entity_id', $user->id)
-            ->where('assigned_roles.entity_type', get_class($user))
+            ->where('assigned_roles.entity_type', $user->getMorphClass())
             ->where('assigned_roles.scope', $this->id)
             ->value('roles.title');
     }
diff --git a/app/Http/Resources/Customer/CompanyResource.php b/app/Domains/Accounts/Http/Resources/CustomerPortal/CompanyResource.php
similarity index 84%
rename from app/Http/Resources/Customer/CompanyResource.php
rename to app/Domains/Accounts/Http/Resources/CustomerPortal/CompanyResource.php
index f4d734e4..4d6be0fe 100644
--- a/app/Http/Resources/Customer/CompanyResource.php
+++ b/app/Domains/Accounts/Http/Resources/CustomerPortal/CompanyResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Accounts\Http\Resources\CustomerPortal;
 
+use App\Domains\Contacts\Http\Resources\CustomerPortal\AddressResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/Customer/UserResource.php b/app/Domains/Accounts/Http/Resources/CustomerPortal/UserResource.php
similarity index 91%
rename from app/Http/Resources/Customer/UserResource.php
rename to app/Domains/Accounts/Http/Resources/CustomerPortal/UserResource.php
index 219434e6..45b6bf95 100644
--- a/app/Http/Resources/Customer/UserResource.php
+++ b/app/Domains/Accounts/Http/Resources/CustomerPortal/UserResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Accounts\Http\Resources\CustomerPortal;
 
+use App\Domains\Money\Http\Resources\CustomerPortal\CurrencyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/RoleResource.php b/app/Domains/Accounts/Http/Resources/RoleResource.php
similarity index 89%
rename from app/Http/Resources/RoleResource.php
rename to app/Domains/Accounts/Http/Resources/RoleResource.php
index 5a60235d..bc181427 100644
--- a/app/Http/Resources/RoleResource.php
+++ b/app/Domains/Accounts/Http/Resources/RoleResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Accounts\Http\Resources;
 
-use App\Models\CompanySetting;
+use App\Domains\Accounts\Models\CompanySetting;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Http/Resources/UserResource.php b/app/Domains/Accounts/Http/Resources/UserResource.php
similarity index 93%
rename from app/Http/Resources/UserResource.php
rename to app/Domains/Accounts/Http/Resources/UserResource.php
index c12e5ff7..0e647955 100644
--- a/app/Http/Resources/UserResource.php
+++ b/app/Domains/Accounts/Http/Resources/UserResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Accounts\Http\Resources;
 
+use App\Domains\Money\Http\Resources\CurrencyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Mail/CompanyInvitationMail.php b/app/Domains/Accounts/Mail/CompanyInvitationMail.php
similarity index 94%
rename from app/Mail/CompanyInvitationMail.php
rename to app/Domains/Accounts/Mail/CompanyInvitationMail.php
index dd6824e1..4933615c 100644
--- a/app/Mail/CompanyInvitationMail.php
+++ b/app/Domains/Accounts/Mail/CompanyInvitationMail.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Mail;
+namespace App\Domains\Accounts\Mail;
 
-use App\Models\CompanyInvitation;
+use App\Domains\Accounts\Models\CompanyInvitation;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
diff --git a/app/Models/Company.php b/app/Domains/Accounts/Models/Company.php
similarity index 83%
rename from app/Models/Company.php
rename to app/Domains/Accounts/Models/Company.php
index d7365a78..339b39b2 100644
--- a/app/Models/Company.php
+++ b/app/Domains/Accounts/Models/Company.php
@@ -1,7 +1,24 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Accounts\Models;
 
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Catalog\Models\Unit;
+use App\Domains\Contacts\Models\Address;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Metadata\Models\CustomFieldValue;
+use App\Domains\Money\Models\ExchangeRateLog;
+use App\Domains\Money\Models\ExchangeRateProvider;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Purchases\Models\ExpenseCategory;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentMethod;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\RecurringInvoice;
+use App\Domains\Taxation\Models\TaxType;
+use App\Platform\Storage\Models\FileDisk;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -14,6 +31,8 @@ use Spatie\MediaLibrary\InteractsWithMedia;
 
 class Company extends Model implements HasMedia
 {
+    protected $table = 'companies';
+
     use HasFactory;
     use InteractsWithMedia;
 
diff --git a/app/Models/CompanyInvitation.php b/app/Domains/Accounts/Models/CompanyInvitation.php
similarity index 95%
rename from app/Models/CompanyInvitation.php
rename to app/Domains/Accounts/Models/CompanyInvitation.php
index e415c715..4bea1a48 100644
--- a/app/Models/CompanyInvitation.php
+++ b/app/Domains/Accounts/Models/CompanyInvitation.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Accounts\Models;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
@@ -11,6 +11,8 @@ use Silber\Bouncer\Database\Role;
 
 class CompanyInvitation extends Model
 {
+    protected $table = 'company_invitations';
+
     use HasFactory;
 
     protected $guarded = ['id'];
diff --git a/app/Models/CompanySetting.php b/app/Domains/Accounts/Models/CompanySetting.php
similarity index 96%
rename from app/Models/CompanySetting.php
rename to app/Domains/Accounts/Models/CompanySetting.php
index 5f96676f..4bd9dd18 100644
--- a/app/Models/CompanySetting.php
+++ b/app/Domains/Accounts/Models/CompanySetting.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Accounts\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -9,6 +9,8 @@ use Illuminate\Support\Collection;
 
 class CompanySetting extends Model
 {
+    protected $table = 'company_settings';
+
     use HasFactory;
 
     protected $fillable = ['company_id', 'option', 'value'];
diff --git a/app/Models/ImpersonationLog.php b/app/Domains/Accounts/Models/ImpersonationLog.php
similarity index 84%
rename from app/Models/ImpersonationLog.php
rename to app/Domains/Accounts/Models/ImpersonationLog.php
index 2694e614..0c8248c2 100644
--- a/app/Models/ImpersonationLog.php
+++ b/app/Domains/Accounts/Models/ImpersonationLog.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Accounts\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class ImpersonationLog extends Model
 {
+    protected $table = 'impersonation_logs';
+
     protected $guarded = ['id'];
 
     protected $casts = [
diff --git a/app/Models/User.php b/app/Domains/Accounts/Models/User.php
similarity index 94%
rename from app/Models/User.php
rename to app/Domains/Accounts/Models/User.php
index d002bb12..35e482b1 100644
--- a/app/Models/User.php
+++ b/app/Domains/Accounts/Models/User.php
@@ -1,10 +1,19 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Accounts\Models;
 
-use App\Notifications\MailResetPasswordNotification;
+use App\Domains\Accounts\Notifications\MailResetPasswordNotification;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Contacts\Models\Address;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Concerns\HasCustomFields;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\RecurringInvoice;
 use App\Support\SafeOrderBy;
-use App\Traits\HasCustomFieldsTrait;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -22,8 +31,10 @@ use Spatie\MediaLibrary\InteractsWithMedia;
 
 class User extends Authenticatable implements HasMedia
 {
+    protected $table = 'users';
+
     use HasApiTokens;
-    use HasCustomFieldsTrait;
+    use HasCustomFields;
     use HasFactory;
     use HasRolesAndAbilities;
     use InteractsWithMedia;
diff --git a/app/Models/UserSetting.php b/app/Domains/Accounts/Models/UserSetting.php
similarity index 81%
rename from app/Models/UserSetting.php
rename to app/Domains/Accounts/Models/UserSetting.php
index 5229ee04..dce5b907 100644
--- a/app/Models/UserSetting.php
+++ b/app/Domains/Accounts/Models/UserSetting.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Accounts\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -8,6 +8,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class UserSetting extends Model
 {
+    protected $table = 'user_settings';
+
     use HasFactory;
 
     protected $guarded = ['id'];
diff --git a/app/Notifications/MailResetPasswordNotification.php b/app/Domains/Accounts/Notifications/MailResetPasswordNotification.php
similarity index 97%
rename from app/Notifications/MailResetPasswordNotification.php
rename to app/Domains/Accounts/Notifications/MailResetPasswordNotification.php
index 6e0e9404..e69ed649 100644
--- a/app/Notifications/MailResetPasswordNotification.php
+++ b/app/Domains/Accounts/Notifications/MailResetPasswordNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Notifications;
+namespace App\Domains\Accounts\Notifications;
 
 use Illuminate\Auth\Notifications\ResetPassword;
 use Illuminate\Bus\Queueable;
diff --git a/app/Policies/CompanyPolicy.php b/app/Domains/Accounts/Policies/CompanyPolicy.php
similarity index 83%
rename from app/Policies/CompanyPolicy.php
rename to app/Domains/Accounts/Policies/CompanyPolicy.php
index 93210abd..3f3cdd9d 100644
--- a/app/Policies/CompanyPolicy.php
+++ b/app/Domains/Accounts/Policies/CompanyPolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Accounts\Policies;
 
-use App\Models\Company;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class CompanyPolicy
diff --git a/app/Policies/OwnerPolicy.php b/app/Domains/Accounts/Policies/OwnerPolicy.php
similarity index 76%
rename from app/Policies/OwnerPolicy.php
rename to app/Domains/Accounts/Policies/OwnerPolicy.php
index 5c9478a8..3e0680a2 100644
--- a/app/Policies/OwnerPolicy.php
+++ b/app/Domains/Accounts/Policies/OwnerPolicy.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Accounts\Policies;
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class OwnerPolicy
diff --git a/app/Policies/RolePolicy.php b/app/Domains/Accounts/Policies/RolePolicy.php
similarity index 94%
rename from app/Policies/RolePolicy.php
rename to app/Domains/Accounts/Policies/RolePolicy.php
index b1b019c8..792228b3 100644
--- a/app/Policies/RolePolicy.php
+++ b/app/Domains/Accounts/Policies/RolePolicy.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Accounts\Policies;
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\Database\Role;
 
diff --git a/app/Domains/Accounts/Policies/SettingsPolicy.php b/app/Domains/Accounts/Policies/SettingsPolicy.php
new file mode 100644
index 00000000..56b2f193
--- /dev/null
+++ b/app/Domains/Accounts/Policies/SettingsPolicy.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Domains\Accounts\Policies;
+
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class SettingsPolicy
+{
+    use HandlesAuthorization;
+
+    public function manageCompany(User $user, Company $company)
+    {
+        if ($user->id == $company->owner_id) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/Policies/UserPolicy.php b/app/Domains/Accounts/Policies/UserPolicy.php
similarity index 97%
rename from app/Policies/UserPolicy.php
rename to app/Domains/Accounts/Policies/UserPolicy.php
index 1c64c46b..e8f7edff 100644
--- a/app/Policies/UserPolicy.php
+++ b/app/Domains/Accounts/Policies/UserPolicy.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Accounts\Policies;
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class UserPolicy
diff --git a/app/Domains/Accounts/routes/admin.php b/app/Domains/Accounts/routes/admin.php
new file mode 100644
index 00000000..294f14c8
--- /dev/null
+++ b/app/Domains/Accounts/routes/admin.php
@@ -0,0 +1,13 @@
+<?php
+
+use App\Domains\Accounts\Http\Controllers\Admin\CompaniesController;
+use App\Domains\Accounts\Http\Controllers\Admin\UsersController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('companies', [CompaniesController::class, 'index']);
+Route::get('companies/{company}', [CompaniesController::class, 'show']);
+Route::put('companies/{company}', [CompaniesController::class, 'update']);
+Route::get('users', [UsersController::class, 'index']);
+Route::get('users/{user}', [UsersController::class, 'show']);
+Route::put('users/{user}', [UsersController::class, 'update']);
+Route::post('users/{user}/impersonate', [UsersController::class, 'impersonate']);
diff --git a/app/Domains/Accounts/routes/company.php b/app/Domains/Accounts/routes/company.php
new file mode 100644
index 00000000..92e3be1c
--- /dev/null
+++ b/app/Domains/Accounts/routes/company.php
@@ -0,0 +1,33 @@
+<?php
+
+use App\Domains\Accounts\Http\Controllers\Auth\AuthController;
+use App\Domains\Accounts\Http\Controllers\Company\AbilitiesController;
+use App\Domains\Accounts\Http\Controllers\Company\CompanyController;
+use App\Domains\Accounts\Http\Controllers\Company\CompanySettingsController;
+use App\Domains\Accounts\Http\Controllers\Company\InvitationController;
+use App\Domains\Accounts\Http\Controllers\Company\InvitationResponseController;
+use App\Domains\Accounts\Http\Controllers\Company\RolesController;
+use App\Domains\Accounts\Http\Controllers\Company\UserProfileController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/invitations/pending', [InvitationResponseController::class, 'pending']);
+Route::post('/invitations/{invitation:token}/accept', [InvitationResponseController::class, 'accept']);
+Route::post('/invitations/{invitation:token}/decline', [InvitationResponseController::class, 'decline']);
+Route::get('/auth/check', [AuthController::class, 'check']);
+
+Route::apiResource('company-invitations', InvitationController::class)->only(['index', 'store', 'destroy']);
+
+Route::get('/me', [UserProfileController::class, 'show']);
+Route::put('/me', [UserProfileController::class, 'update']);
+Route::get('/me/settings', [UserProfileController::class, 'showSettings']);
+Route::put('/me/settings', [UserProfileController::class, 'updateSettings']);
+Route::post('/me/upload-avatar', [UserProfileController::class, 'uploadAvatar']);
+
+Route::put('/company', [CompanyController::class, 'updateCompany']);
+Route::post('/company/upload-logo', [CompanyController::class, 'uploadCompanyLogo']);
+Route::get('/company/settings', [CompanySettingsController::class, 'show']);
+Route::post('/company/settings', [CompanySettingsController::class, 'update']);
+Route::get('/company/has-transactions', [CompanySettingsController::class, 'checkTransactions']);
+
+Route::get('abilities', AbilitiesController::class);
+Route::apiResource('roles', RolesController::class);
diff --git a/app/Domains/Accounts/routes/impersonation.php b/app/Domains/Accounts/routes/impersonation.php
new file mode 100644
index 00000000..707a3bbe
--- /dev/null
+++ b/app/Domains/Accounts/routes/impersonation.php
@@ -0,0 +1,6 @@
+<?php
+
+use App\Domains\Accounts\Http\Controllers\Admin\UsersController;
+use Illuminate\Support\Facades\Route;
+
+Route::post('stop-impersonating', [UsersController::class, 'stopImpersonating']);
diff --git a/app/Domains/Accounts/routes/management.php b/app/Domains/Accounts/routes/management.php
new file mode 100644
index 00000000..71ac4ff2
--- /dev/null
+++ b/app/Domains/Accounts/routes/management.php
@@ -0,0 +1,14 @@
+<?php
+
+use App\Domains\Accounts\Http\Controllers\Admin\CompaniesController;
+use App\Domains\Accounts\Http\Controllers\Company\CompanySettingsController;
+use App\Domains\Accounts\Http\Controllers\Company\MembersController;
+use Illuminate\Support\Facades\Route;
+
+Route::post('companies', [CompaniesController::class, 'store']);
+Route::post('/transfer/ownership/{user}', [CompanySettingsController::class, 'transferOwnership']);
+Route::post('companies/delete', [CompaniesController::class, 'destroy']);
+Route::get('companies', [CompaniesController::class, 'userCompanies']);
+
+Route::post('/members/delete', [MembersController::class, 'delete']);
+Route::apiResource('/members', MembersController::class);
diff --git a/app/Domains/Accounts/routes/public.php b/app/Domains/Accounts/routes/public.php
new file mode 100644
index 00000000..aa5fb809
--- /dev/null
+++ b/app/Domains/Accounts/routes/public.php
@@ -0,0 +1,17 @@
+<?php
+
+use App\Domains\Accounts\Http\Controllers\Auth\AuthController;
+use App\Domains\Accounts\Http\Controllers\Auth\ForgotPasswordController;
+use App\Domains\Accounts\Http\Controllers\Auth\InvitationRegistrationController;
+use App\Domains\Accounts\Http\Controllers\Auth\ResetPasswordController;
+use Illuminate\Support\Facades\Route;
+
+Route::prefix('auth')->group(function (): void {
+    Route::post('login', [AuthController::class, 'login']);
+    Route::post('logout', [AuthController::class, 'logout'])->middleware('auth:sanctum');
+    Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail'])->middleware('throttle:10,2');
+    Route::post('reset/password', [ResetPasswordController::class, 'reset']);
+});
+
+Route::get('/invitations/{token}/details', [InvitationRegistrationController::class, 'details']);
+Route::post('/auth/register-with-invitation', [InvitationRegistrationController::class, 'register']);
diff --git a/app/Domains/Accounts/routes/web.php b/app/Domains/Accounts/routes/web.php
new file mode 100644
index 00000000..624f9572
--- /dev/null
+++ b/app/Domains/Accounts/routes/web.php
@@ -0,0 +1,9 @@
+<?php
+
+use App\Domains\Accounts\Http\Controllers\Auth\LoginController;
+use App\Domains\Accounts\Http\Controllers\InvitationDeclineController;
+use Illuminate\Support\Facades\Route;
+
+Route::post('login', [LoginController::class, 'login']);
+Route::post('auth/logout', [LoginController::class, 'logout']);
+Route::get('/invitations/{token}/decline', InvitationDeclineController::class);
diff --git a/app/Domains/Catalog/Application/ItemService.php b/app/Domains/Catalog/Application/ItemService.php
new file mode 100644
index 00000000..4f75779b
--- /dev/null
+++ b/app/Domains/Catalog/Application/ItemService.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Domains\Catalog\Application;
+
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Catalog\Contracts\ItemTaxManager;
+use App\Domains\Catalog\Models\Item;
+
+class ItemService
+{
+    public function __construct(
+        private readonly ItemTaxManager $itemTaxManager,
+    ) {}
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<int, array<string, mixed>>  $taxes
+     */
+    public function create(array $attributes, array $taxes, int $companyId, int $creatorId): Item
+    {
+        $attributes['company_id'] = $companyId;
+        $attributes['creator_id'] = $creatorId;
+        $attributes['currency_id'] = CompanySetting::getSetting('currency', $companyId);
+
+        $item = Item::create($attributes);
+
+        $this->itemTaxManager->attach($item, $taxes, $companyId);
+
+        return Item::query()->with('taxes')->findOrFail($item->getKey());
+    }
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<int, array<string, mixed>>  $taxes
+     */
+    public function update(Item $item, array $attributes, array $taxes, int $companyId): Item
+    {
+        $item->update($attributes);
+
+        $this->itemTaxManager->replace($item, $taxes, $companyId);
+
+        return Item::query()->with('taxes')->findOrFail($item->getKey());
+    }
+}
diff --git a/app/Domains/Catalog/CatalogServiceProvider.php b/app/Domains/Catalog/CatalogServiceProvider.php
new file mode 100644
index 00000000..abf98ad0
--- /dev/null
+++ b/app/Domains/Catalog/CatalogServiceProvider.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Domains\Catalog;
+
+use App\Adapters\Catalog\TaxationItemTaxManager;
+use App\Domains\Catalog\Contracts\ItemTaxManager;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Catalog\Models\Unit;
+use App\Domains\Catalog\Policies\ItemPolicy;
+use App\Domains\Catalog\Policies\UnitPolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+
+class CatalogServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->bind(ItemTaxManager::class, TaxationItemTaxManager::class);
+    }
+
+    public function boot(): void
+    {
+        Gate::policy(Item::class, ItemPolicy::class);
+        Gate::policy(Unit::class, UnitPolicy::class);
+        Gate::define('delete multiple items', [ItemPolicy::class, 'deleteMultiple']);
+    }
+}
diff --git a/app/Domains/Catalog/Contracts/ItemTaxManager.php b/app/Domains/Catalog/Contracts/ItemTaxManager.php
new file mode 100644
index 00000000..34bea1df
--- /dev/null
+++ b/app/Domains/Catalog/Contracts/ItemTaxManager.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Domains\Catalog\Contracts;
+
+use App\Domains\Catalog\Models\Item;
+
+interface ItemTaxManager
+{
+    /** @param array<int, array<string, mixed>> $taxes */
+    public function attach(Item $item, array $taxes, int $companyId): void;
+
+    /** @param array<int, array<string, mixed>> $taxes */
+    public function replace(Item $item, array $taxes, int $companyId): void;
+}
diff --git a/app/Http/Controllers/Company/Item/ItemsController.php b/app/Domains/Catalog/Http/Controllers/ItemsController.php
similarity index 69%
rename from app/Http/Controllers/Company/Item/ItemsController.php
rename to app/Domains/Catalog/Http/Controllers/ItemsController.php
index 380aa956..50187f94 100644
--- a/app/Http/Controllers/Company/Item/ItemsController.php
+++ b/app/Domains/Catalog/Http/Controllers/ItemsController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Company\Item;
+namespace App\Domains\Catalog\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests;
-use App\Http\Requests\DeleteItemsRequest;
-use App\Http\Resources\ItemResource;
-use App\Models\Item;
-use App\Models\TaxType;
-use App\Services\ItemService;
+use App\Domains\Catalog\Application\ItemService;
+use App\Domains\Catalog\Http\Requests\DeleteItemsRequest;
+use App\Domains\Catalog\Http\Requests\ItemsRequest;
+use App\Domains\Catalog\Http\Resources\ItemResource;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Taxation\Models\TaxType;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -49,14 +49,18 @@ class ItemsController extends Controller
     /**
      * Create Item.
      *
-     * @param  App\Http\Requests\ItemsRequest  $request
      * @return JsonResponse
      */
-    public function store(Requests\ItemsRequest $request)
+    public function store(ItemsRequest $request)
     {
         $this->authorize('create', Item::class);
 
-        $item = $this->itemService->create($request);
+        $item = $this->itemService->create(
+            $request->validated(),
+            $request->input('taxes', []),
+            (int) $request->header('company'),
+            (int) $request->user()->getAuthIdentifier(),
+        );
 
         return new ItemResource($item);
     }
@@ -76,14 +80,18 @@ class ItemsController extends Controller
     /**
      * Update an existing Item.
      *
-     * @param  App\Http\Requests\ItemsRequest  $request
      * @return JsonResponse
      */
-    public function update(Requests\ItemsRequest $request, Item $item)
+    public function update(ItemsRequest $request, Item $item)
     {
         $this->authorize('update', $item);
 
-        $item = $this->itemService->update($item, $request);
+        $item = $this->itemService->update(
+            $item,
+            $request->validated(),
+            $request->input('taxes', []),
+            (int) $request->header('company'),
+        );
 
         return new ItemResource($item);
     }
diff --git a/app/Http/Controllers/Company/Item/UnitsController.php b/app/Domains/Catalog/Http/Controllers/UnitsController.php
similarity index 89%
rename from app/Http/Controllers/Company/Item/UnitsController.php
rename to app/Domains/Catalog/Http/Controllers/UnitsController.php
index 8fb3c762..07df1285 100644
--- a/app/Http/Controllers/Company/Item/UnitsController.php
+++ b/app/Domains/Catalog/Http/Controllers/UnitsController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Company\Item;
+namespace App\Domains\Catalog\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\UnitRequest;
-use App\Http\Resources\UnitResource;
-use App\Models\Unit;
+use App\Domains\Catalog\Http\Requests\UnitRequest;
+use App\Domains\Catalog\Http\Resources\UnitResource;
+use App\Domains\Catalog\Models\Unit;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
diff --git a/app/Http/Requests/DeleteItemsRequest.php b/app/Domains/Catalog/Http/Requests/DeleteItemsRequest.php
similarity index 91%
rename from app/Http/Requests/DeleteItemsRequest.php
rename to app/Domains/Catalog/Http/Requests/DeleteItemsRequest.php
index 0fbaa7f5..98ef3ac9 100644
--- a/app/Http/Requests/DeleteItemsRequest.php
+++ b/app/Domains/Catalog/Http/Requests/DeleteItemsRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Catalog\Http\Requests;
 
-use App\Models\Item;
+use App\Domains\Catalog\Models\Item;
 use App\Rules\RelationNotExist;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/ItemsRequest.php b/app/Domains/Catalog/Http/Requests/ItemsRequest.php
similarity index 93%
rename from app/Http/Requests/ItemsRequest.php
rename to app/Domains/Catalog/Http/Requests/ItemsRequest.php
index e8d9dd74..46bfa762 100644
--- a/app/Http/Requests/ItemsRequest.php
+++ b/app/Domains/Catalog/Http/Requests/ItemsRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Catalog\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/UnitRequest.php b/app/Domains/Catalog/Http/Requests/UnitRequest.php
similarity index 96%
rename from app/Http/Requests/UnitRequest.php
rename to app/Domains/Catalog/Http/Requests/UnitRequest.php
index d7151c9d..47640309 100644
--- a/app/Http/Requests/UnitRequest.php
+++ b/app/Domains/Catalog/Http/Requests/UnitRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Catalog\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Resources/ItemResource.php b/app/Domains/Catalog/Http/Resources/ItemResource.php
similarity index 87%
rename from app/Http/Resources/ItemResource.php
rename to app/Domains/Catalog/Http/Resources/ItemResource.php
index 0fd8213b..814b3b6c 100644
--- a/app/Http/Resources/ItemResource.php
+++ b/app/Domains/Catalog/Http/Resources/ItemResource.php
@@ -1,7 +1,10 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Catalog\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Money\Http\Resources\CurrencyResource;
+use App\Domains\Taxation\Http\Resources\TaxResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/UnitResource.php b/app/Domains/Catalog/Http/Resources/UnitResource.php
similarity index 85%
rename from app/Http/Resources/UnitResource.php
rename to app/Domains/Catalog/Http/Resources/UnitResource.php
index 8f8457a4..1c54ffb2 100644
--- a/app/Http/Resources/UnitResource.php
+++ b/app/Domains/Catalog/Http/Resources/UnitResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Catalog\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Models/Item.php b/app/Domains/Catalog/Models/Item.php
similarity index 91%
rename from app/Models/Item.php
rename to app/Domains/Catalog/Models/Item.php
index 4ce6cae2..d24c8cc0 100644
--- a/app/Models/Item.php
+++ b/app/Domains/Catalog/Models/Item.php
@@ -1,7 +1,14 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Catalog\Models;
 
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Sales\Models\EstimateItem;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Taxation\Models\Tax;
 use App\Support\SafeOrderBy;
 use Carbon\Carbon;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
@@ -14,6 +21,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Item extends Model
 {
+    protected $table = 'items';
+
     use HasFactory;
 
     protected $guarded = ['id'];
diff --git a/app/Models/Unit.php b/app/Domains/Catalog/Models/Unit.php
similarity index 94%
rename from app/Models/Unit.php
rename to app/Domains/Catalog/Models/Unit.php
index f10cee63..9c748622 100644
--- a/app/Models/Unit.php
+++ b/app/Domains/Catalog/Models/Unit.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Catalog\Models;
 
+use App\Domains\Accounts\Models\Company;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -12,6 +13,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Unit extends Model
 {
+    protected $table = 'units';
+
     use HasFactory;
 
     protected $fillable = ['name', 'company_id'];
diff --git a/app/Policies/ItemPolicy.php b/app/Domains/Catalog/Policies/ItemPolicy.php
similarity index 95%
rename from app/Policies/ItemPolicy.php
rename to app/Domains/Catalog/Policies/ItemPolicy.php
index 074f33b2..680b9ec1 100644
--- a/app/Policies/ItemPolicy.php
+++ b/app/Domains/Catalog/Policies/ItemPolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Catalog\Policies;
 
-use App\Models\Item;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Models\Item;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Policies/UnitPolicy.php b/app/Domains/Catalog/Policies/UnitPolicy.php
similarity index 93%
rename from app/Policies/UnitPolicy.php
rename to app/Domains/Catalog/Policies/UnitPolicy.php
index 4a8b7f3d..e79c62c5 100644
--- a/app/Policies/UnitPolicy.php
+++ b/app/Domains/Catalog/Policies/UnitPolicy.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Catalog\Policies;
 
-use App\Models\Item;
-use App\Models\Unit;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Catalog\Models\Unit;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Domains/Catalog/routes/company.php b/app/Domains/Catalog/routes/company.php
new file mode 100644
index 00000000..87666846
--- /dev/null
+++ b/app/Domains/Catalog/routes/company.php
@@ -0,0 +1,9 @@
+<?php
+
+use App\Domains\Catalog\Http\Controllers\ItemsController;
+use App\Domains\Catalog\Http\Controllers\UnitsController;
+use Illuminate\Support\Facades\Route;
+
+Route::post('/items/delete', [ItemsController::class, 'delete']);
+Route::resource('items', ItemsController::class);
+Route::resource('units', UnitsController::class);
diff --git a/app/Domains/Contacts/Application/CustomerService.php b/app/Domains/Contacts/Application/CustomerService.php
new file mode 100644
index 00000000..2f63bc57
--- /dev/null
+++ b/app/Domains/Contacts/Application/CustomerService.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace App\Domains\Contacts\Application;
+
+use App\Domains\Contacts\Contracts\CustomerDataPurger;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Validation\ValidationException;
+
+class CustomerService
+{
+    public function __construct(
+        private readonly CustomFieldValueWriter $customFieldValueWriter,
+        private readonly CustomerDataPurger $customerDataPurger,
+    ) {}
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<string, mixed>|null  $shippingAddress
+     * @param  array<string, mixed>|null  $billingAddress
+     */
+    public function create(
+        array $attributes,
+        ?array $shippingAddress = null,
+        ?array $billingAddress = null,
+        ?iterable $customFields = null,
+    ): Customer {
+        $customer = DB::transaction(function () use ($attributes, $shippingAddress, $billingAddress, $customFields): Customer {
+            $customer = Customer::create($attributes);
+
+            $this->replaceAddresses($customer, $shippingAddress, $billingAddress);
+
+            if ($customFields) {
+                $this->customFieldValueWriter->attach($customer, $customFields);
+            }
+
+            return $customer;
+        });
+
+        return Customer::with('billingAddress', 'shippingAddress', 'fields')->findOrFail($customer->id);
+    }
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<string, mixed>|null  $shippingAddress
+     * @param  array<string, mixed>|null  $billingAddress
+     *
+     * @throws ValidationException
+     */
+    public function update(
+        Customer $customer,
+        array $attributes,
+        ?array $shippingAddress = null,
+        ?array $billingAddress = null,
+        ?iterable $customFields = null,
+    ): Customer {
+        $hasCurrencyLockedActivity = $customer->estimates()->exists()
+            || $customer->invoices()->exists()
+            || $customer->payments()->exists()
+            || $customer->recurringInvoices()->exists();
+
+        if (($customer->currency_id !== ($attributes['currency_id'] ?? null)) && $hasCurrencyLockedActivity) {
+            throw ValidationException::withMessages([
+                'currency_id' => ['you_cannot_edit_currency'],
+            ]);
+        }
+
+        DB::transaction(function () use ($customer, $attributes, $shippingAddress, $billingAddress, $customFields): void {
+            $customer->update($attributes);
+            $customer->addresses()->delete();
+            $this->replaceAddresses($customer, $shippingAddress, $billingAddress);
+
+            if ($customFields) {
+                $this->customFieldValueWriter->update($customer, $customFields);
+            }
+        });
+
+        return $customer->fresh(['billingAddress', 'shippingAddress', 'fields']);
+    }
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<string, mixed>|null  $shippingAddress
+     * @param  array<string, mixed>|null  $billingAddress
+     */
+    public function updateProfile(
+        Customer $customer,
+        array $attributes,
+        ?array $shippingAddress = null,
+        ?array $billingAddress = null,
+    ): Customer {
+        DB::transaction(function () use ($customer, $attributes, $shippingAddress, $billingAddress): void {
+            $customer->update($attributes);
+
+            if ($shippingAddress !== null) {
+                $customer->shippingAddress()->delete();
+                $customer->addresses()->create($shippingAddress);
+            }
+
+            if ($billingAddress !== null) {
+                $customer->billingAddress()->delete();
+                $customer->addresses()->create($billingAddress);
+            }
+        });
+
+        return $customer->fresh(['billingAddress', 'shippingAddress', 'fields']);
+    }
+
+    /** @param iterable<int, int> $ids */
+    public function delete(iterable $ids): bool
+    {
+        DB::transaction(function () use ($ids): void {
+            foreach ($ids as $id) {
+                $customer = Customer::find($id);
+
+                if (! $customer) {
+                    continue;
+                }
+
+                $this->customerDataPurger->purge($customer);
+                $customer->addresses()->delete();
+                $customer->delete();
+            }
+        });
+
+        return true;
+    }
+
+    /**
+     * @param  array<string, mixed>|null  $shippingAddress
+     * @param  array<string, mixed>|null  $billingAddress
+     */
+    private function replaceAddresses(Customer $customer, ?array $shippingAddress, ?array $billingAddress): void
+    {
+        if ($shippingAddress !== null) {
+            $customer->addresses()->create($shippingAddress);
+        }
+
+        if ($billingAddress !== null) {
+            $customer->addresses()->create($billingAddress);
+        }
+    }
+}
diff --git a/app/Domains/Contacts/ContactsServiceProvider.php b/app/Domains/Contacts/ContactsServiceProvider.php
new file mode 100644
index 00000000..6d244a64
--- /dev/null
+++ b/app/Domains/Contacts/ContactsServiceProvider.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Domains\Contacts;
+
+use App\Adapters\Contacts\EloquentCustomerDataPurger;
+use App\Adapters\Contacts\EloquentCustomerPortalDashboardProvider;
+use App\Adapters\Contacts\EloquentCustomerStatsProvider;
+use App\Adapters\Contacts\MediaLibraryCustomerAvatarManager;
+use App\Domains\Contacts\Contracts\CustomerAvatarManager;
+use App\Domains\Contacts\Contracts\CustomerDataPurger;
+use App\Domains\Contacts\Contracts\CustomerPortalDashboardProvider;
+use App\Domains\Contacts\Contracts\CustomerStatsProvider;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Contacts\Policies\CustomerPolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+
+class ContactsServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->bind(CustomerAvatarManager::class, MediaLibraryCustomerAvatarManager::class);
+        $this->app->bind(CustomerDataPurger::class, EloquentCustomerDataPurger::class);
+        $this->app->bind(CustomerPortalDashboardProvider::class, EloquentCustomerPortalDashboardProvider::class);
+        $this->app->bind(CustomerStatsProvider::class, EloquentCustomerStatsProvider::class);
+    }
+
+    public function boot(): void
+    {
+        Gate::policy(Customer::class, CustomerPolicy::class);
+        Gate::define('delete multiple customers', [CustomerPolicy::class, 'deleteMultiple']);
+    }
+}
diff --git a/app/Domains/Contacts/Contracts/CustomerAvatarManager.php b/app/Domains/Contacts/Contracts/CustomerAvatarManager.php
new file mode 100644
index 00000000..3cfbc1a0
--- /dev/null
+++ b/app/Domains/Contacts/Contracts/CustomerAvatarManager.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Domains\Contacts\Contracts;
+
+use App\Domains\Contacts\Models\Customer;
+
+interface CustomerAvatarManager
+{
+    public function clear(Customer $customer): void;
+
+    public function replace(Customer $customer, string $path, string $fileName): void;
+}
diff --git a/app/Domains/Contacts/Contracts/CustomerDataPurger.php b/app/Domains/Contacts/Contracts/CustomerDataPurger.php
new file mode 100644
index 00000000..aa162ac3
--- /dev/null
+++ b/app/Domains/Contacts/Contracts/CustomerDataPurger.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Contacts\Contracts;
+
+use App\Domains\Contacts\Models\Customer;
+
+interface CustomerDataPurger
+{
+    public function purge(Customer $customer): void;
+}
diff --git a/app/Domains/Contacts/Contracts/CustomerPortalDashboardProvider.php b/app/Domains/Contacts/Contracts/CustomerPortalDashboardProvider.php
new file mode 100644
index 00000000..7f812712
--- /dev/null
+++ b/app/Domains/Contacts/Contracts/CustomerPortalDashboardProvider.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Domains\Contacts\Contracts;
+
+use App\Domains\Contacts\Models\Customer;
+
+interface CustomerPortalDashboardProvider
+{
+    /** @return array<string, mixed> */
+    public function get(Customer $customer): array;
+}
diff --git a/app/Domains/Contacts/Contracts/CustomerStatsProvider.php b/app/Domains/Contacts/Contracts/CustomerStatsProvider.php
new file mode 100644
index 00000000..4c861b7a
--- /dev/null
+++ b/app/Domains/Contacts/Contracts/CustomerStatsProvider.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Domains\Contacts\Contracts;
+
+use App\Domains\Contacts\Models\Customer;
+
+interface CustomerStatsProvider
+{
+    /** @return array<string, mixed> */
+    public function get(Customer $customer, int $companyId, bool $previousYear = false): array;
+}
diff --git a/app/Domains/Contacts/Http/Controllers/Company/CustomerStatsController.php b/app/Domains/Contacts/Http/Controllers/Company/CustomerStatsController.php
new file mode 100644
index 00000000..f42a365c
--- /dev/null
+++ b/app/Domains/Contacts/Http/Controllers/Company/CustomerStatsController.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Domains\Contacts\Http\Controllers\Company;
+
+use App\Domains\Contacts\Contracts\CustomerStatsProvider;
+use App\Domains\Contacts\Http\Resources\CustomerResource;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Reporting\Queries\CustomerStatementQuery;
+use App\Platform\Http\Controller;
+use Illuminate\Http\Request;
+
+class CustomerStatsController extends Controller
+{
+    public function __construct(
+        private readonly CustomerStatsProvider $customerStatsProvider,
+        private readonly CustomerStatementQuery $customerStatementQuery,
+    ) {}
+
+    public function __invoke(Request $request, Customer $customer)
+    {
+        $this->authorize('view', $customer);
+
+        $chartData = $this->customerStatsProvider->get(
+            $customer,
+            $request->header('company'),
+            $request->has('previous_year')
+        );
+
+        $customer = Customer::find($customer->id);
+        $this->customerStatementQuery->hydrateAccountSummaries([$customer]);
+
+        return (new CustomerResource($customer))
+            ->additional(['meta' => [
+                'chartData' => $chartData,
+            ]]);
+    }
+}
diff --git a/app/Http/Controllers/Company/Customer/CustomersController.php b/app/Domains/Contacts/Http/Controllers/Company/CustomersController.php
similarity index 60%
rename from app/Http/Controllers/Company/Customer/CustomersController.php
rename to app/Domains/Contacts/Http/Controllers/Company/CustomersController.php
index 3caa4240..41cf9c00 100644
--- a/app/Http/Controllers/Company/Customer/CustomersController.php
+++ b/app/Domains/Contacts/Http/Controllers/Company/CustomersController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Company\Customer;
+namespace App\Domains\Contacts\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests;
-use App\Http\Requests\DeleteCustomersRequest;
-use App\Http\Resources\CustomerResource;
-use App\Models\Customer;
-use App\Services\CustomerService;
-use App\Services\CustomerStatementService;
+use App\Domains\Contacts\Application\CustomerService;
+use App\Domains\Contacts\Http\Requests\CustomerRequest;
+use App\Domains\Contacts\Http\Requests\DeleteCustomersRequest;
+use App\Domains\Contacts\Http\Resources\CustomerResource;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Reporting\Queries\CustomerStatementQuery;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -17,7 +17,7 @@ class CustomersController extends Controller
 {
     public function __construct(
         private readonly CustomerService $customerService,
-        private readonly CustomerStatementService $customerStatementService,
+        private readonly CustomerStatementQuery $customerStatementQuery,
     ) {}
 
     /**
@@ -36,7 +36,7 @@ class CustomersController extends Controller
             ->applyFilters($request->all())
             ->paginateData($limit);
 
-        $this->customerStatementService->hydrateAccountSummaries(
+        $this->customerStatementQuery->hydrateAccountSummaries(
             $customers instanceof LengthAwarePaginator ? $customers->getCollection() : $customers
         );
 
@@ -52,12 +52,17 @@ class CustomersController extends Controller
      * @param  Request  $request
      * @return JsonResponse
      */
-    public function store(Requests\CustomerRequest $request)
+    public function store(CustomerRequest $request)
     {
         $this->authorize('create', Customer::class);
 
-        $customer = $this->customerService->create($request);
-        $this->customerStatementService->hydrateAccountSummaries([$customer]);
+        $customer = $this->customerService->create(
+            attributes: $request->customerAttributes(),
+            shippingAddress: $request->shippingAddress(),
+            billingAddress: $request->billingAddress(),
+            customFields: $request->customFields(),
+        );
+        $this->customerStatementQuery->hydrateAccountSummaries([$customer]);
 
         return new CustomerResource($customer);
     }
@@ -71,7 +76,7 @@ class CustomersController extends Controller
     {
         $this->authorize('view', $customer);
 
-        $this->customerStatementService->hydrateAccountSummaries([$customer]);
+        $this->customerStatementQuery->hydrateAccountSummaries([$customer]);
 
         return new CustomerResource($customer);
     }
@@ -82,12 +87,18 @@ class CustomersController extends Controller
      * @param  Request  $request
      * @return JsonResponse
      */
-    public function update(Requests\CustomerRequest $request, Customer $customer)
+    public function update(CustomerRequest $request, Customer $customer)
     {
         $this->authorize('update', $customer);
 
-        $customer = $this->customerService->update($request, $customer);
-        $this->customerStatementService->hydrateAccountSummaries([$customer]);
+        $customer = $this->customerService->update(
+            customer: $customer,
+            attributes: $request->customerAttributes(),
+            shippingAddress: $request->shippingAddress(),
+            billingAddress: $request->billingAddress(),
+            customFields: $request->customFields(),
+        );
+        $this->customerStatementQuery->hydrateAccountSummaries([$customer]);
 
         return new CustomerResource($customer);
     }
diff --git a/app/Http/Controllers/Admin/CountriesController.php b/app/Domains/Contacts/Http/Controllers/CountriesController.php
similarity index 66%
rename from app/Http/Controllers/Admin/CountriesController.php
rename to app/Domains/Contacts/Http/Controllers/CountriesController.php
index c01da8c9..2d3498fe 100644
--- a/app/Http/Controllers/Admin/CountriesController.php
+++ b/app/Domains/Contacts/Http/Controllers/CountriesController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Domains\Contacts\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\CountryResource;
-use App\Models\Country;
+use App\Domains\Contacts\Http\Resources\CountryResource;
+use App\Domains\Contacts\Models\Country;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/CustomerPortal/Auth/ForgotPasswordController.php b/app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/ForgotPasswordController.php
similarity index 93%
rename from app/Http/Controllers/CustomerPortal/Auth/ForgotPasswordController.php
rename to app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/ForgotPasswordController.php
index 63c98921..239bf255 100644
--- a/app/Http/Controllers/CustomerPortal/Auth/ForgotPasswordController.php
+++ b/app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/ForgotPasswordController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal\Auth;
+namespace App\Domains\Contacts\Http\Controllers\CustomerPortal\Auth;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
diff --git a/app/Http/Controllers/CustomerPortal/Auth/LoginController.php b/app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/LoginController.php
similarity index 80%
rename from app/Http/Controllers/CustomerPortal/Auth/LoginController.php
rename to app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/LoginController.php
index 0de65bbd..f6e00666 100644
--- a/app/Http/Controllers/CustomerPortal/Auth/LoginController.php
+++ b/app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/LoginController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal\Auth;
+namespace App\Domains\Contacts\Http\Controllers\CustomerPortal\Auth;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Customer\CustomerLoginRequest;
-use App\Models\Company;
-use App\Models\Customer;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Contacts\Http\Requests\CustomerPortal\CustomerLoginRequest;
+use App\Domains\Contacts\Models\Customer;
+use App\Platform\Http\Controller;
 use Hash;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/LogoutController.php b/app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/LogoutController.php
new file mode 100644
index 00000000..cf04f94f
--- /dev/null
+++ b/app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/LogoutController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Domains\Contacts\Http\Controllers\CustomerPortal\Auth;
+
+use App\Platform\Http\Controller;
+use Illuminate\Support\Facades\Auth;
+
+class LogoutController extends Controller
+{
+    public function __invoke(): void
+    {
+        Auth::guard('customer')->logout();
+    }
+}
diff --git a/app/Http/Controllers/CustomerPortal/Auth/ResetPasswordController.php b/app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/ResetPasswordController.php
similarity index 95%
rename from app/Http/Controllers/CustomerPortal/Auth/ResetPasswordController.php
rename to app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/ResetPasswordController.php
index 787d988c..2c12319a 100644
--- a/app/Http/Controllers/CustomerPortal/Auth/ResetPasswordController.php
+++ b/app/Domains/Contacts/Http/Controllers/CustomerPortal/Auth/ResetPasswordController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal\Auth;
+namespace App\Domains\Contacts\Http\Controllers\CustomerPortal\Auth;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Auth\Events\PasswordReset;
 use Illuminate\Contracts\Auth\CanResetPassword;
diff --git a/app/Http/Controllers/CustomerPortal/General/BootstrapController.php b/app/Domains/Contacts/Http/Controllers/CustomerPortal/BootstrapController.php
similarity index 80%
rename from app/Http/Controllers/CustomerPortal/General/BootstrapController.php
rename to app/Domains/Contacts/Http/Controllers/CustomerPortal/BootstrapController.php
index 657c2d78..033fd223 100644
--- a/app/Http/Controllers/CustomerPortal/General/BootstrapController.php
+++ b/app/Domains/Contacts/Http/Controllers/CustomerPortal/BootstrapController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal\General;
+namespace App\Domains\Contacts\Http\Controllers\CustomerPortal;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\Customer\CustomerResource;
-use App\Models\CompanySetting;
-use App\Models\Currency;
-use App\Models\Module;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Http\Resources\CustomerPortal\CustomerResource;
+use App\Domains\Money\Models\Currency;
+use App\Platform\Http\Controller;
+use App\Platform\Modules\Models\Module;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Domains/Contacts/Http/Controllers/CustomerPortal/DashboardController.php b/app/Domains/Contacts/Http/Controllers/CustomerPortal/DashboardController.php
new file mode 100644
index 00000000..8e64668e
--- /dev/null
+++ b/app/Domains/Contacts/Http/Controllers/CustomerPortal/DashboardController.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Domains\Contacts\Http\Controllers\CustomerPortal;
+
+use App\Domains\Contacts\Contracts\CustomerPortalDashboardProvider;
+use App\Platform\Http\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Auth;
+
+class DashboardController extends Controller
+{
+    public function __construct(
+        private readonly CustomerPortalDashboardProvider $customerPortalDashboardProvider,
+    ) {}
+
+    /**
+     * Handle the incoming request.
+     *
+     * @return Response
+     */
+    public function __invoke(Request $request)
+    {
+        return response()->json(
+            $this->customerPortalDashboardProvider->get(Auth::guard('customer')->user())
+        );
+    }
+}
diff --git a/app/Domains/Contacts/Http/Controllers/CustomerPortal/ProfileController.php b/app/Domains/Contacts/Http/Controllers/CustomerPortal/ProfileController.php
new file mode 100644
index 00000000..a70b5d06
--- /dev/null
+++ b/app/Domains/Contacts/Http/Controllers/CustomerPortal/ProfileController.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Domains\Contacts\Http\Controllers\CustomerPortal;
+
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Contacts\Application\CustomerService;
+use App\Domains\Contacts\Contracts\CustomerAvatarManager;
+use App\Domains\Contacts\Http\Requests\CustomerPortal\CustomerProfileRequest;
+use App\Domains\Contacts\Http\Resources\CustomerPortal\CustomerResource;
+use App\Platform\Http\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class ProfileController extends Controller
+{
+    public function __construct(
+        private readonly CustomerService $customerService,
+        private readonly CustomerAvatarManager $customerAvatarManager,
+    ) {}
+
+    public function updateProfile(Company $company, CustomerProfileRequest $request)
+    {
+        $customer = Auth::guard('customer')->user();
+
+        $customer = $this->customerService->updateProfile(
+            customer: $customer,
+            attributes: $request->customerAttributes(),
+            shippingAddress: $request->shippingAddress(),
+            billingAddress: $request->billingAddress(),
+        );
+
+        if ((bool) $request->validated('is_customer_avatar_removed', false)) {
+            $this->customerAvatarManager->clear($customer);
+        }
+
+        $avatar = $request->file('customer_avatar');
+
+        if ($avatar) {
+            $this->customerAvatarManager->replace(
+                $customer,
+                $avatar->getPathname(),
+                $avatar->getClientOriginalName(),
+            );
+        }
+
+        return new CustomerResource($customer);
+    }
+
+    public function getUser(Request $request)
+    {
+        $customer = Auth::guard('customer')->user();
+
+        return new CustomerResource($customer);
+    }
+}
diff --git a/app/Http/Middleware/CustomerGuest.php b/app/Domains/Contacts/Http/Middleware/CustomerGuest.php
similarity index 91%
rename from app/Http/Middleware/CustomerGuest.php
rename to app/Domains/Contacts/Http/Middleware/CustomerGuest.php
index 1dd20c33..c9ada608 100644
--- a/app/Http/Middleware/CustomerGuest.php
+++ b/app/Domains/Contacts/Http/Middleware/CustomerGuest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Domains\Contacts\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
diff --git a/app/Http/Middleware/CustomerPortalMiddleware.php b/app/Domains/Contacts/Http/Middleware/CustomerPortalMiddleware.php
similarity index 93%
rename from app/Http/Middleware/CustomerPortalMiddleware.php
rename to app/Domains/Contacts/Http/Middleware/CustomerPortalMiddleware.php
index 0f79a03b..c1e2fb35 100644
--- a/app/Http/Middleware/CustomerPortalMiddleware.php
+++ b/app/Domains/Contacts/Http/Middleware/CustomerPortalMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Domains\Contacts\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\RedirectResponse;
diff --git a/app/Http/Middleware/CustomerRedirectIfAuthenticated.php b/app/Domains/Contacts/Http/Middleware/CustomerRedirectIfAuthenticated.php
similarity index 93%
rename from app/Http/Middleware/CustomerRedirectIfAuthenticated.php
rename to app/Domains/Contacts/Http/Middleware/CustomerRedirectIfAuthenticated.php
index 383a12d8..1b6a3392 100644
--- a/app/Http/Middleware/CustomerRedirectIfAuthenticated.php
+++ b/app/Domains/Contacts/Http/Middleware/CustomerRedirectIfAuthenticated.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Domains\Contacts\Http\Middleware;
 
 use App\Providers\RouteServiceProvider;
 use Closure;
diff --git a/app/Http/Requests/Customer/CustomerLoginRequest.php b/app/Domains/Contacts/Http/Requests/CustomerPortal/CustomerLoginRequest.php
similarity index 90%
rename from app/Http/Requests/Customer/CustomerLoginRequest.php
rename to app/Domains/Contacts/Http/Requests/CustomerPortal/CustomerLoginRequest.php
index 93f65d70..0ba1d830 100644
--- a/app/Http/Requests/Customer/CustomerLoginRequest.php
+++ b/app/Domains/Contacts/Http/Requests/CustomerPortal/CustomerLoginRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests\Customer;
+namespace App\Domains\Contacts\Http\Requests\CustomerPortal;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/Customer/CustomerProfileRequest.php b/app/Domains/Contacts/Http/Requests/CustomerPortal/CustomerProfileRequest.php
similarity index 75%
rename from app/Http/Requests/Customer/CustomerProfileRequest.php
rename to app/Domains/Contacts/Http/Requests/CustomerPortal/CustomerProfileRequest.php
index f3c56f42..3968d71f 100644
--- a/app/Http/Requests/Customer/CustomerProfileRequest.php
+++ b/app/Domains/Contacts/Http/Requests/CustomerPortal/CustomerProfileRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Requests\Customer;
+namespace App\Domains\Contacts\Http\Requests\CustomerPortal;
 
-use App\Models\Address;
+use App\Domains\Contacts\Models\Address;
 use App\Rules\IdnEmail;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;
@@ -96,21 +96,45 @@ class CustomerProfileRequest extends FormRequest
                 'mimes:gif,jpg,png',
                 'max:20000',
             ],
+            'is_customer_avatar_removed' => [
+                'nullable',
+                'boolean',
+            ],
         ];
     }
 
-    public function getShippingAddress()
+    /** @return array<string, mixed> */
+    public function customerAttributes(): array
     {
-        return collect($this->shipping)
+        return $this->safe()->only(['name', 'email', 'password']);
+    }
+
+    /** @return array<string, mixed>|null */
+    public function shippingAddress(): ?array
+    {
+        $address = $this->input('shipping');
+
+        if (! is_array($address)) {
+            return null;
+        }
+
+        return collect($address)
             ->merge([
                 'type' => Address::SHIPPING_TYPE,
             ])
             ->toArray();
     }
 
-    public function getBillingAddress()
+    /** @return array<string, mixed>|null */
+    public function billingAddress(): ?array
     {
-        return collect($this->billing)
+        $address = $this->input('billing');
+
+        if (! is_array($address)) {
+            return null;
+        }
+
+        return collect($address)
             ->merge([
                 'type' => Address::BILLING_TYPE,
             ])
diff --git a/app/Http/Requests/CustomerRequest.php b/app/Domains/Contacts/Http/Requests/CustomerRequest.php
similarity index 78%
rename from app/Http/Requests/CustomerRequest.php
rename to app/Domains/Contacts/Http/Requests/CustomerRequest.php
index 7cc879cc..9600e1a0 100644
--- a/app/Http/Requests/CustomerRequest.php
+++ b/app/Domains/Contacts/Http/Requests/CustomerRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Contacts\Http\Requests;
 
-use App\Models\Address;
+use App\Domains\Contacts\Models\Address;
 use App\Rules\IdnEmail;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Arr;
@@ -126,7 +126,8 @@ class CustomerRequest extends FormRequest
         return $rules;
     }
 
-    public function getCustomerPayload()
+    /** @return array<string, mixed> */
+    public function customerAttributes(): array
     {
         return collect($this->validated())
             ->only([
@@ -152,30 +153,48 @@ class CustomerRequest extends FormRequest
             ->toArray();
     }
 
-    public function getShippingAddress()
+    /** @return array<string, mixed>|null */
+    public function shippingAddress(): ?array
     {
-        return collect($this->shipping)
+        $address = $this->input('shipping');
+
+        if (! is_array($address) || ! $this->hasAddress($address)) {
+            return null;
+        }
+
+        return collect($address)
             ->merge([
                 'type' => Address::SHIPPING_TYPE,
             ])
             ->toArray();
     }
 
-    public function getBillingAddress()
+    /** @return array<string, mixed>|null */
+    public function billingAddress(): ?array
     {
-        return collect($this->billing)
+        $address = $this->input('billing');
+
+        if (! is_array($address) || ! $this->hasAddress($address)) {
+            return null;
+        }
+
+        return collect($address)
             ->merge([
                 'type' => Address::BILLING_TYPE,
             ])
             ->toArray();
     }
 
-    public function hasAddress(array $address)
+    /** @return array<int, mixed>|null */
+    public function customFields(): ?array
     {
-        $data = Arr::where($address, function ($value, $key) {
-            return isset($value);
-        });
+        $customFields = $this->input('customFields');
 
-        return $data;
+        return is_array($customFields) && $customFields !== [] ? $customFields : null;
+    }
+
+    private function hasAddress(array $address): bool
+    {
+        return Arr::where($address, fn ($value): bool => isset($value)) !== [];
     }
 }
diff --git a/app/Http/Requests/DeleteCustomersRequest.php b/app/Domains/Contacts/Http/Requests/DeleteCustomersRequest.php
similarity index 93%
rename from app/Http/Requests/DeleteCustomersRequest.php
rename to app/Domains/Contacts/Http/Requests/DeleteCustomersRequest.php
index 3bc72431..99352868 100644
--- a/app/Http/Requests/DeleteCustomersRequest.php
+++ b/app/Domains/Contacts/Http/Requests/DeleteCustomersRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Contacts\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Resources/AddressResource.php b/app/Domains/Contacts/Http/Resources/AddressResource.php
similarity index 92%
rename from app/Http/Resources/AddressResource.php
rename to app/Domains/Contacts/Http/Resources/AddressResource.php
index 3df45b96..bd5a2e96 100644
--- a/app/Http/Resources/AddressResource.php
+++ b/app/Domains/Contacts/Http/Resources/AddressResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Contacts\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\UserResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/CountryResource.php b/app/Domains/Contacts/Http/Resources/CountryResource.php
similarity index 90%
rename from app/Http/Resources/CountryResource.php
rename to app/Domains/Contacts/Http/Resources/CountryResource.php
index 31072a9d..5a1f9550 100644
--- a/app/Http/Resources/CountryResource.php
+++ b/app/Domains/Contacts/Http/Resources/CountryResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Contacts\Http\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Http/Resources/Customer/AddressResource.php b/app/Domains/Contacts/Http/Resources/CustomerPortal/AddressResource.php
similarity index 90%
rename from app/Http/Resources/Customer/AddressResource.php
rename to app/Domains/Contacts/Http/Resources/CustomerPortal/AddressResource.php
index 633d7fac..50fa5214 100644
--- a/app/Http/Resources/Customer/AddressResource.php
+++ b/app/Domains/Contacts/Http/Resources/CustomerPortal/AddressResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Contacts\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\UserResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/Customer/CountryResource.php b/app/Domains/Contacts/Http/Resources/CustomerPortal/CountryResource.php
similarity index 88%
rename from app/Http/Resources/Customer/CountryResource.php
rename to app/Domains/Contacts/Http/Resources/CustomerPortal/CountryResource.php
index 9cfb4b55..35ba8d53 100644
--- a/app/Http/Resources/Customer/CountryResource.php
+++ b/app/Domains/Contacts/Http/Resources/CustomerPortal/CountryResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Contacts\Http\Resources\CustomerPortal;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Http/Resources/Customer/CustomerResource.php b/app/Domains/Contacts/Http/Resources/CustomerPortal/CustomerResource.php
similarity index 86%
rename from app/Http/Resources/Customer/CustomerResource.php
rename to app/Domains/Contacts/Http/Resources/CustomerPortal/CustomerResource.php
index 0d556c07..2e988f4b 100644
--- a/app/Http/Resources/Customer/CustomerResource.php
+++ b/app/Domains/Contacts/Http/Resources/CustomerPortal/CustomerResource.php
@@ -1,7 +1,10 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Contacts\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\CompanyResource;
+use App\Domains\Metadata\Http\Resources\CustomerPortal\CustomFieldValueResource;
+use App\Domains\Money\Http\Resources\CustomerPortal\CurrencyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/CustomerResource.php b/app/Domains/Contacts/Http/Resources/CustomerResource.php
similarity index 91%
rename from app/Http/Resources/CustomerResource.php
rename to app/Domains/Contacts/Http/Resources/CustomerResource.php
index 8c65faf1..ae98f7ca 100644
--- a/app/Http/Resources/CustomerResource.php
+++ b/app/Domains/Contacts/Http/Resources/CustomerResource.php
@@ -1,7 +1,10 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Contacts\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Metadata\Http\Resources\CustomFieldValueResource;
+use App\Domains\Money\Http\Resources\CurrencyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Models/Address.php b/app/Domains/Contacts/Models/Address.php
similarity index 88%
rename from app/Models/Address.php
rename to app/Domains/Contacts/Models/Address.php
index bb469941..522880a0 100644
--- a/app/Models/Address.php
+++ b/app/Domains/Contacts/Models/Address.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Contacts\Models;
 
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -9,6 +11,8 @@ use Symfony\Component\Intl\Countries;
 
 class Address extends Model
 {
+    protected $table = 'addresses';
+
     use HasFactory;
 
     public const BILLING_TYPE = 'billing';
diff --git a/app/Models/Country.php b/app/Domains/Contacts/Models/Country.php
similarity index 80%
rename from app/Models/Country.php
rename to app/Domains/Contacts/Models/Country.php
index a825584a..05c8606c 100644
--- a/app/Models/Country.php
+++ b/app/Domains/Contacts/Models/Country.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Contacts\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -8,6 +8,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Country extends Model
 {
+    protected $table = 'countries';
+
     use HasFactory;
 
     public function address(): HasMany
diff --git a/app/Models/Customer.php b/app/Domains/Contacts/Models/Customer.php
similarity index 91%
rename from app/Models/Customer.php
rename to app/Domains/Contacts/Models/Customer.php
index b5e2454e..3b634af1 100644
--- a/app/Models/Customer.php
+++ b/app/Domains/Contacts/Models/Customer.php
@@ -1,10 +1,19 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Contacts\Models;
 
-use App\Notifications\CustomerMailResetPasswordNotification;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Notifications\CustomerMailResetPasswordNotification;
+use App\Domains\Metadata\Concerns\HasCustomFields;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\RecurringInvoice;
+use App\Platform\Mail\Models\EmailLog;
 use App\Support\SafeOrderBy;
-use App\Traits\HasCustomFieldsTrait;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -20,8 +29,10 @@ use Spatie\MediaLibrary\InteractsWithMedia;
 
 class Customer extends Authenticatable implements HasMedia
 {
+    protected $table = 'customers';
+
     use HasApiTokens;
-    use HasCustomFieldsTrait;
+    use HasCustomFields;
     use HasFactory;
     use HasRolesAndAbilities;
     use InteractsWithMedia;
diff --git a/app/Notifications/CustomerMailResetPasswordNotification.php b/app/Domains/Contacts/Notifications/CustomerMailResetPasswordNotification.php
similarity index 97%
rename from app/Notifications/CustomerMailResetPasswordNotification.php
rename to app/Domains/Contacts/Notifications/CustomerMailResetPasswordNotification.php
index 54149919..1fb509ba 100644
--- a/app/Notifications/CustomerMailResetPasswordNotification.php
+++ b/app/Domains/Contacts/Notifications/CustomerMailResetPasswordNotification.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Notifications;
+namespace App\Domains\Contacts\Notifications;
 
 use Illuminate\Auth\Notifications\ResetPassword;
 use Illuminate\Bus\Queueable;
diff --git a/app/Policies/CustomerPolicy.php b/app/Domains/Contacts/Policies/CustomerPolicy.php
similarity index 95%
rename from app/Policies/CustomerPolicy.php
rename to app/Domains/Contacts/Policies/CustomerPolicy.php
index 02ad2fa3..b126ce95 100644
--- a/app/Policies/CustomerPolicy.php
+++ b/app/Domains/Contacts/Policies/CustomerPolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Contacts\Policies;
 
-use App\Models\Customer;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Domains/Contacts/routes/company.php b/app/Domains/Contacts/routes/company.php
new file mode 100644
index 00000000..86af98a3
--- /dev/null
+++ b/app/Domains/Contacts/routes/company.php
@@ -0,0 +1,9 @@
+<?php
+
+use App\Domains\Contacts\Http\Controllers\Company\CustomersController;
+use App\Domains\Contacts\Http\Controllers\Company\CustomerStatsController;
+use Illuminate\Support\Facades\Route;
+
+Route::post('/customers/delete', [CustomersController::class, 'delete']);
+Route::get('customers/{customer}/stats', CustomerStatsController::class);
+Route::resource('customers', CustomersController::class);
diff --git a/app/Domains/Contacts/routes/customer-public.php b/app/Domains/Contacts/routes/customer-public.php
new file mode 100644
index 00000000..d81f35dd
--- /dev/null
+++ b/app/Domains/Contacts/routes/customer-public.php
@@ -0,0 +1,10 @@
+<?php
+
+use App\Domains\Contacts\Http\Controllers\CustomerPortal\Auth\ForgotPasswordController;
+use App\Domains\Contacts\Http\Controllers\CustomerPortal\Auth\ResetPasswordController;
+use Illuminate\Support\Facades\Route;
+
+Route::prefix('auth')->group(function (): void {
+    Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail']);
+    Route::post('reset/password', [ResetPasswordController::class, 'reset'])->name('customer.password.reset');
+});
diff --git a/app/Domains/Contacts/routes/customer.php b/app/Domains/Contacts/routes/customer.php
new file mode 100644
index 00000000..f4ce4f48
--- /dev/null
+++ b/app/Domains/Contacts/routes/customer.php
@@ -0,0 +1,13 @@
+<?php
+
+use App\Domains\Contacts\Http\Controllers\CountriesController;
+use App\Domains\Contacts\Http\Controllers\CustomerPortal\BootstrapController;
+use App\Domains\Contacts\Http\Controllers\CustomerPortal\DashboardController;
+use App\Domains\Contacts\Http\Controllers\CustomerPortal\ProfileController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/bootstrap', BootstrapController::class);
+Route::get('/dashboard', DashboardController::class);
+Route::post('/profile', [ProfileController::class, 'updateProfile']);
+Route::get('/me', [ProfileController::class, 'getUser']);
+Route::get('/countries', CountriesController::class);
diff --git a/app/Domains/Contacts/routes/public.php b/app/Domains/Contacts/routes/public.php
new file mode 100644
index 00000000..5dd450f7
--- /dev/null
+++ b/app/Domains/Contacts/routes/public.php
@@ -0,0 +1,6 @@
+<?php
+
+use App\Domains\Contacts\Http\Controllers\CountriesController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/countries', CountriesController::class);
diff --git a/app/Domains/Contacts/routes/web.php b/app/Domains/Contacts/routes/web.php
new file mode 100644
index 00000000..17e3b922
--- /dev/null
+++ b/app/Domains/Contacts/routes/web.php
@@ -0,0 +1,8 @@
+<?php
+
+use App\Domains\Contacts\Http\Controllers\CustomerPortal\Auth\LoginController;
+use App\Domains\Contacts\Http\Controllers\CustomerPortal\Auth\LogoutController;
+use Illuminate\Support\Facades\Route;
+
+Route::post('/{company:slug}/customer/login', LoginController::class);
+Route::post('/{company:slug}/customer/logout', LogoutController::class);
diff --git a/app/Domains/Metadata/Application/CustomFieldService.php b/app/Domains/Metadata/Application/CustomFieldService.php
new file mode 100644
index 00000000..45b3413a
--- /dev/null
+++ b/app/Domains/Metadata/Application/CustomFieldService.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Domains\Metadata\Application;
+
+use App\Domains\Metadata\Models\CustomField;
+
+class CustomFieldService
+{
+    /** @param array<string, mixed> $attributes */
+    public function create(array $attributes, mixed $defaultAnswer, int $companyId): CustomField
+    {
+        $attributes[getCustomFieldValueKey($attributes['type'])] = $defaultAnswer;
+        $attributes['company_id'] = $companyId;
+        $attributes['slug'] = clean_slug($attributes['model_type'], $attributes['name']);
+
+        return CustomField::create($attributes);
+    }
+
+    /** @param array<string, mixed> $attributes */
+    public function update(CustomField $customField, array $attributes, mixed $defaultAnswer): CustomField
+    {
+        $attributes[getCustomFieldValueKey($attributes['type'])] = $defaultAnswer;
+        $customField->update($attributes);
+
+        return $customField;
+    }
+}
diff --git a/app/Domains/Metadata/Application/EloquentCustomFieldValueWriter.php b/app/Domains/Metadata/Application/EloquentCustomFieldValueWriter.php
new file mode 100644
index 00000000..2926a2eb
--- /dev/null
+++ b/app/Domains/Metadata/Application/EloquentCustomFieldValueWriter.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Domains\Metadata\Application;
+
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
+use App\Domains\Metadata\Models\CustomField;
+use Illuminate\Database\Eloquent\Model;
+
+class EloquentCustomFieldValueWriter implements CustomFieldValueWriter
+{
+    public function attach(Model $valuable, iterable $customFields): void
+    {
+        foreach ($customFields as $field) {
+            $field = $this->normalize($field);
+            $customField = CustomField::find($field['id']);
+
+            $valuable->fields()->create([
+                'type' => $customField->type,
+                'custom_field_id' => $customField->id,
+                'company_id' => $customField->company_id,
+                getCustomFieldValueKey($customField->type) => $field['value'],
+            ]);
+        }
+    }
+
+    public function update(Model $valuable, iterable $customFields): void
+    {
+        foreach ($customFields as $field) {
+            $field = $this->normalize($field);
+            $customField = CustomField::find($field['id']);
+            $customFieldValue = $valuable->fields()->firstOrCreate([
+                'custom_field_id' => $customField->id,
+                'type' => $customField->type,
+                'company_id' => $valuable->company_id,
+            ]);
+
+            $type = getCustomFieldValueKey($customField->type);
+            $customFieldValue->$type = $field['value'];
+            $customFieldValue->save();
+        }
+    }
+
+    /** @return array{id: int, value: mixed} */
+    private function normalize(mixed $field): array
+    {
+        return is_array($field) ? $field : (array) $field;
+    }
+}
diff --git a/app/Domains/Metadata/Concerns/HasCustomFields.php b/app/Domains/Metadata/Concerns/HasCustomFields.php
new file mode 100644
index 00000000..72f5b785
--- /dev/null
+++ b/app/Domains/Metadata/Concerns/HasCustomFields.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Domains\Metadata\Concerns;
+
+use App\Domains\Metadata\Models\CustomFieldValue;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+trait HasCustomFields
+{
+    public function fields(): MorphMany
+    {
+        return $this->morphMany(CustomFieldValue::class, 'custom_field_valuable');
+    }
+
+    protected static function booted()
+    {
+        static::deleting(function ($data) {
+            if ($data->fields()->exists()) {
+                $data->fields()->delete();
+            }
+        });
+    }
+
+    public function getCustomFieldBySlug($slug)
+    {
+        return $this->fields()
+            ->with('customField')
+            ->whereHas('customField', function ($query) use ($slug) {
+                $query->where('slug', $slug);
+            })->first();
+    }
+
+    public function getCustomFieldValueBySlug($slug)
+    {
+        $value = $this->getCustomFieldBySlug($slug);
+
+        if ($value) {
+            return $value->defaultAnswer;
+        }
+
+        return null;
+    }
+}
diff --git a/app/Domains/Metadata/Contracts/CustomFieldValueWriter.php b/app/Domains/Metadata/Contracts/CustomFieldValueWriter.php
new file mode 100644
index 00000000..f5e97600
--- /dev/null
+++ b/app/Domains/Metadata/Contracts/CustomFieldValueWriter.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Domains\Metadata\Contracts;
+
+use Illuminate\Database\Eloquent\Model;
+
+interface CustomFieldValueWriter
+{
+    public function attach(Model $valuable, iterable $customFields): void;
+
+    public function update(Model $valuable, iterable $customFields): void;
+}
diff --git a/app/Http/Controllers/Company/CustomField/CustomFieldsController.php b/app/Domains/Metadata/Http/Controllers/CustomFieldsController.php
similarity index 76%
rename from app/Http/Controllers/Company/CustomField/CustomFieldsController.php
rename to app/Domains/Metadata/Http/Controllers/CustomFieldsController.php
index 8ec991a8..8b406fed 100644
--- a/app/Http/Controllers/Company/CustomField/CustomFieldsController.php
+++ b/app/Domains/Metadata/Http/Controllers/CustomFieldsController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Company\CustomField;
+namespace App\Domains\Metadata\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\CustomFieldRequest;
-use App\Http\Resources\CustomFieldResource;
-use App\Models\CustomField;
-use App\Services\CustomFieldService;
+use App\Domains\Metadata\Application\CustomFieldService;
+use App\Domains\Metadata\Http\Requests\CustomFieldRequest;
+use App\Domains\Metadata\Http\Resources\CustomFieldResource;
+use App\Domains\Metadata\Models\CustomField;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -45,7 +45,11 @@ class CustomFieldsController extends Controller
     {
         $this->authorize('create', CustomField::class);
 
-        $customField = $this->customFieldService->create($request);
+        $customField = $this->customFieldService->create(
+            $request->validated(),
+            $request->input('default_answer'),
+            (int) $request->header('company'),
+        );
 
         return new CustomFieldResource($customField);
     }
@@ -74,7 +78,11 @@ class CustomFieldsController extends Controller
     {
         $this->authorize('update', $customField);
 
-        $this->customFieldService->update($customField, $request);
+        $this->customFieldService->update(
+            $customField,
+            $request->validated(),
+            $request->input('default_answer'),
+        );
 
         return new CustomFieldResource($customField);
     }
diff --git a/app/Http/Controllers/Company/General/NotesController.php b/app/Domains/Metadata/Http/Controllers/NotesController.php
similarity index 90%
rename from app/Http/Controllers/Company/General/NotesController.php
rename to app/Domains/Metadata/Http/Controllers/NotesController.php
index 3c217eb7..19ac37a5 100644
--- a/app/Http/Controllers/Company/General/NotesController.php
+++ b/app/Domains/Metadata/Http/Controllers/NotesController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Company\General;
+namespace App\Domains\Metadata\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\NotesRequest;
-use App\Http\Resources\NoteResource;
-use App\Models\Note;
+use App\Domains\Metadata\Http\Requests\NotesRequest;
+use App\Domains\Metadata\Http\Resources\NoteResource;
+use App\Domains\Metadata\Models\Note;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
diff --git a/app/Http/Requests/CustomFieldRequest.php b/app/Domains/Metadata/Http/Requests/CustomFieldRequest.php
similarity index 93%
rename from app/Http/Requests/CustomFieldRequest.php
rename to app/Domains/Metadata/Http/Requests/CustomFieldRequest.php
index 3f2ccffd..c0eb3d56 100644
--- a/app/Http/Requests/CustomFieldRequest.php
+++ b/app/Domains/Metadata/Http/Requests/CustomFieldRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Metadata\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/NotesRequest.php b/app/Domains/Metadata/Http/Requests/NotesRequest.php
similarity index 96%
rename from app/Http/Requests/NotesRequest.php
rename to app/Domains/Metadata/Http/Requests/NotesRequest.php
index 9dc54ffe..9ff0a8c9 100644
--- a/app/Http/Requests/NotesRequest.php
+++ b/app/Domains/Metadata/Http/Requests/NotesRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Metadata\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Resources/Customer/CustomFieldResource.php b/app/Domains/Metadata/Http/Resources/CustomFieldResource.php
similarity index 92%
rename from app/Http/Resources/Customer/CustomFieldResource.php
rename to app/Domains/Metadata/Http/Resources/CustomFieldResource.php
index 5a0dbf9b..6a5306c4 100644
--- a/app/Http/Resources/Customer/CustomFieldResource.php
+++ b/app/Domains/Metadata/Http/Resources/CustomFieldResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Metadata\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/CustomFieldValueResource.php b/app/Domains/Metadata/Http/Resources/CustomFieldValueResource.php
similarity index 85%
rename from app/Http/Resources/CustomFieldValueResource.php
rename to app/Domains/Metadata/Http/Resources/CustomFieldValueResource.php
index eb124b06..e37f0e91 100644
--- a/app/Http/Resources/CustomFieldValueResource.php
+++ b/app/Domains/Metadata/Http/Resources/CustomFieldValueResource.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Metadata\Http\Resources;
 
-use App\Models\CompanySetting;
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Platform\Persistence\ModelIdentityMap;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
@@ -18,7 +20,7 @@ class CustomFieldValueResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'custom_field_valuable_type' => $this->custom_field_valuable_type,
+            'custom_field_valuable_type' => ModelIdentityMap::publicType($this->custom_field_valuable_type),
             'custom_field_valuable_id' => $this->custom_field_valuable_id,
             'type' => $this->type,
             'boolean_answer' => $this->boolean_answer,
diff --git a/app/Http/Resources/CustomFieldResource.php b/app/Domains/Metadata/Http/Resources/CustomerPortal/CustomFieldResource.php
similarity index 90%
rename from app/Http/Resources/CustomFieldResource.php
rename to app/Domains/Metadata/Http/Resources/CustomerPortal/CustomFieldResource.php
index 51879ace..859a8b5d 100644
--- a/app/Http/Resources/CustomFieldResource.php
+++ b/app/Domains/Metadata/Http/Resources/CustomerPortal/CustomFieldResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Metadata\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\CompanyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/Customer/CustomFieldValueResource.php b/app/Domains/Metadata/Http/Resources/CustomerPortal/CustomFieldValueResource.php
similarity index 81%
rename from app/Http/Resources/Customer/CustomFieldValueResource.php
rename to app/Domains/Metadata/Http/Resources/CustomerPortal/CustomFieldValueResource.php
index 8b3f8a23..efcb4e69 100644
--- a/app/Http/Resources/Customer/CustomFieldValueResource.php
+++ b/app/Domains/Metadata/Http/Resources/CustomerPortal/CustomFieldValueResource.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Metadata\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\CompanyResource;
+use App\Platform\Persistence\ModelIdentityMap;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -16,7 +18,7 @@ class CustomFieldValueResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'custom_field_valuable_type' => $this->custom_field_valuable_type,
+            'custom_field_valuable_type' => ModelIdentityMap::publicType($this->custom_field_valuable_type),
             'custom_field_valuable_id' => $this->custom_field_valuable_id,
             'type' => $this->type,
             'boolean_answer' => $this->boolean_answer,
diff --git a/app/Http/Resources/NoteResource.php b/app/Domains/Metadata/Http/Resources/NoteResource.php
similarity index 86%
rename from app/Http/Resources/NoteResource.php
rename to app/Domains/Metadata/Http/Resources/NoteResource.php
index 0da7dbe8..f1aa32bc 100644
--- a/app/Http/Resources/NoteResource.php
+++ b/app/Domains/Metadata/Http/Resources/NoteResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Metadata\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Domains/Metadata/MetadataServiceProvider.php b/app/Domains/Metadata/MetadataServiceProvider.php
new file mode 100644
index 00000000..b0677b1a
--- /dev/null
+++ b/app/Domains/Metadata/MetadataServiceProvider.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Domains\Metadata;
+
+use App\Domains\Metadata\Application\EloquentCustomFieldValueWriter;
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Metadata\Models\Note;
+use App\Domains\Metadata\Policies\CustomFieldPolicy;
+use App\Domains\Metadata\Policies\NotePolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+
+class MetadataServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->bind(CustomFieldValueWriter::class, EloquentCustomFieldValueWriter::class);
+    }
+
+    public function boot(): void
+    {
+        Gate::policy(CustomField::class, CustomFieldPolicy::class);
+        Gate::policy(Note::class, NotePolicy::class);
+        Gate::define('manage notes', [NotePolicy::class, 'manageNotes']);
+        Gate::define('view notes', [NotePolicy::class, 'viewNotes']);
+    }
+}
diff --git a/app/Models/CustomField.php b/app/Domains/Metadata/Models/CustomField.php
similarity index 95%
rename from app/Models/CustomField.php
rename to app/Domains/Metadata/Models/CustomField.php
index 2e0e2fd2..3707e3ff 100644
--- a/app/Models/CustomField.php
+++ b/app/Domains/Metadata/Models/CustomField.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Metadata\Models;
 
+use App\Domains\Accounts\Models\Company;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -9,6 +10,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class CustomField extends Model
 {
+    protected $table = 'custom_fields';
+
     use HasFactory;
 
     protected $guarded = [
diff --git a/app/Models/CustomFieldValue.php b/app/Domains/Metadata/Models/CustomFieldValue.php
similarity index 90%
rename from app/Models/CustomFieldValue.php
rename to app/Domains/Metadata/Models/CustomFieldValue.php
index 0895470f..8c3b9601 100644
--- a/app/Models/CustomFieldValue.php
+++ b/app/Domains/Metadata/Models/CustomFieldValue.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Metadata\Models;
 
+use App\Domains\Accounts\Models\Company;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -9,6 +10,8 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class CustomFieldValue extends Model
 {
+    protected $table = 'custom_field_values';
+
     use HasFactory;
 
     protected $dates = [
diff --git a/app/Models/Note.php b/app/Domains/Metadata/Models/Note.php
similarity index 91%
rename from app/Models/Note.php
rename to app/Domains/Metadata/Models/Note.php
index 7ede3c96..1e94fa2e 100644
--- a/app/Models/Note.php
+++ b/app/Domains/Metadata/Models/Note.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Metadata\Models;
 
+use App\Domains\Accounts\Models\Company;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -9,6 +10,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Note extends Model
 {
+    protected $table = 'notes';
+
     use HasFactory;
 
     protected $guarded = ['id'];
diff --git a/app/Policies/CustomFieldPolicy.php b/app/Domains/Metadata/Policies/CustomFieldPolicy.php
similarity index 95%
rename from app/Policies/CustomFieldPolicy.php
rename to app/Domains/Metadata/Policies/CustomFieldPolicy.php
index 8b099b19..ea3da97c 100644
--- a/app/Policies/CustomFieldPolicy.php
+++ b/app/Domains/Metadata/Policies/CustomFieldPolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Metadata\Policies;
 
-use App\Models\CustomField;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Metadata\Models\CustomField;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Policies/NotePolicy.php b/app/Domains/Metadata/Policies/NotePolicy.php
similarity index 87%
rename from app/Policies/NotePolicy.php
rename to app/Domains/Metadata/Policies/NotePolicy.php
index 2eaa00bf..85d439b1 100644
--- a/app/Policies/NotePolicy.php
+++ b/app/Domains/Metadata/Policies/NotePolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Metadata\Policies;
 
-use App\Models\Note;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Metadata\Models\Note;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Domains/Metadata/routes/company.php b/app/Domains/Metadata/routes/company.php
new file mode 100644
index 00000000..5f6e7421
--- /dev/null
+++ b/app/Domains/Metadata/routes/company.php
@@ -0,0 +1,8 @@
+<?php
+
+use App\Domains\Metadata\Http\Controllers\CustomFieldsController;
+use App\Domains\Metadata\Http\Controllers\NotesController;
+use Illuminate\Support\Facades\Route;
+
+Route::resource('custom-fields', CustomFieldsController::class);
+Route::apiResource('notes', NotesController::class);
diff --git a/app/Services/Document/CurrencyService.php b/app/Domains/Money/Application/CurrencyService.php
similarity index 90%
rename from app/Services/Document/CurrencyService.php
rename to app/Domains/Money/Application/CurrencyService.php
index 583e7fd8..28ba4dc3 100644
--- a/app/Services/Document/CurrencyService.php
+++ b/app/Domains/Money/Application/CurrencyService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Document;
+namespace App\Domains\Money\Application;
 
-use App\Models\Currency;
+use App\Domains\Money\Models\Currency;
 use Illuminate\Database\Eloquent\Collection;
 
 class CurrencyService
diff --git a/app/Domains/Money/Application/ExchangeRateProviderService.php b/app/Domains/Money/Application/ExchangeRateProviderService.php
new file mode 100644
index 00000000..2c93f980
--- /dev/null
+++ b/app/Domains/Money/Application/ExchangeRateProviderService.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Domains\Money\Application;
+
+use App\Domains\Money\ExchangeRates\ExchangeRateDriverFactory;
+use App\Domains\Money\Models\ExchangeRateProvider;
+use Illuminate\Database\Eloquent\Collection;
+
+class ExchangeRateProviderService
+{
+    /** @param array<string, mixed> $payload */
+    public function create(array $payload): ExchangeRateProvider
+    {
+        return ExchangeRateProvider::create($payload);
+    }
+
+    /** @param array<string, mixed> $payload */
+    public function update(ExchangeRateProvider $provider, array $payload): ExchangeRateProvider
+    {
+        $provider->update($payload);
+
+        return $provider;
+    }
+
+    /**
+     * @param  array<int, string>  $currencies
+     * @return Collection<int, ExchangeRateProvider>
+     */
+    public function checkActiveCurrencies(array $currencies): Collection
+    {
+        if (empty($currencies)) {
+            return new Collection;
+        }
+
+        $query = ExchangeRateProvider::where('active', true);
+
+        foreach ($currencies as $currency) {
+            $query->orWhere(function ($q) use ($currency) {
+                $q->where('active', true)
+                    ->whereJsonContains('currencies', $currency);
+            });
+        }
+
+        return $query->get();
+    }
+
+    /**
+     * @param  array<int, string>  $currencies
+     * @return Collection<int, ExchangeRateProvider>
+     */
+    public function checkUpdateActiveCurrencies(ExchangeRateProvider $provider, array $currencies): Collection
+    {
+        if (empty($currencies)) {
+            return new Collection;
+        }
+
+        $query = ExchangeRateProvider::where('id', '<>', $provider->id)
+            ->where('active', true);
+
+        $query->where(function ($q) use ($currencies) {
+            foreach ($currencies as $currency) {
+                $q->orWhereJsonContains('currencies', $currency);
+            }
+        });
+
+        return $query->get();
+    }
+
+    /** @param array<string, mixed> $configuration */
+    public function validateProvider(array $configuration): array
+    {
+        return ExchangeRateDriverFactory::make(
+            $configuration['driver'],
+            $configuration['key'],
+            $configuration['driver_config'] ?? [],
+        )->validateConnection();
+    }
+
+    public function getExchangeRate(
+        string $driver,
+        string $apiKey,
+        array $driverConfig,
+        string $baseCurrency,
+        string $targetCurrency,
+    ): array {
+        return ExchangeRateDriverFactory::make($driver, $apiKey, $driverConfig)
+            ->getExchangeRate($baseCurrency, $targetCurrency);
+    }
+
+    /** @return array<int, string> */
+    public function getSupportedCurrencies(string $driver, string $apiKey, array $driverConfig = []): array
+    {
+        return ExchangeRateDriverFactory::make($driver, $apiKey, $driverConfig)
+            ->getSupportedCurrencies();
+    }
+}
diff --git a/app/Domains/Money/Contracts/ExchangeRateBackfill.php b/app/Domains/Money/Contracts/ExchangeRateBackfill.php
new file mode 100644
index 00000000..2584f9dd
--- /dev/null
+++ b/app/Domains/Money/Contracts/ExchangeRateBackfill.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Domains\Money\Contracts;
+
+interface ExchangeRateBackfill
+{
+    /** @return array<int, int> */
+    public function currencyIdsMissingRates(): array;
+
+    /**
+     * @param  array<int, array{id: int, exchange_rate: int|float|string}>  $currencies
+     */
+    public function apply(int $companyId, array $currencies): bool;
+}
diff --git a/app/Support/ExchangeRate/CurrencyConverterDriver.php b/app/Domains/Money/ExchangeRates/CurrencyConverterDriver.php
similarity index 98%
rename from app/Support/ExchangeRate/CurrencyConverterDriver.php
rename to app/Domains/Money/ExchangeRates/CurrencyConverterDriver.php
index 3532bad5..638bb0e1 100644
--- a/app/Support/ExchangeRate/CurrencyConverterDriver.php
+++ b/app/Domains/Money/ExchangeRates/CurrencyConverterDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\ExchangeRate;
+namespace App\Domains\Money\ExchangeRates;
 
 use App\Support\Net\BlockedUrlException;
 use App\Support\Net\PrivateNetworkGuard;
diff --git a/app/Support/ExchangeRate/CurrencyFreakDriver.php b/app/Domains/Money/ExchangeRates/CurrencyFreakDriver.php
similarity index 97%
rename from app/Support/ExchangeRate/CurrencyFreakDriver.php
rename to app/Domains/Money/ExchangeRates/CurrencyFreakDriver.php
index f5845e5b..a0ab2dc9 100644
--- a/app/Support/ExchangeRate/CurrencyFreakDriver.php
+++ b/app/Domains/Money/ExchangeRates/CurrencyFreakDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\ExchangeRate;
+namespace App\Domains\Money\ExchangeRates;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Support/ExchangeRate/CurrencyLayerDriver.php b/app/Domains/Money/ExchangeRates/CurrencyLayerDriver.php
similarity index 97%
rename from app/Support/ExchangeRate/CurrencyLayerDriver.php
rename to app/Domains/Money/ExchangeRates/CurrencyLayerDriver.php
index b63f36bf..8487cd7d 100644
--- a/app/Support/ExchangeRate/CurrencyLayerDriver.php
+++ b/app/Domains/Money/ExchangeRates/CurrencyLayerDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\ExchangeRate;
+namespace App\Domains\Money\ExchangeRates;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Support/ExchangeRate/ExchangeRateDriver.php b/app/Domains/Money/ExchangeRates/ExchangeRateDriver.php
similarity index 94%
rename from app/Support/ExchangeRate/ExchangeRateDriver.php
rename to app/Domains/Money/ExchangeRates/ExchangeRateDriver.php
index 67dacc7a..5fd05775 100644
--- a/app/Support/ExchangeRate/ExchangeRateDriver.php
+++ b/app/Domains/Money/ExchangeRates/ExchangeRateDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\ExchangeRate;
+namespace App\Domains\Money\ExchangeRates;
 
 abstract class ExchangeRateDriver
 {
diff --git a/app/Support/ExchangeRate/ExchangeRateDriverFactory.php b/app/Domains/Money/ExchangeRates/ExchangeRateDriverFactory.php
similarity index 95%
rename from app/Support/ExchangeRate/ExchangeRateDriverFactory.php
rename to app/Domains/Money/ExchangeRates/ExchangeRateDriverFactory.php
index 7400812b..e1c593cb 100644
--- a/app/Support/ExchangeRate/ExchangeRateDriverFactory.php
+++ b/app/Domains/Money/ExchangeRates/ExchangeRateDriverFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\ExchangeRate;
+namespace App\Domains\Money\ExchangeRates;
 
 use InvalidArgumentException;
 use InvoiceShelf\Modules\Registry;
@@ -12,7 +12,7 @@ class ExchangeRateDriverFactory
      *
      * Kept as a backstop so that direct calls to register() (without going through
      * the module Registry) continue to work. Built-in drivers are also registered
-     * via the Registry by DriverRegistryProvider — that registration is the
+     * via the Registry by MoneyServiceProvider — that registration is the
      * canonical source for driver metadata (label, website, config_fields).
      *
      * @var array<string, class-string<ExchangeRateDriver>>
diff --git a/app/Support/ExchangeRate/ExchangeRateException.php b/app/Domains/Money/ExchangeRates/ExchangeRateException.php
similarity index 83%
rename from app/Support/ExchangeRate/ExchangeRateException.php
rename to app/Domains/Money/ExchangeRates/ExchangeRateException.php
index ebd91a41..76bb581e 100644
--- a/app/Support/ExchangeRate/ExchangeRateException.php
+++ b/app/Domains/Money/ExchangeRates/ExchangeRateException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\ExchangeRate;
+namespace App\Domains\Money\ExchangeRates;
 
 class ExchangeRateException extends \RuntimeException
 {
diff --git a/app/Support/ExchangeRate/OpenExchangeRateDriver.php b/app/Domains/Money/ExchangeRates/OpenExchangeRateDriver.php
similarity index 97%
rename from app/Support/ExchangeRate/OpenExchangeRateDriver.php
rename to app/Domains/Money/ExchangeRates/OpenExchangeRateDriver.php
index d195603d..417f8ed5 100644
--- a/app/Support/ExchangeRate/OpenExchangeRateDriver.php
+++ b/app/Domains/Money/ExchangeRates/OpenExchangeRateDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\ExchangeRate;
+namespace App\Domains\Money\ExchangeRates;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Http/Controllers/Admin/CurrenciesController.php b/app/Domains/Money/Http/Controllers/CurrenciesController.php
similarity index 71%
rename from app/Http/Controllers/Admin/CurrenciesController.php
rename to app/Domains/Money/Http/Controllers/CurrenciesController.php
index 00c8a051..88f300f5 100644
--- a/app/Http/Controllers/Admin/CurrenciesController.php
+++ b/app/Domains/Money/Http/Controllers/CurrenciesController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Domains\Money\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\CurrencyResource;
-use App\Services\Document\CurrencyService;
+use App\Domains\Money\Application\CurrencyService;
+use App\Domains\Money\Http\Resources\CurrencyResource;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 
diff --git a/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php b/app/Domains/Money/Http/Controllers/ExchangeRateProviderController.php
similarity index 50%
rename from app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php
rename to app/Domains/Money/Http/Controllers/ExchangeRateProviderController.php
index c78f0086..8457cd10 100644
--- a/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php
+++ b/app/Domains/Money/Http/Controllers/ExchangeRateProviderController.php
@@ -1,20 +1,18 @@
 <?php
 
-namespace App\Http\Controllers\Company\ExchangeRate;
+namespace App\Domains\Money\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\BulkExchangeRateRequest;
-use App\Http\Requests\ExchangeRateProviderRequest;
-use App\Http\Resources\ExchangeRateProviderResource;
-use App\Models\CompanySetting;
-use App\Models\Currency;
-use App\Models\Estimate;
-use App\Models\ExchangeRateLog;
-use App\Models\ExchangeRateProvider;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\Tax;
-use App\Services\ExchangeRateProviderService;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Money\Application\ExchangeRateProviderService;
+use App\Domains\Money\Contracts\ExchangeRateBackfill;
+use App\Domains\Money\ExchangeRates\ExchangeRateException;
+use App\Domains\Money\Http\Requests\BulkExchangeRateRequest;
+use App\Domains\Money\Http\Requests\ExchangeRateProviderRequest;
+use App\Domains\Money\Http\Resources\ExchangeRateProviderResource;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Money\Models\ExchangeRateLog;
+use App\Domains\Money\Models\ExchangeRateProvider;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Arr;
@@ -23,6 +21,7 @@ class ExchangeRateProviderController extends Controller
 {
     public function __construct(
         private readonly ExchangeRateProviderService $exchangeRateProviderService,
+        private readonly ExchangeRateBackfill $exchangeRateBackfill,
     ) {}
 
     /**
@@ -51,21 +50,21 @@ class ExchangeRateProviderController extends Controller
     {
         $this->authorize('create', ExchangeRateProvider::class);
 
-        $query = $this->exchangeRateProviderService->checkActiveCurrencies($request);
+        $payload = $request->getExchangeRateProviderPayload();
+        $query = $this->exchangeRateProviderService->checkActiveCurrencies($payload['currencies'] ?? []);
 
         if (count($query) !== 0) {
             return respondJson('currency_used', 'Currency used.');
         }
 
-        $checkConverterApi = $this->exchangeRateProviderService->checkProviderStatus($request);
-
-        if ($checkConverterApi->status() == 200) {
-            $exchangeRateProvider = $this->exchangeRateProviderService->create($request);
+        try {
+            $this->exchangeRateProviderService->validateProvider($payload);
+            $exchangeRateProvider = $this->exchangeRateProviderService->create($payload);
 
             return new ExchangeRateProviderResource($exchangeRateProvider);
+        } catch (ExchangeRateException $exception) {
+            return respondJson($exception->errorKey, $exception->getMessage());
         }
-
-        return $checkConverterApi;
     }
 
     /**
@@ -90,21 +89,24 @@ class ExchangeRateProviderController extends Controller
     {
         $this->authorize('update', $exchangeRateProvider);
 
-        $query = $this->exchangeRateProviderService->checkUpdateActiveCurrencies($exchangeRateProvider, $request);
+        $payload = $request->getExchangeRateProviderPayload();
+        $query = $this->exchangeRateProviderService->checkUpdateActiveCurrencies(
+            $exchangeRateProvider,
+            $payload['currencies'] ?? [],
+        );
 
         if (count($query) !== 0) {
             return respondJson('currency_used', 'Currency used.');
         }
 
-        $checkConverterApi = $this->exchangeRateProviderService->checkProviderStatus($request);
-
-        if ($checkConverterApi->status() == 200) {
-            $this->exchangeRateProviderService->update($exchangeRateProvider, $request);
+        try {
+            $this->exchangeRateProviderService->validateProvider($payload);
+            $this->exchangeRateProviderService->update($exchangeRateProvider, $payload);
 
             return new ExchangeRateProviderResource($exchangeRateProvider);
+        } catch (ExchangeRateException $exception) {
+            return respondJson($exception->errorKey, $exception->getMessage());
         }
-
-        return $checkConverterApi;
     }
 
     /**
@@ -162,16 +164,19 @@ class ExchangeRateProviderController extends Controller
 
         if ($query) {
             $filter = Arr::only($query[0], ['key', 'driver', 'driver_config']);
-            $result = $this->exchangeRateProviderService->getExchangeRate(
-                $filter['driver'],
-                $filter['key'],
-                $filter['driver_config'] ?? [],
-                $currency->code,
-                $baseCurrency->code
-            );
+            try {
+                $exchangeRate = $this->exchangeRateProviderService->getExchangeRate(
+                    $filter['driver'],
+                    $filter['key'],
+                    $filter['driver_config'] ?? [],
+                    $currency->code,
+                    $baseCurrency->code,
+                );
 
-            if ($result->status() == 200) {
-                return $result;
+                return response()->json(['exchangeRate' => $exchangeRate]);
+            } catch (ExchangeRateException) {
+                // Fall back to the latest stored rate below, matching the
+                // existing API behavior when a live provider is unavailable.
             }
         }
         if ($exchangeRate) {
@@ -189,11 +194,17 @@ class ExchangeRateProviderController extends Controller
     {
         $this->authorize('viewAny', ExchangeRateProvider::class);
 
-        return $this->exchangeRateProviderService->getSupportedCurrencies(
-            $request->driver,
-            $request->key,
-            $request->driver_config ?? []
-        );
+        try {
+            $currencies = $this->exchangeRateProviderService->getSupportedCurrencies(
+                $request->driver,
+                $request->key,
+                $request->driver_config ?? [],
+            );
+
+            return response()->json(['supportedCurrencies' => $currencies]);
+        } catch (ExchangeRateException $exception) {
+            return respondJson($exception->errorKey, $exception->getMessage());
+        }
     }
 
     public function usedCurrencies(Request $request)
@@ -237,87 +248,20 @@ class ExchangeRateProviderController extends Controller
 
     public function usedCurrenciesWithoutRate(Request $request)
     {
-        $invoices = Invoice::where('exchange_rate', null)->pluck('currency_id')->toArray();
-        $taxes = Tax::where('exchange_rate', null)->pluck('currency_id')->toArray();
-        $estimates = Estimate::where('exchange_rate', null)->pluck('currency_id')->toArray();
-        $payments = Payment::where('exchange_rate', null)->pluck('currency_id')->toArray();
-
-        $currencies = array_merge($invoices, $taxes, $estimates, $payments);
-
         return response()->json([
-            'currencies' => Currency::whereIn('id', $currencies)->get(),
+            'currencies' => Currency::whereIn(
+                'id',
+                $this->exchangeRateBackfill->currencyIdsMissingRates(),
+            )->get(),
         ]);
     }
 
     public function bulkUpdate(BulkExchangeRateRequest $request)
     {
-        $bulkExchangeRate = CompanySetting::getSetting('bulk_exchange_rate_configured', $request->header('company'));
-
-        if ($bulkExchangeRate == 'NO') {
-            if ($request->currencies) {
-                foreach ($request->currencies as $currency) {
-                    $currency['exchange_rate'] = $currency['exchange_rate'] ?? 1;
-
-                    $invoices = Invoice::where('currency_id', $currency['id'])->get();
-
-                    if ($invoices) {
-                        foreach ($invoices as $invoice) {
-                            $invoice->update([
-                                'exchange_rate' => $currency['exchange_rate'],
-                                'base_discount_val' => $invoice->sub_total * $currency['exchange_rate'],
-                                'base_sub_total' => $invoice->sub_total * $currency['exchange_rate'],
-                                'base_total' => $invoice->total * $currency['exchange_rate'],
-                                'base_tax' => $invoice->tax * $currency['exchange_rate'],
-                                'base_due_amount' => $invoice->due_amount * $currency['exchange_rate'],
-                            ]);
-
-                            $this->updateItemsExchangeRate($invoice);
-                        }
-                    }
-
-                    $estimates = Estimate::where('currency_id', $currency['id'])->get();
-
-                    if ($estimates) {
-                        foreach ($estimates as $estimate) {
-                            $estimate->update([
-                                'exchange_rate' => $currency['exchange_rate'],
-                                'base_discount_val' => $estimate->sub_total * $currency['exchange_rate'],
-                                'base_sub_total' => $estimate->sub_total * $currency['exchange_rate'],
-                                'base_total' => $estimate->total * $currency['exchange_rate'],
-                                'base_tax' => $estimate->tax * $currency['exchange_rate'],
-                            ]);
-
-                            $this->updateItemsExchangeRate($estimate);
-                        }
-                    }
-
-                    $taxes = Tax::where('currency_id', $currency['id'])->get();
-
-                    if ($taxes) {
-                        foreach ($taxes as $tax) {
-                            $tax->base_amount = $tax->base_amount * $currency['exchange_rate'];
-                            $tax->save();
-                        }
-                    }
-
-                    $payments = Payment::where('currency_id', $currency['id'])->get();
-
-                    if ($payments) {
-                        foreach ($payments as $payment) {
-                            $payment->exchange_rate = $currency['exchange_rate'];
-                            $payment->base_amount = $payment->amount * $currency['exchange_rate'];
-                            $payment->save();
-                        }
-                    }
-                }
-            }
-
-            $settings = [
-                'bulk_exchange_rate_configured' => 'YES',
-            ];
-
-            CompanySetting::setSettings($settings, $request->header('company'));
-
+        if ($this->exchangeRateBackfill->apply(
+            (int) $request->header('company'),
+            $request->validated('currencies'),
+        )) {
             return response()->json([
                 'success' => true,
             ]);
@@ -327,33 +271,4 @@ class ExchangeRateProviderController extends Controller
             'error' => false,
         ]);
     }
-
-    private function updateItemsExchangeRate($model): void
-    {
-        foreach ($model->items as $item) {
-            $item->update([
-                'exchange_rate' => $model->exchange_rate,
-                'base_discount_val' => $item->discount_val * $model->exchange_rate,
-                'base_price' => $item->price * $model->exchange_rate,
-                'base_tax' => $item->tax * $model->exchange_rate,
-                'base_total' => $item->total * $model->exchange_rate,
-            ]);
-
-            $this->updateTaxesExchangeRate($item);
-        }
-
-        $this->updateTaxesExchangeRate($model);
-    }
-
-    private function updateTaxesExchangeRate($model): void
-    {
-        if ($model->taxes()->exists()) {
-            $model->taxes->map(function ($tax) use ($model) {
-                $tax->update([
-                    'exchange_rate' => $model->exchange_rate,
-                    'base_amount' => $tax->amount * $model->exchange_rate,
-                ]);
-            });
-        }
-    }
 }
diff --git a/app/Http/Requests/BulkExchangeRateRequest.php b/app/Domains/Money/Http/Requests/BulkExchangeRateRequest.php
similarity index 94%
rename from app/Http/Requests/BulkExchangeRateRequest.php
rename to app/Domains/Money/Http/Requests/BulkExchangeRateRequest.php
index 8b04d0cd..dd90ff35 100644
--- a/app/Http/Requests/BulkExchangeRateRequest.php
+++ b/app/Domains/Money/Http/Requests/BulkExchangeRateRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Money\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/ExchangeRateProviderRequest.php b/app/Domains/Money/Http/Requests/ExchangeRateProviderRequest.php
similarity index 97%
rename from app/Http/Requests/ExchangeRateProviderRequest.php
rename to app/Domains/Money/Http/Requests/ExchangeRateProviderRequest.php
index 28aa8408..dbe2860c 100644
--- a/app/Http/Requests/ExchangeRateProviderRequest.php
+++ b/app/Domains/Money/Http/Requests/ExchangeRateProviderRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Money\Http\Requests;
 
 use App\Rules\PublicHttpUrl;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Resources/CurrencyResource.php b/app/Domains/Money/Http/Resources/CurrencyResource.php
similarity index 94%
rename from app/Http/Resources/CurrencyResource.php
rename to app/Domains/Money/Http/Resources/CurrencyResource.php
index d1524c2e..c551f1a8 100644
--- a/app/Http/Resources/CurrencyResource.php
+++ b/app/Domains/Money/Http/Resources/CurrencyResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Money\Http\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Http/Resources/Customer/CurrencyResource.php b/app/Domains/Money/Http/Resources/CustomerPortal/CurrencyResource.php
similarity index 92%
rename from app/Http/Resources/Customer/CurrencyResource.php
rename to app/Domains/Money/Http/Resources/CustomerPortal/CurrencyResource.php
index b029fc00..f4c42b4f 100644
--- a/app/Http/Resources/Customer/CurrencyResource.php
+++ b/app/Domains/Money/Http/Resources/CustomerPortal/CurrencyResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Money\Http\Resources\CustomerPortal;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Http/Resources/ExchangeRateProviderResource.php b/app/Domains/Money/Http/Resources/ExchangeRateProviderResource.php
similarity index 88%
rename from app/Http/Resources/ExchangeRateProviderResource.php
rename to app/Domains/Money/Http/Resources/ExchangeRateProviderResource.php
index b6c3c1de..292040ec 100644
--- a/app/Http/Resources/ExchangeRateProviderResource.php
+++ b/app/Domains/Money/Http/Resources/ExchangeRateProviderResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Money\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Models/Currency.php b/app/Domains/Money/Models/Currency.php
similarity index 82%
rename from app/Models/Currency.php
rename to app/Domains/Money/Models/Currency.php
index 3bd7581c..77a22e6c 100644
--- a/app/Models/Currency.php
+++ b/app/Domains/Money/Models/Currency.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Money\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Currency extends Model
 {
+    protected $table = 'currencies';
+
     use HasFactory;
 
     public const COMMON_CURRENCY_CODES = [
diff --git a/app/Models/ExchangeRateLog.php b/app/Domains/Money/Models/ExchangeRateLog.php
similarity index 87%
rename from app/Models/ExchangeRateLog.php
rename to app/Domains/Money/Models/ExchangeRateLog.php
index c7584526..2ca41d89 100644
--- a/app/Models/ExchangeRateLog.php
+++ b/app/Domains/Money/Models/ExchangeRateLog.php
@@ -1,13 +1,17 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Money\Models;
 
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class ExchangeRateLog extends Model
 {
+    protected $table = 'exchange_rate_logs';
+
     use HasFactory;
 
     protected $guarded = [
diff --git a/app/Models/ExchangeRateProvider.php b/app/Domains/Money/Models/ExchangeRateProvider.php
similarity index 88%
rename from app/Models/ExchangeRateProvider.php
rename to app/Domains/Money/Models/ExchangeRateProvider.php
index 112d6db1..05a83b87 100644
--- a/app/Models/ExchangeRateProvider.php
+++ b/app/Domains/Money/Models/ExchangeRateProvider.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Money\Models;
 
+use App\Domains\Accounts\Models\Company;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class ExchangeRateProvider extends Model
 {
+    protected $table = 'exchange_rate_providers';
+
     use HasFactory;
 
     protected $guarded = [
diff --git a/app/Providers/DriverRegistryProvider.php b/app/Domains/Money/MoneyServiceProvider.php
similarity index 53%
rename from app/Providers/DriverRegistryProvider.php
rename to app/Domains/Money/MoneyServiceProvider.php
index 122e5c45..370ba201 100644
--- a/app/Providers/DriverRegistryProvider.php
+++ b/app/Domains/Money/MoneyServiceProvider.php
@@ -1,21 +1,31 @@
 <?php
 
-namespace App\Providers;
+namespace App\Domains\Money;
 
-use App\Support\Ai\OpenRouterDriver;
-use App\Support\ExchangeRate\CurrencyConverterDriver;
-use App\Support\ExchangeRate\CurrencyFreakDriver;
-use App\Support\ExchangeRate\CurrencyLayerDriver;
-use App\Support\ExchangeRate\OpenExchangeRateDriver;
+use App\Adapters\Money\EloquentExchangeRateBackfill;
+use App\Domains\Money\Contracts\ExchangeRateBackfill;
+use App\Domains\Money\ExchangeRates\CurrencyConverterDriver;
+use App\Domains\Money\ExchangeRates\CurrencyFreakDriver;
+use App\Domains\Money\ExchangeRates\CurrencyLayerDriver;
+use App\Domains\Money\ExchangeRates\OpenExchangeRateDriver;
+use App\Domains\Money\Models\ExchangeRateProvider;
+use App\Domains\Money\Policies\ExchangeRateProviderPolicy;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\ServiceProvider;
 use InvoiceShelf\Modules\Registry;
 
-class DriverRegistryProvider extends ServiceProvider
+class MoneyServiceProvider extends ServiceProvider
 {
+    public function register(): void
+    {
+        $this->app->bind(ExchangeRateBackfill::class, EloquentExchangeRateBackfill::class);
+    }
+
     public function boot(): void
     {
+        Gate::policy(ExchangeRateProvider::class, ExchangeRateProviderPolicy::class);
+
         $this->registerExchangeRateDrivers();
-        $this->registerAiDrivers();
     }
 
     protected function registerExchangeRateDrivers(): void
@@ -64,34 +74,4 @@ class DriverRegistryProvider extends ServiceProvider
             'website' => 'https://openexchangerates.org',
         ]);
     }
-
-    protected function registerAiDrivers(): void
-    {
-        Registry::registerAiDriver('openrouter', [
-            'class' => OpenRouterDriver::class,
-            'label' => 'settings.ai.openrouter',
-            'website' => 'https://openrouter.ai',
-            'default_base_url' => 'https://openrouter.ai/api/v1',
-            'supported_roles' => ['chat', 'text_generation'],
-            'suggested_models' => [
-                ['value' => 'anthropic/claude-sonnet-4.6', 'label' => 'Anthropic Claude Sonnet 4.6'],
-                ['value' => 'anthropic/claude-haiku-4.5', 'label' => 'Anthropic Claude Haiku 4.5'],
-                ['value' => 'anthropic/claude-opus-4.6', 'label' => 'Anthropic Claude Opus 4.6'],
-                ['value' => 'openai/gpt-5.4', 'label' => 'OpenAI GPT-5.4'],
-                ['value' => 'openai/gpt-5.4-mini', 'label' => 'OpenAI GPT-5.4 mini'],
-                ['value' => 'google/gemini-3.1-pro-preview', 'label' => 'Google Gemini 3.1 Pro (preview)'],
-                ['value' => 'google/gemini-3.1-flash-lite-preview', 'label' => 'Google Gemini 3.1 Flash Lite (preview)'],
-                ['value' => 'z-ai/glm-5.1', 'label' => 'Z.AI GLM 5.1'],
-                ['value' => 'z-ai/glm-4.7-flash', 'label' => 'Z.AI GLM 4.7 Flash'],
-            ],
-            'config_fields' => [
-                [
-                    'key' => 'base_url',
-                    'type' => 'text',
-                    'label' => 'settings.ai.base_url',
-                    'default' => 'https://openrouter.ai/api/v1',
-                ],
-            ],
-        ]);
-    }
 }
diff --git a/app/Policies/ExchangeRateProviderPolicy.php b/app/Domains/Money/Policies/ExchangeRateProviderPolicy.php
similarity index 95%
rename from app/Policies/ExchangeRateProviderPolicy.php
rename to app/Domains/Money/Policies/ExchangeRateProviderPolicy.php
index ff64bdb0..1f7cfaf9 100644
--- a/app/Policies/ExchangeRateProviderPolicy.php
+++ b/app/Domains/Money/Policies/ExchangeRateProviderPolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Money\Policies;
 
-use App\Models\ExchangeRateProvider;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Money\Models\ExchangeRateProvider;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Illuminate\Auth\Access\Response;
 use Silber\Bouncer\BouncerFacade;
diff --git a/app/Domains/Money/routes/company.php b/app/Domains/Money/routes/company.php
new file mode 100644
index 00000000..6a9aa473
--- /dev/null
+++ b/app/Domains/Money/routes/company.php
@@ -0,0 +1,14 @@
+<?php
+
+use App\Domains\Money\Http\Controllers\CurrenciesController;
+use App\Domains\Money\Http\Controllers\ExchangeRateProviderController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/currencies', CurrenciesController::class);
+Route::get('/currencies/used', [ExchangeRateProviderController::class, 'usedCurrenciesWithoutRate']);
+Route::post('/currencies/bulk-update-exchange-rate', [ExchangeRateProviderController::class, 'bulkUpdate']);
+Route::get('/currencies/{currency}/exchange-rate', [ExchangeRateProviderController::class, 'getRate']);
+Route::get('/currencies/{currency}/active-provider', [ExchangeRateProviderController::class, 'activeProvider']);
+Route::get('/used-currencies', [ExchangeRateProviderController::class, 'usedCurrencies']);
+Route::get('/supported-currencies', [ExchangeRateProviderController::class, 'supportedCurrencies']);
+Route::apiResource('exchange-rate-providers', ExchangeRateProviderController::class);
diff --git a/app/Domains/Purchases/Application/ClearExpenseTaxes.php b/app/Domains/Purchases/Application/ClearExpenseTaxes.php
new file mode 100644
index 00000000..4e4699df
--- /dev/null
+++ b/app/Domains/Purchases/Application/ClearExpenseTaxes.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Domains\Purchases\Application;
+
+use App\Domains\Purchases\Contracts\ExpenseTaxManager;
+use App\Domains\Purchases\Models\Expense;
+
+class ClearExpenseTaxes
+{
+    public function __construct(
+        private readonly ExpenseTaxManager $expenseTaxManager,
+    ) {}
+
+    public function deleting(Expense $expense): void
+    {
+        $this->expenseTaxManager->clear($expense);
+    }
+}
diff --git a/app/Domains/Purchases/Application/ExpenseService.php b/app/Domains/Purchases/Application/ExpenseService.php
new file mode 100644
index 00000000..ca905a7b
--- /dev/null
+++ b/app/Domains/Purchases/Application/ExpenseService.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Domains\Purchases\Application;
+
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
+use App\Domains\Purchases\Contracts\ExpenseExchangeRateRecorder;
+use App\Domains\Purchases\Contracts\ExpenseReceiptManager;
+use App\Domains\Purchases\Contracts\ExpenseTaxManager;
+use App\Domains\Purchases\Data\PendingExpenseReceipt;
+use App\Domains\Purchases\Models\Expense;
+use Illuminate\Support\Facades\DB;
+
+class ExpenseService
+{
+    public function __construct(
+        private readonly CustomFieldValueWriter $customFieldValueWriter,
+        private readonly ExpenseTaxManager $expenseTaxManager,
+        private readonly ExpenseExchangeRateRecorder $expenseExchangeRateRecorder,
+        private readonly ExpenseReceiptManager $expenseReceiptManager,
+    ) {}
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<int, array{tax_type_id: int, amount: int}>|null  $taxes
+     */
+    public function create(
+        array $attributes,
+        ?array $taxes = null,
+        ?PendingExpenseReceipt $receipt = null,
+        ?iterable $customFields = null,
+    ): Expense {
+        $expense = DB::transaction(function () use ($attributes, $taxes): Expense {
+            $expense = Expense::create($attributes);
+
+            if ($taxes !== null) {
+                $this->expenseTaxManager->replace($expense, $taxes);
+            }
+
+            return $expense;
+        });
+
+        $companyCurrency = CompanySetting::getSetting('currency', $expense->company_id);
+
+        if ((string) $expense['currency_id'] !== $companyCurrency) {
+            $this->expenseExchangeRateRecorder->record($expense);
+        }
+
+        if ($receipt) {
+            $this->expenseReceiptManager->attach($expense, $receipt);
+        }
+
+        if ($customFields) {
+            $this->customFieldValueWriter->attach($expense, $customFields);
+        }
+
+        return $expense->load('taxes.taxType');
+    }
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<int, array{tax_type_id: int, amount: int}>|null  $taxes
+     */
+    public function update(
+        Expense $expense,
+        array $attributes,
+        ?array $taxes = null,
+        ?PendingExpenseReceipt $receipt = null,
+        bool $removeReceipt = false,
+        ?iterable $customFields = null,
+    ): Expense {
+        DB::transaction(function () use ($expense, $attributes, $taxes): void {
+            $expense->update($attributes);
+
+            if ($taxes !== null) {
+                $this->expenseTaxManager->replace($expense, $taxes);
+            }
+        });
+
+        $companyCurrency = CompanySetting::getSetting('currency', $expense->company_id);
+
+        if ((string) $attributes['currency_id'] !== $companyCurrency) {
+            $this->expenseExchangeRateRecorder->record($expense);
+        }
+
+        if ($removeReceipt) {
+            $this->expenseReceiptManager->clear($expense);
+        }
+
+        if ($receipt) {
+            $this->expenseReceiptManager->replace($expense, $receipt);
+        }
+
+        if ($customFields) {
+            $this->customFieldValueWriter->update($expense, $customFields);
+        }
+
+        return $expense->fresh('taxes.taxType');
+    }
+}
diff --git a/app/Domains/Purchases/Contracts/ExpenseExchangeRateRecorder.php b/app/Domains/Purchases/Contracts/ExpenseExchangeRateRecorder.php
new file mode 100644
index 00000000..d3427994
--- /dev/null
+++ b/app/Domains/Purchases/Contracts/ExpenseExchangeRateRecorder.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Purchases\Contracts;
+
+use App\Domains\Purchases\Models\Expense;
+
+interface ExpenseExchangeRateRecorder
+{
+    public function record(Expense $expense): void;
+}
diff --git a/app/Domains/Purchases/Contracts/ExpenseReceiptManager.php b/app/Domains/Purchases/Contracts/ExpenseReceiptManager.php
new file mode 100644
index 00000000..542f552f
--- /dev/null
+++ b/app/Domains/Purchases/Contracts/ExpenseReceiptManager.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Domains\Purchases\Contracts;
+
+use App\Domains\Purchases\Data\PendingExpenseReceipt;
+use App\Domains\Purchases\Data\StoredExpenseReceipt;
+use App\Domains\Purchases\Models\Expense;
+
+interface ExpenseReceiptManager
+{
+    public function attach(Expense $expense, PendingExpenseReceipt $receipt): void;
+
+    public function replace(Expense $expense, PendingExpenseReceipt $receipt): void;
+
+    public function attachBase64(
+        Expense $expense,
+        string $contents,
+        string $fileName,
+        bool $replaceExisting,
+    ): void;
+
+    public function clear(Expense $expense): void;
+
+    public function first(Expense $expense): ?StoredExpenseReceipt;
+}
diff --git a/app/Domains/Purchases/Contracts/ExpenseTaxManager.php b/app/Domains/Purchases/Contracts/ExpenseTaxManager.php
new file mode 100644
index 00000000..00c0d86e
--- /dev/null
+++ b/app/Domains/Purchases/Contracts/ExpenseTaxManager.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Domains\Purchases\Contracts;
+
+use App\Domains\Purchases\Models\Expense;
+
+interface ExpenseTaxManager
+{
+    /** @param array<int, array{tax_type_id: int, amount: int}> $taxes */
+    public function replace(Expense $expense, array $taxes): void;
+
+    public function clear(Expense $expense): void;
+}
diff --git a/app/Domains/Purchases/Data/PendingExpenseReceipt.php b/app/Domains/Purchases/Data/PendingExpenseReceipt.php
new file mode 100644
index 00000000..97229b36
--- /dev/null
+++ b/app/Domains/Purchases/Data/PendingExpenseReceipt.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Domains\Purchases\Data;
+
+final readonly class PendingExpenseReceipt
+{
+    public function __construct(
+        public string $path,
+        public string $fileName,
+    ) {}
+}
diff --git a/app/Domains/Purchases/Data/StoredExpenseReceipt.php b/app/Domains/Purchases/Data/StoredExpenseReceipt.php
new file mode 100644
index 00000000..8a516cbb
--- /dev/null
+++ b/app/Domains/Purchases/Data/StoredExpenseReceipt.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Domains\Purchases\Data;
+
+final readonly class StoredExpenseReceipt
+{
+    public function __construct(
+        public string $path,
+        public string $fileName,
+    ) {}
+}
diff --git a/app/Http/Controllers/Company/Expense/ExpenseCategoriesController.php b/app/Domains/Purchases/Http/Controllers/Company/ExpenseCategoriesController.php
similarity index 88%
rename from app/Http/Controllers/Company/Expense/ExpenseCategoriesController.php
rename to app/Domains/Purchases/Http/Controllers/Company/ExpenseCategoriesController.php
index ed8ccda1..403ceb4f 100644
--- a/app/Http/Controllers/Company/Expense/ExpenseCategoriesController.php
+++ b/app/Domains/Purchases/Http/Controllers/Company/ExpenseCategoriesController.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Company\Expense;
+namespace App\Domains\Purchases\Http\Controllers\Company;
 
-use App\ExpensesCategory;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\ExpenseCategoryRequest;
-use App\Http\Resources\ExpenseCategoryResource;
-use App\Models\ExpenseCategory;
+use App\Domains\Purchases\Http\Requests\ExpenseCategoryRequest;
+use App\Domains\Purchases\Http\Resources\ExpenseCategoryResource;
+use App\Domains\Purchases\Models\ExpenseCategory;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -77,7 +76,6 @@ class ExpenseCategoriesController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  ExpensesCategory  $category
      * @return Response
      */
     public function destroy(ExpenseCategory $category)
diff --git a/app/Http/Controllers/Company/Expense/ExpensesController.php b/app/Domains/Purchases/Http/Controllers/Company/ExpensesController.php
similarity index 51%
rename from app/Http/Controllers/Company/Expense/ExpensesController.php
rename to app/Domains/Purchases/Http/Controllers/Company/ExpensesController.php
index e1a244e1..17cd5be5 100644
--- a/app/Http/Controllers/Company/Expense/ExpensesController.php
+++ b/app/Domains/Purchases/Http/Controllers/Company/ExpensesController.php
@@ -1,14 +1,16 @@
 <?php
 
-namespace App\Http\Controllers\Company\Expense;
+namespace App\Domains\Purchases\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\DeleteExpensesRequest;
-use App\Http\Requests\ExpenseRequest;
-use App\Http\Requests\UploadExpenseReceiptRequest;
-use App\Http\Resources\ExpenseResource;
-use App\Models\Expense;
-use App\Services\Document\ExpenseService;
+use App\Domains\Purchases\Application\ExpenseService;
+use App\Domains\Purchases\Contracts\ExpenseReceiptManager;
+use App\Domains\Purchases\Data\PendingExpenseReceipt;
+use App\Domains\Purchases\Http\Requests\DeleteExpensesRequest;
+use App\Domains\Purchases\Http\Requests\ExpenseRequest;
+use App\Domains\Purchases\Http\Requests\UploadExpenseReceiptRequest;
+use App\Domains\Purchases\Http\Resources\ExpenseResource;
+use App\Domains\Purchases\Models\Expense;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -16,6 +18,7 @@ class ExpensesController extends Controller
 {
     public function __construct(
         private readonly ExpenseService $expenseService,
+        private readonly ExpenseReceiptManager $expenseReceiptManager,
     ) {}
 
     /**
@@ -52,7 +55,12 @@ class ExpensesController extends Controller
     {
         $this->authorize('create', Expense::class);
 
-        $expense = $this->expenseService->create($request);
+        $expense = $this->expenseService->create(
+            attributes: $request->getExpensePayload(),
+            taxes: $request->has('taxes') ? $request->input('taxes') : null,
+            receipt: $this->receipt($request),
+            customFields: $this->customFields($request),
+        );
 
         return new ExpenseResource($expense);
     }
@@ -80,7 +88,14 @@ class ExpensesController extends Controller
     {
         $this->authorize('update', $expense);
 
-        $expense = $this->expenseService->update($expense, $request);
+        $expense = $this->expenseService->update(
+            expense: $expense,
+            attributes: $request->getExpensePayload(),
+            taxes: $request->has('taxes') ? $request->input('taxes') : null,
+            receipt: $this->receipt($request),
+            removeReceipt: (bool) $request->input('is_attachment_receipt_removed', false),
+            customFields: $this->customFields($request),
+        );
 
         return new ExpenseResource($expense);
     }
@@ -104,15 +119,13 @@ class ExpensesController extends Controller
     {
         $this->authorize('view', $expense);
 
-        if ($expense) {
-            $media = $expense->getFirstMedia('receipts');
+        $receipt = $this->expenseReceiptManager->first($expense);
 
-            if ($media) {
-                return response()->file($media->getPath());
-            }
-
-            return respondJson('receipt_does_not_exist', 'Receipt does not exist.');
+        if ($receipt) {
+            return response()->file($receipt->path);
         }
+
+        return respondJson('receipt_does_not_exist', 'Receipt does not exist.');
     }
 
     public function uploadReceipt(UploadExpenseReceiptRequest $request, Expense $expense)
@@ -122,13 +135,12 @@ class ExpensesController extends Controller
         $data = json_decode($request->attachment_receipt);
 
         if ($data) {
-            if ($request->type === 'edit') {
-                $expense->clearMediaCollection('receipts');
-            }
-
-            $expense->addMediaFromBase64($data->data)
-                ->usingFileName($data->name)
-                ->toMediaCollection('receipts');
+            $this->expenseReceiptManager->attachBase64(
+                $expense,
+                $data->data,
+                $data->name,
+                $request->type === 'edit',
+            );
         }
 
         return response()->json([
@@ -140,21 +152,49 @@ class ExpensesController extends Controller
     {
         $this->authorize('view', $expense);
 
-        if ($expense) {
-            $media = $expense->getFirstMedia('receipts');
-            if ($media) {
-                $imagePath = $media->getPath();
-                $response = \Response::download($imagePath, $media->file_name);
-                if (ob_get_contents()) {
-                    ob_end_clean();
-                }
+        $receipt = $this->expenseReceiptManager->first($expense);
 
-                return $response;
+        if ($receipt) {
+            $response = response()->download($receipt->path, $receipt->fileName);
+            if (ob_get_contents()) {
+                ob_end_clean();
             }
+
+            return $response;
         }
 
         return response()->json([
             'error' => 'receipt_not_found',
         ]);
     }
+
+    /** @return array<int, mixed>|null */
+    private function customFields(ExpenseRequest $request): ?array
+    {
+        $customFields = $request->input('customFields');
+
+        if (! $customFields) {
+            return null;
+        }
+
+        if (is_string($customFields)) {
+            $customFields = json_decode($customFields);
+        }
+
+        return is_array($customFields) ? $customFields : null;
+    }
+
+    private function receipt(ExpenseRequest $request): ?PendingExpenseReceipt
+    {
+        $receipt = $request->file('attachment_receipt');
+
+        if (! $receipt) {
+            return null;
+        }
+
+        return new PendingExpenseReceipt(
+            $receipt->getPathname(),
+            $receipt->getClientOriginalName(),
+        );
+    }
 }
diff --git a/app/Http/Controllers/CustomerPortal/Expense/ExpensesController.php b/app/Domains/Purchases/Http/Controllers/CustomerPortal/ExpensesController.php
similarity index 84%
rename from app/Http/Controllers/CustomerPortal/Expense/ExpensesController.php
rename to app/Domains/Purchases/Http/Controllers/CustomerPortal/ExpensesController.php
index 6863c601..cd2968d9 100644
--- a/app/Http/Controllers/CustomerPortal/Expense/ExpensesController.php
+++ b/app/Domains/Purchases/Http/Controllers/CustomerPortal/ExpensesController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal\Expense;
+namespace App\Domains\Purchases\Http\Controllers\CustomerPortal;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\Customer\ExpenseResource;
-use App\Models\Company;
-use App\Models\Expense;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Purchases\Http\Resources\CustomerPortal\ExpenseResource;
+use App\Domains\Purchases\Models\Expense;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Http/Requests/DeleteExpensesRequest.php b/app/Domains/Purchases/Http/Requests/DeleteExpensesRequest.php
similarity index 92%
rename from app/Http/Requests/DeleteExpensesRequest.php
rename to app/Domains/Purchases/Http/Requests/DeleteExpensesRequest.php
index 553ab87b..2a2105ec 100644
--- a/app/Http/Requests/DeleteExpensesRequest.php
+++ b/app/Domains/Purchases/Http/Requests/DeleteExpensesRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Purchases\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/ExpenseCategoryRequest.php b/app/Domains/Purchases/Http/Requests/ExpenseCategoryRequest.php
similarity index 94%
rename from app/Http/Requests/ExpenseCategoryRequest.php
rename to app/Domains/Purchases/Http/Requests/ExpenseCategoryRequest.php
index 8e512c17..49a7f381 100644
--- a/app/Http/Requests/ExpenseCategoryRequest.php
+++ b/app/Domains/Purchases/Http/Requests/ExpenseCategoryRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Purchases\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/ExpenseRequest.php b/app/Domains/Purchases/Http/Requests/ExpenseRequest.php
similarity index 96%
rename from app/Http/Requests/ExpenseRequest.php
rename to app/Domains/Purchases/Http/Requests/ExpenseRequest.php
index 785c3b6a..7f83a548 100644
--- a/app/Http/Requests/ExpenseRequest.php
+++ b/app/Domains/Purchases/Http/Requests/ExpenseRequest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Purchases\Http\Requests;
 
-use App\Models\CompanySetting;
-use App\Models\TaxType;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Validator;
diff --git a/app/Http/Requests/UploadExpenseReceiptRequest.php b/app/Domains/Purchases/Http/Requests/UploadExpenseReceiptRequest.php
similarity index 92%
rename from app/Http/Requests/UploadExpenseReceiptRequest.php
rename to app/Domains/Purchases/Http/Requests/UploadExpenseReceiptRequest.php
index 8329049a..0c2d802d 100644
--- a/app/Http/Requests/UploadExpenseReceiptRequest.php
+++ b/app/Domains/Purchases/Http/Requests/UploadExpenseReceiptRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Purchases\Http\Requests;
 
 use App\Rules\Base64Mime;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Resources/Customer/ExpenseCategoryResource.php b/app/Domains/Purchases/Http/Resources/CustomerPortal/ExpenseCategoryResource.php
similarity index 84%
rename from app/Http/Resources/Customer/ExpenseCategoryResource.php
rename to app/Domains/Purchases/Http/Resources/CustomerPortal/ExpenseCategoryResource.php
index 6412b260..8e87dad6 100644
--- a/app/Http/Resources/Customer/ExpenseCategoryResource.php
+++ b/app/Domains/Purchases/Http/Resources/CustomerPortal/ExpenseCategoryResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Purchases\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\CompanyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/Customer/ExpenseResource.php b/app/Domains/Purchases/Http/Resources/CustomerPortal/ExpenseResource.php
similarity index 83%
rename from app/Http/Resources/Customer/ExpenseResource.php
rename to app/Domains/Purchases/Http/Resources/CustomerPortal/ExpenseResource.php
index aba20d4f..b0e121d8 100644
--- a/app/Http/Resources/Customer/ExpenseResource.php
+++ b/app/Domains/Purchases/Http/Resources/CustomerPortal/ExpenseResource.php
@@ -1,7 +1,12 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Purchases\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\CompanyResource;
+use App\Domains\Contacts\Http\Resources\CustomerPortal\CustomerResource;
+use App\Domains\Metadata\Http\Resources\CustomerPortal\CustomFieldValueResource;
+use App\Domains\Money\Http\Resources\CustomerPortal\CurrencyResource;
+use App\Domains\Receivables\Http\Resources\CustomerPortal\PaymentMethodResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/ExpenseCategoryResource.php b/app/Domains/Purchases/Http/Resources/ExpenseCategoryResource.php
similarity index 87%
rename from app/Http/Resources/ExpenseCategoryResource.php
rename to app/Domains/Purchases/Http/Resources/ExpenseCategoryResource.php
index bdc937fc..f3e0ef44 100644
--- a/app/Http/Resources/ExpenseCategoryResource.php
+++ b/app/Domains/Purchases/Http/Resources/ExpenseCategoryResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Purchases\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/ExpenseResource.php b/app/Domains/Purchases/Http/Resources/ExpenseResource.php
similarity index 84%
rename from app/Http/Resources/ExpenseResource.php
rename to app/Domains/Purchases/Http/Resources/ExpenseResource.php
index a49d12fc..dd97bf23 100644
--- a/app/Http/Resources/ExpenseResource.php
+++ b/app/Domains/Purchases/Http/Resources/ExpenseResource.php
@@ -1,7 +1,14 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Purchases\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Accounts\Http\Resources\UserResource;
+use App\Domains\Contacts\Http\Resources\CustomerResource;
+use App\Domains\Metadata\Http\Resources\CustomFieldValueResource;
+use App\Domains\Money\Http\Resources\CurrencyResource;
+use App\Domains\Receivables\Http\Resources\PaymentMethodResource;
+use App\Domains\Taxation\Http\Resources\TaxResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Models/Expense.php b/app/Domains/Purchases/Models/Expense.php
similarity index 94%
rename from app/Models/Expense.php
rename to app/Domains/Purchases/Models/Expense.php
index b800cb5a..e56a8af9 100644
--- a/app/Models/Expense.php
+++ b/app/Domains/Purchases/Models/Expense.php
@@ -1,9 +1,16 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Purchases\Models;
 
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Concerns\HasCustomFields;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Receivables\Models\PaymentMethod;
+use App\Domains\Taxation\Models\Tax;
 use App\Support\SafeOrderBy;
-use App\Traits\HasCustomFieldsTrait;
 use Carbon\Carbon;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\Builder;
@@ -19,7 +26,9 @@ use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 class Expense extends Model implements HasMedia
 {
-    use HasCustomFieldsTrait;
+    protected $table = 'expenses';
+
+    use HasCustomFields;
     use HasFactory;
     use InteractsWithMedia;
 
@@ -44,13 +53,6 @@ class Expense extends Model implements HasMedia
         ];
     }
 
-    protected static function booted(): void
-    {
-        static::deleting(function (Expense $expense): void {
-            $expense->taxes()->delete();
-        });
-    }
-
     public function registerMediaCollections(): void
     {
         $this->addMediaCollection('receipts');
diff --git a/app/Models/ExpenseCategory.php b/app/Domains/Purchases/Models/ExpenseCategory.php
similarity index 93%
rename from app/Models/ExpenseCategory.php
rename to app/Domains/Purchases/Models/ExpenseCategory.php
index bf86c2fa..30f66ce4 100644
--- a/app/Models/ExpenseCategory.php
+++ b/app/Domains/Purchases/Models/ExpenseCategory.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Purchases\Models;
 
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
 use Carbon\Carbon;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\Builder;
@@ -13,6 +15,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class ExpenseCategory extends Model
 {
+    protected $table = 'expense_categories';
+
     use HasFactory;
 
     protected $fillable = ['name', 'company_id', 'description'];
diff --git a/app/Policies/ExpenseCategoryPolicy.php b/app/Domains/Purchases/Policies/ExpenseCategoryPolicy.php
similarity index 93%
rename from app/Policies/ExpenseCategoryPolicy.php
rename to app/Domains/Purchases/Policies/ExpenseCategoryPolicy.php
index 7aa06563..6939af5f 100644
--- a/app/Policies/ExpenseCategoryPolicy.php
+++ b/app/Domains/Purchases/Policies/ExpenseCategoryPolicy.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Purchases\Policies;
 
-use App\Models\Expense;
-use App\Models\ExpenseCategory;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Purchases\Models\ExpenseCategory;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Policies/ExpensePolicy.php b/app/Domains/Purchases/Policies/ExpensePolicy.php
similarity index 95%
rename from app/Policies/ExpensePolicy.php
rename to app/Domains/Purchases/Policies/ExpensePolicy.php
index 770faa2d..e4e5edd5 100644
--- a/app/Policies/ExpensePolicy.php
+++ b/app/Domains/Purchases/Policies/ExpensePolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Purchases\Policies;
 
-use App\Models\Expense;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Purchases\Models\Expense;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Domains/Purchases/PurchasesServiceProvider.php b/app/Domains/Purchases/PurchasesServiceProvider.php
new file mode 100644
index 00000000..c8182052
--- /dev/null
+++ b/app/Domains/Purchases/PurchasesServiceProvider.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Domains\Purchases;
+
+use App\Adapters\Purchases\MediaLibraryExpenseReceiptManager;
+use App\Adapters\Purchases\MoneyExpenseExchangeRateRecorder;
+use App\Adapters\Purchases\TaxationExpenseTaxManager;
+use App\Domains\Purchases\Application\ClearExpenseTaxes;
+use App\Domains\Purchases\Contracts\ExpenseExchangeRateRecorder;
+use App\Domains\Purchases\Contracts\ExpenseReceiptManager;
+use App\Domains\Purchases\Contracts\ExpenseTaxManager;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Purchases\Models\ExpenseCategory;
+use App\Domains\Purchases\Policies\ExpenseCategoryPolicy;
+use App\Domains\Purchases\Policies\ExpensePolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+
+class PurchasesServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->bind(ExpenseTaxManager::class, TaxationExpenseTaxManager::class);
+        $this->app->bind(ExpenseExchangeRateRecorder::class, MoneyExpenseExchangeRateRecorder::class);
+        $this->app->bind(ExpenseReceiptManager::class, MediaLibraryExpenseReceiptManager::class);
+    }
+
+    public function boot(): void
+    {
+        Expense::observe(ClearExpenseTaxes::class);
+
+        Gate::policy(Expense::class, ExpensePolicy::class);
+        Gate::policy(ExpenseCategory::class, ExpenseCategoryPolicy::class);
+        Gate::define('delete multiple expenses', [ExpensePolicy::class, 'deleteMultiple']);
+    }
+}
diff --git a/app/Domains/Purchases/routes/company.php b/app/Domains/Purchases/routes/company.php
new file mode 100644
index 00000000..63b2542c
--- /dev/null
+++ b/app/Domains/Purchases/routes/company.php
@@ -0,0 +1,11 @@
+<?php
+
+use App\Domains\Purchases\Http\Controllers\Company\ExpenseCategoriesController;
+use App\Domains\Purchases\Http\Controllers\Company\ExpensesController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/expenses/{expense}/show/receipt', [ExpensesController::class, 'showReceipt']);
+Route::post('/expenses/{expense}/upload/receipts', [ExpensesController::class, 'uploadReceipt']);
+Route::post('/expenses/delete', [ExpensesController::class, 'delete']);
+Route::apiResource('expenses', ExpensesController::class);
+Route::apiResource('categories', ExpenseCategoriesController::class);
diff --git a/app/Domains/Purchases/routes/customer.php b/app/Domains/Purchases/routes/customer.php
new file mode 100644
index 00000000..d23c486e
--- /dev/null
+++ b/app/Domains/Purchases/routes/customer.php
@@ -0,0 +1,7 @@
+<?php
+
+use App\Domains\Purchases\Http\Controllers\CustomerPortal\ExpensesController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('expenses', [ExpensesController::class, 'index']);
+Route::get('expenses/{id}', [ExpensesController::class, 'show']);
diff --git a/app/Domains/Purchases/routes/web.php b/app/Domains/Purchases/routes/web.php
new file mode 100644
index 00000000..465ca6f2
--- /dev/null
+++ b/app/Domains/Purchases/routes/web.php
@@ -0,0 +1,7 @@
+<?php
+
+use App\Domains\Purchases\Http\Controllers\Company\ExpensesController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/expenses/{expense}/download-receipt', [ExpensesController::class, 'downloadReceipt']);
+Route::get('/expenses/{expense}/receipt', [ExpensesController::class, 'showReceipt']);
diff --git a/app/Services/Document/PaymentAllocationService.php b/app/Domains/Receivables/Application/PaymentAllocationService.php
similarity index 96%
rename from app/Services/Document/PaymentAllocationService.php
rename to app/Domains/Receivables/Application/PaymentAllocationService.php
index d879a98d..4324f93a 100644
--- a/app/Services/Document/PaymentAllocationService.php
+++ b/app/Domains/Receivables/Application/PaymentAllocationService.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace App\Services\Document;
+namespace App\Domains\Receivables\Application;
 
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
+use App\Domains\Receivables\Contracts\InvoiceBalanceUpdater;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\ValidationException;
@@ -12,7 +13,7 @@ use Illuminate\Validation\ValidationException;
 class PaymentAllocationService
 {
     public function __construct(
-        private readonly InvoiceBalanceService $invoiceBalanceService,
+        private readonly InvoiceBalanceUpdater $invoiceBalanceUpdater,
     ) {}
 
     /**
@@ -141,7 +142,7 @@ class PaymentAllocationService
         }
 
         foreach ($invoices as $invoice) {
-            $this->invoiceBalanceService->recalculate($invoice);
+            $this->invoiceBalanceUpdater->recalculate($invoice);
         }
     }
 
@@ -226,7 +227,7 @@ class PaymentAllocationService
             ->where('invoice_id', $invoice->id)
             ->where('payment_id', '!=', $payment->id)
             ->sum('amount');
-        $available = max(0, (int) $invoice->total - $this->invoiceBalanceService->creditedTotal($invoice) - $allocatedByOtherPayments);
+        $available = max(0, (int) $invoice->total - $this->invoiceBalanceUpdater->creditedTotal($invoice) - $allocatedByOtherPayments);
 
         if ($amount > $available) {
             throw ValidationException::withMessages([
diff --git a/app/Domains/Receivables/Application/PaymentService.php b/app/Domains/Receivables/Application/PaymentService.php
new file mode 100644
index 00000000..f2083408
--- /dev/null
+++ b/app/Domains/Receivables/Application/PaymentService.php
@@ -0,0 +1,214 @@
+<?php
+
+namespace App\Domains\Receivables\Application;
+
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
+use App\Domains\Receivables\Contracts\PaymentEmailSender;
+use App\Domains\Receivables\Contracts\PaymentExchangeRateRecorder;
+use App\Domains\Receivables\Contracts\PaymentNumberAssigner;
+use App\Domains\Receivables\Contracts\PaymentPdfDataProvider;
+use App\Domains\Receivables\Models\Payment;
+use App\Facades\Hashids;
+use App\Platform\Mail\Contracts\MailConfigurator;
+use App\Platform\Pdf\Facades\Pdf;
+use App\Platform\Pdf\Rendering\PdfMetadata;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
+use App\Support\Hashids\HashidConnection;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Validation\ValidationException;
+
+class PaymentService implements PaymentPdfDataProvider
+{
+    public function __construct(
+        private readonly PaymentAllocationService $paymentAllocationService,
+        private readonly MailConfigurator $mailConfigurator,
+        private readonly CustomFieldValueWriter $customFieldValueWriter,
+        private readonly PaymentNumberAssigner $paymentNumberAssigner,
+        private readonly PaymentExchangeRateRecorder $paymentExchangeRateRecorder,
+        private readonly PaymentEmailSender $paymentEmailSender,
+    ) {}
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<int, array{invoice_id: int, amount: int}>  $allocations
+     */
+    public function create(
+        array $attributes,
+        array $allocations = [],
+        ?iterable $customFields = null,
+    ): Payment {
+        $payment = DB::transaction(function () use ($attributes, $allocations, $customFields): Payment {
+            $payment = Payment::create($attributes);
+            $payment->unique_hash = Hashids::connection(HashidConnection::Payment->value)->encode($payment->id);
+
+            $numbering = $this->paymentNumberAssigner->next(
+                $payment,
+                (int) $payment->company_id,
+                (int) $payment->customer_id,
+            );
+
+            $payment->sequence_number = $numbering->sequence;
+            $payment->customer_sequence_number = $numbering->customerSequence;
+            $payment->save();
+
+            $this->paymentAllocationService->replace($payment, $allocations);
+
+            $companyCurrency = CompanySetting::getSetting('currency', $payment->company_id);
+
+            if ((string) $payment->currency_id !== $companyCurrency) {
+                $this->paymentExchangeRateRecorder->record($payment);
+            }
+
+            if ($customFields) {
+                $this->customFieldValueWriter->attach($payment, $customFields);
+            }
+
+            return $payment;
+        });
+
+        return $this->loadPayment($payment);
+    }
+
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<int, array{invoice_id: int, amount: int}>  $allocations
+     */
+    public function update(
+        Payment $payment,
+        array $attributes,
+        bool $replaceAllocations,
+        array $allocations = [],
+        ?iterable $customFields = null,
+    ): Payment {
+        $payment = DB::transaction(function () use ($payment, $attributes, $replaceAllocations, $allocations, $customFields): Payment {
+            $lockedPayment = Payment::query()->whereKey($payment->id)->lockForUpdate()->firstOrFail();
+            $targetAllocations = $replaceAllocations
+                ? $allocations
+                : $lockedPayment->allocations()
+                    ->get(['invoice_id', 'amount'])
+                    ->map(fn ($allocation) => [
+                        'invoice_id' => (int) $allocation->invoice_id,
+                        'amount' => (int) $allocation->amount,
+                    ])
+                    ->all();
+            $customerChanged = (int) $lockedPayment->customer_id !== (int) $attributes['customer_id'];
+
+            if ($customerChanged && $targetAllocations !== []) {
+                throw ValidationException::withMessages([
+                    'customer_id' => ['payment_customer_change_requires_unallocated_credit'],
+                ]);
+            }
+
+            $numbering = $this->paymentNumberAssigner->next(
+                $lockedPayment,
+                (int) $lockedPayment->company_id,
+                (int) $attributes['customer_id'],
+            );
+
+            $attributes['customer_sequence_number'] = $numbering->customerSequence;
+            $lockedPayment->update($attributes);
+            $this->paymentAllocationService->replace($lockedPayment, $targetAllocations);
+
+            $companyCurrency = CompanySetting::getSetting('currency', $lockedPayment->company_id);
+
+            if ((string) $lockedPayment->currency_id !== $companyCurrency) {
+                $this->paymentExchangeRateRecorder->record($lockedPayment);
+            }
+
+            if ($customFields) {
+                $this->customFieldValueWriter->update($lockedPayment, $customFields);
+            }
+
+            return $lockedPayment;
+        });
+
+        return $this->loadPayment($payment);
+    }
+
+    public function delete(Collection $ids): bool
+    {
+        DB::transaction(function () use ($ids): void {
+            foreach ($ids->sort() as $id) {
+                $payment = Payment::query()->whereKey($id)->lockForUpdate()->first();
+
+                if (! $payment) {
+                    continue;
+                }
+
+                $this->paymentAllocationService->replace($payment, []);
+                $payment->delete();
+            }
+        });
+
+        return true;
+    }
+
+    public function sendPaymentData(Payment $payment, array $data): array
+    {
+        $data['payment'] = $payment->toArray();
+        $data['user'] = $payment->customer->toArray();
+        $data['company'] = Company::find($payment->company_id);
+        $data['body'] = $payment->getEmailBody($data['body']);
+        $data['attach']['data'] = ($payment->getEmailAttachmentSetting()) ? $this->getPdfData($payment) : null;
+
+        return $data;
+    }
+
+    public function send(Payment $payment, array $data): array
+    {
+        $data = $this->sendPaymentData($payment, $data);
+
+        $this->mailConfigurator->applyCompanyConfig($payment->company_id);
+
+        $this->paymentEmailSender->send($data);
+
+        return [
+            'success' => true,
+        ];
+    }
+
+    public function getPdfData(Payment $payment): mixed
+    {
+        $payment->loadMissing('allocations.invoice.currency');
+
+        $company = Company::find($payment->company_id);
+        $locale = CompanySetting::getSetting('language', $company->id);
+
+        \App::setLocale($locale);
+
+        $logo = $company->logo_path;
+
+        view()->share([
+            'payment' => $payment,
+            'company_address' => $payment->getCompanyAddress(),
+            'billing_address' => $payment->getCustomerBillingAddress(),
+            'notes' => $payment->getNotes(),
+            'logo' => $logo ?? null,
+        ]);
+
+        $templatePath = PdfTemplateUtils::resolveView('payment', 'payment');
+
+        if (request()->has('preview')) {
+            return view($templatePath);
+        }
+
+        return Pdf::loadView($templatePath, PdfMetadata::forDocument(
+            __('pdf_payment_label'),
+            $payment->payment_number,
+            $company,
+        ));
+    }
+
+    private function loadPayment(Payment $payment): Payment
+    {
+        return Payment::with([
+            'customer',
+            'allocations.invoice',
+            'paymentMethod',
+            'fields',
+        ])->findOrFail($payment->id);
+    }
+}
diff --git a/app/Services/Document/TransactionService.php b/app/Domains/Receivables/Application/TransactionService.php
similarity index 67%
rename from app/Services/Document/TransactionService.php
rename to app/Domains/Receivables/Application/TransactionService.php
index 1af10d11..000e473b 100644
--- a/app/Services/Document/TransactionService.php
+++ b/app/Domains/Receivables/Application/TransactionService.php
@@ -1,16 +1,17 @@
 <?php
 
-namespace App\Services\Document;
+namespace App\Domains\Receivables\Application;
 
+use App\Domains\Receivables\Models\Transaction;
 use App\Facades\Hashids;
-use App\Models\Transaction;
+use App\Support\Hashids\HashidConnection;
 
 class TransactionService
 {
     public function create(array $data): Transaction
     {
         $transaction = Transaction::create($data);
-        $transaction->unique_hash = Hashids::connection(Transaction::class)->encode($transaction->id);
+        $transaction->unique_hash = Hashids::connection(HashidConnection::Transaction->value)->encode($transaction->id);
         $transaction->save();
 
         return $transaction;
diff --git a/app/Domains/Receivables/Contracts/InvoiceBalanceUpdater.php b/app/Domains/Receivables/Contracts/InvoiceBalanceUpdater.php
new file mode 100644
index 00000000..34bd16e5
--- /dev/null
+++ b/app/Domains/Receivables/Contracts/InvoiceBalanceUpdater.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Domains\Receivables\Contracts;
+
+use App\Domains\Sales\Models\Invoice;
+
+interface InvoiceBalanceUpdater
+{
+    public function creditedTotal(Invoice $invoice): int;
+
+    public function recalculate(Invoice $invoice): void;
+}
diff --git a/app/Domains/Receivables/Contracts/PaymentEmailSender.php b/app/Domains/Receivables/Contracts/PaymentEmailSender.php
new file mode 100644
index 00000000..df631336
--- /dev/null
+++ b/app/Domains/Receivables/Contracts/PaymentEmailSender.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Domains\Receivables\Contracts;
+
+interface PaymentEmailSender
+{
+    /** @param array<string, mixed> $data */
+    public function send(array $data): void;
+}
diff --git a/app/Domains/Receivables/Contracts/PaymentExchangeRateRecorder.php b/app/Domains/Receivables/Contracts/PaymentExchangeRateRecorder.php
new file mode 100644
index 00000000..b4053c70
--- /dev/null
+++ b/app/Domains/Receivables/Contracts/PaymentExchangeRateRecorder.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Receivables\Contracts;
+
+use App\Domains\Receivables\Models\Payment;
+
+interface PaymentExchangeRateRecorder
+{
+    public function record(Payment $payment): void;
+}
diff --git a/app/Domains/Receivables/Contracts/PaymentNumberAssigner.php b/app/Domains/Receivables/Contracts/PaymentNumberAssigner.php
new file mode 100644
index 00000000..2e846219
--- /dev/null
+++ b/app/Domains/Receivables/Contracts/PaymentNumberAssigner.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Domains\Receivables\Contracts;
+
+use App\Domains\Receivables\Data\PaymentNumberAssignment;
+use App\Domains\Receivables\Models\Payment;
+
+interface PaymentNumberAssigner
+{
+    public function next(
+        Payment $payment,
+        int $companyId,
+        int $customerId,
+        bool $generateNumber = false,
+    ): PaymentNumberAssignment;
+}
diff --git a/app/Domains/Receivables/Contracts/PaymentPdfDataProvider.php b/app/Domains/Receivables/Contracts/PaymentPdfDataProvider.php
new file mode 100644
index 00000000..3f5f6d4c
--- /dev/null
+++ b/app/Domains/Receivables/Contracts/PaymentPdfDataProvider.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Receivables\Contracts;
+
+use App\Domains\Receivables\Models\Payment;
+
+interface PaymentPdfDataProvider
+{
+    public function getPdfData(Payment $payment): mixed;
+}
diff --git a/app/Domains/Receivables/Data/PaymentNumberAssignment.php b/app/Domains/Receivables/Data/PaymentNumberAssignment.php
new file mode 100644
index 00000000..d00c9896
--- /dev/null
+++ b/app/Domains/Receivables/Data/PaymentNumberAssignment.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Domains\Receivables\Data;
+
+final readonly class PaymentNumberAssignment
+{
+    public function __construct(
+        public ?string $number,
+        public int $sequence,
+        public int $customerSequence,
+    ) {}
+}
diff --git a/app/Http/Controllers/Company/Payment/CreditAllocationsController.php b/app/Domains/Receivables/Http/Controllers/Company/CreditAllocationsController.php
similarity index 76%
rename from app/Http/Controllers/Company/Payment/CreditAllocationsController.php
rename to app/Domains/Receivables/Http/Controllers/Company/CreditAllocationsController.php
index f717741b..bf8fe99f 100644
--- a/app/Http/Controllers/Company/Payment/CreditAllocationsController.php
+++ b/app/Domains/Receivables/Http/Controllers/Company/CreditAllocationsController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Company\Payment;
+namespace App\Domains\Receivables\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\CreditAllocationRequest;
-use App\Models\Customer;
-use App\Models\Payment;
-use App\Services\Document\PaymentAllocationService;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Application\PaymentAllocationService;
+use App\Domains\Receivables\Http\Requests\CreditAllocationRequest;
+use App\Domains\Receivables\Models\Payment;
+use App\Platform\Http\Controller;
 
 class CreditAllocationsController extends Controller
 {
diff --git a/app/Http/Controllers/Company/Payment/PaymentMethodsController.php b/app/Domains/Receivables/Http/Controllers/Company/PaymentMethodsController.php
similarity index 86%
rename from app/Http/Controllers/Company/Payment/PaymentMethodsController.php
rename to app/Domains/Receivables/Http/Controllers/Company/PaymentMethodsController.php
index bd21d89f..1289dcd9 100644
--- a/app/Http/Controllers/Company/Payment/PaymentMethodsController.php
+++ b/app/Domains/Receivables/Http/Controllers/Company/PaymentMethodsController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Company\Payment;
+namespace App\Domains\Receivables\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\PaymentMethodRequest;
-use App\Http\Resources\PaymentMethodResource;
-use App\Models\PaymentMethod;
+use App\Domains\Receivables\Http\Requests\PaymentMethodRequest;
+use App\Domains\Receivables\Http\Resources\PaymentMethodResource;
+use App\Domains\Receivables\Models\PaymentMethod;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -41,7 +41,7 @@ class PaymentMethodsController extends Controller
     {
         $this->authorize('create', PaymentMethod::class);
 
-        $paymentMethod = PaymentMethod::createPaymentMethod($request);
+        $paymentMethod = PaymentMethod::create($request->getPaymentMethodPayload());
 
         return new PaymentMethodResource($paymentMethod);
     }
diff --git a/app/Http/Controllers/Company/Payment/PaymentsController.php b/app/Domains/Receivables/Http/Controllers/Company/PaymentsController.php
similarity index 71%
rename from app/Http/Controllers/Company/Payment/PaymentsController.php
rename to app/Domains/Receivables/Http/Controllers/Company/PaymentsController.php
index 2a1eb325..bec9d444 100644
--- a/app/Http/Controllers/Company/Payment/PaymentsController.php
+++ b/app/Domains/Receivables/Http/Controllers/Company/PaymentsController.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Http\Controllers\Company\Payment;
+namespace App\Domains\Receivables\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\DeletePaymentsRequest;
-use App\Http\Requests\PaymentRequest;
-use App\Http\Requests\ReplacePaymentAllocationsRequest;
-use App\Http\Requests\SendPaymentRequest;
-use App\Http\Resources\PaymentResource;
-use App\Models\Payment;
-use App\Services\Document\PaymentAllocationService;
-use App\Services\Document\PaymentService;
+use App\Domains\Receivables\Application\PaymentAllocationService;
+use App\Domains\Receivables\Application\PaymentService;
+use App\Domains\Receivables\Http\Requests\DeletePaymentsRequest;
+use App\Domains\Receivables\Http\Requests\PaymentRequest;
+use App\Domains\Receivables\Http\Requests\ReplacePaymentAllocationsRequest;
+use App\Domains\Receivables\Http\Requests\SendPaymentRequest;
+use App\Domains\Receivables\Http\Resources\PaymentResource;
+use App\Domains\Receivables\Models\Payment;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Mail\Markdown;
@@ -58,7 +58,11 @@ class PaymentsController extends Controller
     {
         $this->authorize('create', Payment::class);
 
-        $payment = $this->paymentService->create($request);
+        $payment = $this->paymentService->create(
+            attributes: $request->getPaymentPayload(),
+            allocations: $request->validated('allocations') ?? [],
+            customFields: $this->customFields($request),
+        );
 
         return new PaymentResource($payment);
     }
@@ -74,7 +78,13 @@ class PaymentsController extends Controller
     {
         $this->authorize('update', $payment);
 
-        $payment = $this->paymentService->update($payment, $request);
+        $payment = $this->paymentService->update(
+            payment: $payment,
+            attributes: $request->getPaymentPayload(),
+            replaceAllocations: $request->exists('allocations'),
+            allocations: $request->validated('allocations') ?? [],
+            customFields: $this->customFields($request),
+        );
 
         return new PaymentResource($payment);
     }
@@ -125,4 +135,11 @@ class PaymentsController extends Controller
 
         return $markdown->render('emails.send.payment', ['data' => $data]);
     }
+
+    private function customFields(PaymentRequest $request): ?iterable
+    {
+        $customFields = $request->input('customFields');
+
+        return is_iterable($customFields) ? $customFields : null;
+    }
 }
diff --git a/app/Http/Controllers/CustomerPortal/Payment/PaymentMethodController.php b/app/Domains/Receivables/Http/Controllers/CustomerPortal/PaymentMethodController.php
similarity index 58%
rename from app/Http/Controllers/CustomerPortal/Payment/PaymentMethodController.php
rename to app/Domains/Receivables/Http/Controllers/CustomerPortal/PaymentMethodController.php
index e1bc8675..b5348720 100644
--- a/app/Http/Controllers/CustomerPortal/Payment/PaymentMethodController.php
+++ b/app/Domains/Receivables/Http/Controllers/CustomerPortal/PaymentMethodController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal\Payment;
+namespace App\Domains\Receivables\Http\Controllers\CustomerPortal;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\Customer\PaymentMethodResource;
-use App\Models\Company;
-use App\Models\PaymentMethod;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Receivables\Http\Resources\CustomerPortal\PaymentMethodResource;
+use App\Domains\Receivables\Models\PaymentMethod;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
diff --git a/app/Http/Controllers/CustomerPortal/Payment/PaymentsController.php b/app/Domains/Receivables/Http/Controllers/CustomerPortal/PaymentsController.php
similarity index 85%
rename from app/Http/Controllers/CustomerPortal/Payment/PaymentsController.php
rename to app/Domains/Receivables/Http/Controllers/CustomerPortal/PaymentsController.php
index e9e19ae7..bf2afad8 100644
--- a/app/Http/Controllers/CustomerPortal/Payment/PaymentsController.php
+++ b/app/Domains/Receivables/Http/Controllers/CustomerPortal/PaymentsController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal\Payment;
+namespace App\Domains\Receivables\Http\Controllers\CustomerPortal;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\Customer\PaymentResource;
-use App\Models\Company;
-use App\Models\Payment;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Receivables\Http\Resources\CustomerPortal\PaymentResource;
+use App\Domains\Receivables\Models\Payment;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Domains/Receivables/Http/Controllers/PaymentPdfController.php b/app/Domains/Receivables/Http/Controllers/PaymentPdfController.php
new file mode 100644
index 00000000..2bfeedc3
--- /dev/null
+++ b/app/Domains/Receivables/Http/Controllers/PaymentPdfController.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Domains\Receivables\Http\Controllers;
+
+use App\Domains\Receivables\Contracts\PaymentPdfDataProvider;
+use App\Domains\Receivables\Models\Payment;
+use App\Platform\Http\Controller;
+use Illuminate\Http\Request;
+
+class PaymentPdfController extends Controller
+{
+    public function __construct(
+        private readonly PaymentPdfDataProvider $paymentPdfDataProvider,
+    ) {}
+
+    public function __invoke(Request $request, Payment $payment): mixed
+    {
+        if ($request->has('preview')) {
+            return $this->paymentPdfDataProvider->getPdfData($payment);
+        }
+
+        return $payment->getGeneratedPDFOrStream('payment');
+    }
+}
diff --git a/app/Http/Controllers/CustomerPortal/PaymentPdfController.php b/app/Domains/Receivables/Http/Controllers/PublicPaymentController.php
similarity index 68%
rename from app/Http/Controllers/CustomerPortal/PaymentPdfController.php
rename to app/Domains/Receivables/Http/Controllers/PublicPaymentController.php
index 44ab7d6e..83a7f59a 100644
--- a/app/Http/Controllers/CustomerPortal/PaymentPdfController.php
+++ b/app/Domains/Receivables/Http/Controllers/PublicPaymentController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal;
+namespace App\Domains\Receivables\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\PaymentResource;
-use App\Models\EmailLog;
-use App\Models\Payment;
+use App\Domains\Receivables\Http\Resources\PaymentResource;
+use App\Domains\Receivables\Models\Payment;
+use App\Platform\Http\Controller;
+use App\Platform\Mail\Models\EmailLog;
 use Illuminate\Http\Request;
 
-class PaymentPdfController extends Controller
+class PublicPaymentController extends Controller
 {
     public function getPdf(EmailLog $emailLog, Request $request)
     {
diff --git a/app/Http/Requests/CreditAllocationRequest.php b/app/Domains/Receivables/Http/Requests/CreditAllocationRequest.php
similarity index 93%
rename from app/Http/Requests/CreditAllocationRequest.php
rename to app/Domains/Receivables/Http/Requests/CreditAllocationRequest.php
index a1a20aa8..581989f6 100644
--- a/app/Http/Requests/CreditAllocationRequest.php
+++ b/app/Domains/Receivables/Http/Requests/CreditAllocationRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Receivables\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/DeletePaymentsRequest.php b/app/Domains/Receivables/Http/Requests/DeletePaymentsRequest.php
similarity index 92%
rename from app/Http/Requests/DeletePaymentsRequest.php
rename to app/Domains/Receivables/Http/Requests/DeletePaymentsRequest.php
index 50a53f93..d059d915 100644
--- a/app/Http/Requests/DeletePaymentsRequest.php
+++ b/app/Domains/Receivables/Http/Requests/DeletePaymentsRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Receivables\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/PaymentMethodRequest.php b/app/Domains/Receivables/Http/Requests/PaymentMethodRequest.php
similarity index 92%
rename from app/Http/Requests/PaymentMethodRequest.php
rename to app/Domains/Receivables/Http/Requests/PaymentMethodRequest.php
index 1e8f3888..8bd3bcf1 100644
--- a/app/Http/Requests/PaymentMethodRequest.php
+++ b/app/Domains/Receivables/Http/Requests/PaymentMethodRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Receivables\Http\Requests;
 
-use App\Models\PaymentMethod;
+use App\Domains\Receivables\Models\PaymentMethod;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Http/Requests/PaymentRequest.php b/app/Domains/Receivables/Http/Requests/PaymentRequest.php
similarity index 96%
rename from app/Http/Requests/PaymentRequest.php
rename to app/Domains/Receivables/Http/Requests/PaymentRequest.php
index 3080d504..9ba66f96 100644
--- a/app/Http/Requests/PaymentRequest.php
+++ b/app/Domains/Receivables/Http/Requests/PaymentRequest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Receivables\Http\Requests;
 
-use App\Models\CompanySetting;
-use App\Models\Customer;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Models\Customer;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\Validator;
diff --git a/app/Http/Requests/ReplacePaymentAllocationsRequest.php b/app/Domains/Receivables/Http/Requests/ReplacePaymentAllocationsRequest.php
similarity index 93%
rename from app/Http/Requests/ReplacePaymentAllocationsRequest.php
rename to app/Domains/Receivables/Http/Requests/ReplacePaymentAllocationsRequest.php
index 33fdd137..b8fc2c28 100644
--- a/app/Http/Requests/ReplacePaymentAllocationsRequest.php
+++ b/app/Domains/Receivables/Http/Requests/ReplacePaymentAllocationsRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Receivables\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/SendPaymentRequest.php b/app/Domains/Receivables/Http/Requests/SendPaymentRequest.php
similarity index 94%
rename from app/Http/Requests/SendPaymentRequest.php
rename to app/Domains/Receivables/Http/Requests/SendPaymentRequest.php
index 5864be71..9ab45bb1 100644
--- a/app/Http/Requests/SendPaymentRequest.php
+++ b/app/Domains/Receivables/Http/Requests/SendPaymentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Receivables\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Resources/Customer/PaymentMethodResource.php b/app/Domains/Receivables/Http/Resources/CustomerPortal/PaymentMethodResource.php
similarity index 81%
rename from app/Http/Resources/Customer/PaymentMethodResource.php
rename to app/Domains/Receivables/Http/Resources/CustomerPortal/PaymentMethodResource.php
index a555ed30..67d380af 100644
--- a/app/Http/Resources/Customer/PaymentMethodResource.php
+++ b/app/Domains/Receivables/Http/Resources/CustomerPortal/PaymentMethodResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Receivables\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\CompanyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/Customer/PaymentResource.php b/app/Domains/Receivables/Http/Resources/CustomerPortal/PaymentResource.php
similarity index 88%
rename from app/Http/Resources/Customer/PaymentResource.php
rename to app/Domains/Receivables/Http/Resources/CustomerPortal/PaymentResource.php
index b1ffbddc..558c678d 100644
--- a/app/Http/Resources/Customer/PaymentResource.php
+++ b/app/Domains/Receivables/Http/Resources/CustomerPortal/PaymentResource.php
@@ -1,7 +1,12 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Receivables\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\CompanyResource;
+use App\Domains\Contacts\Http\Resources\CustomerPortal\CustomerResource;
+use App\Domains\Metadata\Http\Resources\CustomerPortal\CustomFieldValueResource;
+use App\Domains\Money\Http\Resources\CustomerPortal\CurrencyResource;
+use App\Domains\Sales\Http\Resources\CustomerPortal\InvoiceResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/TransactionResource.php b/app/Domains/Receivables/Http/Resources/CustomerPortal/TransactionResource.php
similarity index 82%
rename from app/Http/Resources/TransactionResource.php
rename to app/Domains/Receivables/Http/Resources/CustomerPortal/TransactionResource.php
index bbd91ff7..8820495e 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Domains/Receivables/Http/Resources/CustomerPortal/TransactionResource.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Receivables\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\CompanyResource;
+use App\Domains\Sales\Http\Resources\CustomerPortal\InvoiceResource;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Http/Resources/PaymentMethodResource.php b/app/Domains/Receivables/Http/Resources/PaymentMethodResource.php
similarity index 85%
rename from app/Http/Resources/PaymentMethodResource.php
rename to app/Domains/Receivables/Http/Resources/PaymentMethodResource.php
index 4dbef81a..ca14f8e7 100644
--- a/app/Http/Resources/PaymentMethodResource.php
+++ b/app/Domains/Receivables/Http/Resources/PaymentMethodResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Receivables\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/PaymentResource.php b/app/Domains/Receivables/Http/Resources/PaymentResource.php
similarity index 90%
rename from app/Http/Resources/PaymentResource.php
rename to app/Domains/Receivables/Http/Resources/PaymentResource.php
index abf433d7..1787bf5a 100644
--- a/app/Http/Resources/PaymentResource.php
+++ b/app/Domains/Receivables/Http/Resources/PaymentResource.php
@@ -1,7 +1,12 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Receivables\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Contacts\Http\Resources\CustomerResource;
+use App\Domains\Metadata\Http\Resources\CustomFieldValueResource;
+use App\Domains\Money\Http\Resources\CurrencyResource;
+use App\Domains\Sales\Http\Resources\InvoiceResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/Customer/TransactionResource.php b/app/Domains/Receivables/Http/Resources/TransactionResource.php
similarity index 86%
rename from app/Http/Resources/Customer/TransactionResource.php
rename to app/Domains/Receivables/Http/Resources/TransactionResource.php
index b1ed7121..8f89ea1c 100644
--- a/app/Http/Resources/Customer/TransactionResource.php
+++ b/app/Domains/Receivables/Http/Resources/TransactionResource.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Receivables\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Sales\Http\Resources\InvoiceResource;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Jobs/GeneratePaymentPdfJob.php b/app/Domains/Receivables/Jobs/GeneratePaymentPdfJob.php
similarity index 95%
rename from app/Jobs/GeneratePaymentPdfJob.php
rename to app/Domains/Receivables/Jobs/GeneratePaymentPdfJob.php
index 93f02096..e991de48 100644
--- a/app/Jobs/GeneratePaymentPdfJob.php
+++ b/app/Domains/Receivables/Jobs/GeneratePaymentPdfJob.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Domains\Receivables\Jobs;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Mail/SendPaymentMail.php b/app/Domains/Receivables/Mail/SendPaymentMail.php
similarity index 74%
rename from app/Mail/SendPaymentMail.php
rename to app/Domains/Receivables/Mail/SendPaymentMail.php
index 6a1449a5..e5056dfb 100644
--- a/app/Mail/SendPaymentMail.php
+++ b/app/Domains/Receivables/Mail/SendPaymentMail.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace App\Mail;
+namespace App\Domains\Receivables\Mail;
 
-use App\Facades\Hashids;
-use App\Models\EmailLog;
-use App\Models\Payment;
+use App\Domains\Receivables\Models\Payment;
+use App\Platform\Mail\Contracts\EmailLogWriter;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
@@ -33,21 +32,17 @@ class SendPaymentMail extends Mailable
      */
     public function build()
     {
-        $log = EmailLog::create([
+        $payment = Payment::findOrFail($this->data['payment']['id']);
+        $token = app(EmailLogWriter::class)->record($payment, [
             'from' => $this->data['from'],
             'to' => $this->data['to'],
             'cc' => $this->data['cc'] ?? null,
             'bcc' => $this->data['bcc'] ?? null,
             'subject' => $this->data['subject'],
             'body' => $this->data['body'],
-            'mailable_type' => Payment::class,
-            'mailable_id' => $this->data['payment']['id'],
         ]);
 
-        $log->token = Hashids::connection(EmailLog::class)->encode($log->id);
-        $log->save();
-
-        $this->data['url'] = route('payment', ['email_log' => $log->token]);
+        $this->data['url'] = route('payment', ['email_log' => $token]);
 
         $mailContent = $this->from($this->data['from'], config('mail.from.name'))
             ->subject($this->data['subject'])
diff --git a/app/Models/Payment.php b/app/Domains/Receivables/Models/Payment.php
similarity index 90%
rename from app/Models/Payment.php
rename to app/Domains/Receivables/Models/Payment.php
index 5e367718..fe0e2ca4 100644
--- a/app/Models/Payment.php
+++ b/app/Domains/Receivables/Models/Payment.php
@@ -1,13 +1,20 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Receivables\Models;
 
-use App\Jobs\GeneratePaymentPdfJob;
-use App\Services\Document\PaymentService;
-use App\Support\Pdf\PdfHtmlSanitizer;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Concerns\HasCustomFields;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Receivables\Contracts\PaymentPdfDataProvider;
+use App\Domains\Receivables\Jobs\GeneratePaymentPdfJob;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Mail\Models\EmailLog;
+use App\Platform\Pdf\Concerns\GeneratesPdf;
+use App\Platform\Pdf\Rendering\PdfHtmlSanitizer;
 use App\Support\SafeOrderBy;
-use App\Traits\GeneratesPdfTrait;
-use App\Traits\HasCustomFieldsTrait;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -21,8 +28,10 @@ use Spatie\MediaLibrary\InteractsWithMedia;
 
 class Payment extends Model implements HasMedia
 {
-    use GeneratesPdfTrait;
-    use HasCustomFieldsTrait;
+    protected $table = 'payments';
+
+    use GeneratesPdf;
+    use HasCustomFields;
     use HasFactory;
     use InteractsWithMedia;
 
@@ -88,7 +97,7 @@ class Payment extends Model implements HasMedia
 
     public function emailLogs(): MorphMany
     {
-        return $this->morphMany('App\Models\EmailLog', 'mailable');
+        return $this->morphMany(EmailLog::class, 'mailable');
     }
 
     public function customer(): BelongsTo
@@ -225,7 +234,7 @@ class Payment extends Model implements HasMedia
 
     public function getPDFData(): mixed
     {
-        return app(PaymentService::class)->getPdfData($this);
+        return app(PaymentPdfDataProvider::class)->getPdfData($this);
     }
 
     public function getCompanyAddress(): string|false
diff --git a/app/Models/PaymentAllocation.php b/app/Domains/Receivables/Models/PaymentAllocation.php
similarity index 82%
rename from app/Models/PaymentAllocation.php
rename to app/Domains/Receivables/Models/PaymentAllocation.php
index b4d7d7f6..8419b3e7 100644
--- a/app/Models/PaymentAllocation.php
+++ b/app/Domains/Receivables/Models/PaymentAllocation.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Receivables\Models;
 
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class PaymentAllocation extends Model
 {
+    protected $table = 'payment_allocations';
+
     use HasFactory;
 
     protected $guarded = ['id'];
diff --git a/app/Models/PaymentMethod.php b/app/Domains/Receivables/Models/PaymentMethod.php
similarity index 88%
rename from app/Models/PaymentMethod.php
rename to app/Domains/Receivables/Models/PaymentMethod.php
index ebceb50c..79522ebd 100644
--- a/app/Models/PaymentMethod.php
+++ b/app/Domains/Receivables/Models/PaymentMethod.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Receivables\Models;
 
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Purchases\Models\Expense;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -9,6 +11,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class PaymentMethod extends Model
 {
+    protected $table = 'payment_methods';
+
     use HasFactory;
 
     protected $guarded = [
@@ -93,18 +97,6 @@ class PaymentMethod extends Model
         return $query->paginate($limit);
     }
 
-    /**
-     * Create a new payment method from a validated form request.
-     */
-    public static function createPaymentMethod(mixed $request): self
-    {
-        $data = $request->getPaymentMethodPayload();
-
-        $paymentMethod = self::create($data);
-
-        return $paymentMethod;
-    }
-
     /**
      * Retrieve the settings array for a payment method by its ID.
      */
diff --git a/app/Models/Transaction.php b/app/Domains/Receivables/Models/Transaction.php
similarity index 87%
rename from app/Models/Transaction.php
rename to app/Domains/Receivables/Models/Transaction.php
index 0ddccdcf..b9c8a0fe 100644
--- a/app/Models/Transaction.php
+++ b/app/Domains/Receivables/Models/Transaction.php
@@ -1,7 +1,10 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Receivables\Models;
 
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Sales\Models\Invoice;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -10,6 +13,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Transaction extends Model
 {
+    protected $table = 'transactions';
+
     use HasFactory;
 
     protected $guarded = [
diff --git a/app/Policies/PaymentMethodPolicy.php b/app/Domains/Receivables/Policies/PaymentMethodPolicy.php
similarity index 93%
rename from app/Policies/PaymentMethodPolicy.php
rename to app/Domains/Receivables/Policies/PaymentMethodPolicy.php
index 87ba8623..a1b24a6e 100644
--- a/app/Policies/PaymentMethodPolicy.php
+++ b/app/Domains/Receivables/Policies/PaymentMethodPolicy.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Receivables\Policies;
 
-use App\Models\Payment;
-use App\Models\PaymentMethod;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentMethod;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Policies/PaymentPolicy.php b/app/Domains/Receivables/Policies/PaymentPolicy.php
similarity index 96%
rename from app/Policies/PaymentPolicy.php
rename to app/Domains/Receivables/Policies/PaymentPolicy.php
index 8ca7dfda..c5f6ecfe 100644
--- a/app/Policies/PaymentPolicy.php
+++ b/app/Domains/Receivables/Policies/PaymentPolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Receivables\Policies;
 
-use App\Models\Payment;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Receivables\Models\Payment;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Domains/Receivables/ReceivablesServiceProvider.php b/app/Domains/Receivables/ReceivablesServiceProvider.php
new file mode 100644
index 00000000..3dfd9082
--- /dev/null
+++ b/app/Domains/Receivables/ReceivablesServiceProvider.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Domains\Receivables;
+
+use App\Adapters\Receivables\LaravelPaymentEmailSender;
+use App\Adapters\Receivables\MoneyPaymentExchangeRateRecorder;
+use App\Adapters\Receivables\SalesInvoiceBalanceUpdater;
+use App\Adapters\Receivables\SalesPaymentNumberAssigner;
+use App\Domains\Receivables\Application\PaymentService;
+use App\Domains\Receivables\Contracts\InvoiceBalanceUpdater;
+use App\Domains\Receivables\Contracts\PaymentEmailSender;
+use App\Domains\Receivables\Contracts\PaymentExchangeRateRecorder;
+use App\Domains\Receivables\Contracts\PaymentNumberAssigner;
+use App\Domains\Receivables\Contracts\PaymentPdfDataProvider;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentMethod;
+use App\Domains\Receivables\Policies\PaymentMethodPolicy;
+use App\Domains\Receivables\Policies\PaymentPolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+
+class ReceivablesServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->bind(PaymentPdfDataProvider::class, PaymentService::class);
+        $this->app->bind(InvoiceBalanceUpdater::class, SalesInvoiceBalanceUpdater::class);
+        $this->app->bind(PaymentNumberAssigner::class, SalesPaymentNumberAssigner::class);
+        $this->app->bind(PaymentExchangeRateRecorder::class, MoneyPaymentExchangeRateRecorder::class);
+        $this->app->bind(PaymentEmailSender::class, LaravelPaymentEmailSender::class);
+    }
+
+    public function boot(): void
+    {
+        Gate::policy(Payment::class, PaymentPolicy::class);
+        Gate::policy(PaymentMethod::class, PaymentMethodPolicy::class);
+        Gate::define('send payment', [PaymentPolicy::class, 'send']);
+        Gate::define('delete multiple payments', [PaymentPolicy::class, 'deleteMultiple']);
+    }
+}
diff --git a/app/Domains/Receivables/routes/company.php b/app/Domains/Receivables/routes/company.php
new file mode 100644
index 00000000..363879b5
--- /dev/null
+++ b/app/Domains/Receivables/routes/company.php
@@ -0,0 +1,14 @@
+<?php
+
+use App\Domains\Receivables\Http\Controllers\Company\CreditAllocationsController;
+use App\Domains\Receivables\Http\Controllers\Company\PaymentMethodsController;
+use App\Domains\Receivables\Http\Controllers\Company\PaymentsController;
+use Illuminate\Support\Facades\Route;
+
+Route::post('customers/{customer}/credit-allocations', [CreditAllocationsController::class, 'store']);
+Route::get('/payments/{payment}/send/preview', [PaymentsController::class, 'sendPreview']);
+Route::post('/payments/{payment}/send', [PaymentsController::class, 'send']);
+Route::put('/payments/{payment}/allocations', [PaymentsController::class, 'replaceAllocations']);
+Route::post('/payments/delete', [PaymentsController::class, 'delete']);
+Route::apiResource('payments', PaymentsController::class);
+Route::apiResource('payment-methods', PaymentMethodsController::class);
diff --git a/app/Domains/Receivables/routes/customer.php b/app/Domains/Receivables/routes/customer.php
new file mode 100644
index 00000000..4b518a62
--- /dev/null
+++ b/app/Domains/Receivables/routes/customer.php
@@ -0,0 +1,9 @@
+<?php
+
+use App\Domains\Receivables\Http\Controllers\CustomerPortal\PaymentMethodController;
+use App\Domains\Receivables\Http\Controllers\CustomerPortal\PaymentsController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('payments', [PaymentsController::class, 'index']);
+Route::get('payments/{id}', [PaymentsController::class, 'show']);
+Route::get('/payment-method', PaymentMethodController::class);
diff --git a/app/Domains/Receivables/routes/pdf.php b/app/Domains/Receivables/routes/pdf.php
new file mode 100644
index 00000000..1fc2bb29
--- /dev/null
+++ b/app/Domains/Receivables/routes/pdf.php
@@ -0,0 +1,6 @@
+<?php
+
+use App\Domains\Receivables\Http\Controllers\PaymentPdfController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/payments/pdf/{payment:unique_hash}', PaymentPdfController::class);
diff --git a/app/Domains/Receivables/routes/public.php b/app/Domains/Receivables/routes/public.php
new file mode 100644
index 00000000..d8a1b856
--- /dev/null
+++ b/app/Domains/Receivables/routes/public.php
@@ -0,0 +1,7 @@
+<?php
+
+use App\Domains\Receivables\Http\Controllers\PublicPaymentController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/payments/{email_log:token}', [PublicPaymentController::class, 'getPayment']);
+Route::get('/payments/view/{email_log:token}', [PublicPaymentController::class, 'getPdf'])->name('payment');
diff --git a/app/Http/Controllers/Company/Customer/CustomerStatementController.php b/app/Domains/Reporting/Http/Controllers/Company/CustomerStatementController.php
similarity index 58%
rename from app/Http/Controllers/Company/Customer/CustomerStatementController.php
rename to app/Domains/Reporting/Http/Controllers/Company/CustomerStatementController.php
index 6dd011d2..c3d8760f 100644
--- a/app/Http/Controllers/Company/Customer/CustomerStatementController.php
+++ b/app/Domains/Reporting/Http/Controllers/Company/CustomerStatementController.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Http\Controllers\Company\Customer;
+namespace App\Domains\Reporting\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\CustomerStatementRequest;
-use App\Http\Resources\CustomerStatementResource;
-use App\Models\Customer;
-use App\Services\CustomerStatementService;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Reporting\Http\Requests\CustomerStatementRequest;
+use App\Domains\Reporting\Http\Resources\CustomerStatementResource;
+use App\Domains\Reporting\Queries\CustomerStatementQuery;
+use App\Platform\Http\Controller;
 use Carbon\Carbon;
 
 class CustomerStatementController extends Controller
 {
     public function __construct(
-        private readonly CustomerStatementService $customerStatementService,
+        private readonly CustomerStatementQuery $customerStatementQuery,
     ) {}
 
     public function __invoke(CustomerStatementRequest $request, Customer $customer): CustomerStatementResource
@@ -22,11 +22,11 @@ class CustomerStatementController extends Controller
 
         $type = $request->validated('type');
 
-        $statement = $this->customerStatementService->statement(
+        $statement = $this->customerStatementQuery->statement(
             $customer,
             $type,
             Carbon::createFromFormat('Y-m-d', $request->validated('from_date')),
-            Carbon::createFromFormat('Y-m-d', $request->validated($type === CustomerStatementService::TYPE_OUTSTANDING ? 'as_of' : 'to_date')),
+            Carbon::createFromFormat('Y-m-d', $request->validated($type === CustomerStatementQuery::TYPE_OUTSTANDING ? 'as_of' : 'to_date')),
             (int) $request->validated('per_page', 50),
             (int) $request->validated('page', 1),
         );
diff --git a/app/Http/Controllers/Company/Dashboard/DashboardController.php b/app/Domains/Reporting/Http/Controllers/Company/DashboardController.php
similarity index 93%
rename from app/Http/Controllers/Company/Dashboard/DashboardController.php
rename to app/Domains/Reporting/Http/Controllers/Company/DashboardController.php
index 8e7ad2f5..0eea67dd 100644
--- a/app/Http/Controllers/Company/Dashboard/DashboardController.php
+++ b/app/Domains/Reporting/Http/Controllers/Company/DashboardController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Http\Controllers\Company\Dashboard;
+namespace App\Domains\Reporting\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Customer;
-use App\Models\Estimate;
-use App\Models\Expense;
-use App\Models\Invoice;
-use App\Models\Payment;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Http\Controller;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Company/General/SearchController.php b/app/Domains/Reporting/Http/Controllers/Company/SearchController.php
similarity index 85%
rename from app/Http/Controllers/Company/General/SearchController.php
rename to app/Domains/Reporting/Http/Controllers/Company/SearchController.php
index 20b8db17..a78311b7 100644
--- a/app/Http/Controllers/Company/General/SearchController.php
+++ b/app/Domains/Reporting/Http/Controllers/Company/SearchController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Company\General;
+namespace App\Domains\Reporting\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Models\Customer;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
diff --git a/app/Http/Controllers/Company/Customer/SendCustomerStatementController.php b/app/Domains/Reporting/Http/Controllers/Company/SendCustomerStatementController.php
similarity index 59%
rename from app/Http/Controllers/Company/Customer/SendCustomerStatementController.php
rename to app/Domains/Reporting/Http/Controllers/Company/SendCustomerStatementController.php
index 4bf7b434..937c98cd 100644
--- a/app/Http/Controllers/Company/Customer/SendCustomerStatementController.php
+++ b/app/Domains/Reporting/Http/Controllers/Company/SendCustomerStatementController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Company\Customer;
+namespace App\Domains\Reporting\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\SendCustomerStatementRequest;
-use App\Mail\SendCustomerStatementMail;
-use App\Models\Customer;
-use App\Services\CustomerStatementPdfService;
-use App\Services\CustomerStatementService;
-use App\Services\Mail\CompanyMailConfigService;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Reporting\Http\Requests\SendCustomerStatementRequest;
+use App\Domains\Reporting\Mail\SendCustomerStatementMail;
+use App\Domains\Reporting\Queries\CustomerStatementQuery;
+use App\Domains\Reporting\Rendering\CustomerStatementPdfRenderer;
+use App\Platform\Http\Controller;
+use App\Platform\Mail\Contracts\MailConfigurator;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Mail;
@@ -16,8 +16,9 @@ use Illuminate\Support\Facades\Mail;
 class SendCustomerStatementController extends Controller
 {
     public function __construct(
-        private readonly CustomerStatementService $customerStatementService,
-        private readonly CustomerStatementPdfService $customerStatementPdfService,
+        private readonly CustomerStatementQuery $customerStatementQuery,
+        private readonly CustomerStatementPdfRenderer $customerStatementPdfRenderer,
+        private readonly MailConfigurator $mailConfigurator,
     ) {}
 
     public function __invoke(SendCustomerStatementRequest $request, Customer $customer): JsonResponse
@@ -27,16 +28,16 @@ class SendCustomerStatementController extends Controller
 
         $type = $request->validated('type');
 
-        $statement = $this->customerStatementService->statement(
+        $statement = $this->customerStatementQuery->statement(
             $customer,
             $type,
             Carbon::createFromFormat('Y-m-d', $request->validated('from_date')),
-            Carbon::createFromFormat('Y-m-d', $request->validated($type === CustomerStatementService::TYPE_OUTSTANDING ? 'as_of' : 'to_date')),
+            Carbon::createFromFormat('Y-m-d', $request->validated($type === CustomerStatementQuery::TYPE_OUTSTANDING ? 'as_of' : 'to_date')),
             PHP_INT_MAX,
         );
-        $pdf = $this->customerStatementPdfService->render($statement);
+        $pdf = $this->customerStatementPdfRenderer->render($statement);
 
-        CompanyMailConfigService::apply($customer->company_id);
+        $this->mailConfigurator->applyCompanyConfig($customer->company_id);
 
         $mail = Mail::to($request->validated('to'));
         if ($request->filled('cc')) {
diff --git a/app/Http/Controllers/Company/Report/CustomerSalesReportController.php b/app/Domains/Reporting/Http/Controllers/CustomerSalesReportController.php
similarity index 89%
rename from app/Http/Controllers/Company/Report/CustomerSalesReportController.php
rename to app/Domains/Reporting/Http/Controllers/CustomerSalesReportController.php
index b67e8222..66d672d8 100644
--- a/app/Http/Controllers/Company/Report/CustomerSalesReportController.php
+++ b/app/Domains/Reporting/Http/Controllers/CustomerSalesReportController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Http\Controllers\Company\Report;
+namespace App\Domains\Reporting\Http\Controllers;
 
-use App\Facades\Pdf;
-use App\Http\Controllers\Controller;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Currency;
-use App\Models\Customer;
-use App\Support\Pdf\PdfPageSetup;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Money\Models\Currency;
+use App\Platform\Http\Controller;
+use App\Platform\Pdf\Facades\Pdf;
+use App\Platform\Pdf\Rendering\PdfPageSetup;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Company/Report/CustomerStatementReportController.php b/app/Domains/Reporting/Http/Controllers/CustomerStatementReportController.php
similarity index 64%
rename from app/Http/Controllers/Company/Report/CustomerStatementReportController.php
rename to app/Domains/Reporting/Http/Controllers/CustomerStatementReportController.php
index 1d45dc52..57be34d1 100644
--- a/app/Http/Controllers/Company/Report/CustomerStatementReportController.php
+++ b/app/Domains/Reporting/Http/Controllers/CustomerStatementReportController.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Http\Controllers\Company\Report;
+namespace App\Domains\Reporting\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\CustomerStatementRequest;
-use App\Models\Customer;
-use App\Services\CustomerStatementPdfService;
-use App\Services\CustomerStatementService;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Reporting\Http\Requests\CustomerStatementRequest;
+use App\Domains\Reporting\Queries\CustomerStatementQuery;
+use App\Domains\Reporting\Rendering\CustomerStatementPdfRenderer;
+use App\Platform\Http\Controller;
 use Carbon\Carbon;
 use Silber\Bouncer\BouncerFacade;
 
 class CustomerStatementReportController extends Controller
 {
     public function __construct(
-        private readonly CustomerStatementService $customerStatementService,
-        private readonly CustomerStatementPdfService $customerStatementPdfService,
+        private readonly CustomerStatementQuery $customerStatementQuery,
+        private readonly CustomerStatementPdfRenderer $customerStatementPdfRenderer,
     ) {}
 
     public function __invoke(CustomerStatementRequest $request, Customer $customer)
@@ -26,14 +26,14 @@ class CustomerStatementReportController extends Controller
 
         $type = $request->validated('type');
 
-        $statement = $this->customerStatementService->statement(
+        $statement = $this->customerStatementQuery->statement(
             $customer,
             $type,
             Carbon::createFromFormat('Y-m-d', $request->validated('from_date')),
-            Carbon::createFromFormat('Y-m-d', $request->validated($type === CustomerStatementService::TYPE_OUTSTANDING ? 'as_of' : 'to_date')),
+            Carbon::createFromFormat('Y-m-d', $request->validated($type === CustomerStatementQuery::TYPE_OUTSTANDING ? 'as_of' : 'to_date')),
             PHP_INT_MAX,
         );
-        $pdf = $this->customerStatementPdfService->render($statement);
+        $pdf = $this->customerStatementPdfRenderer->render($statement);
 
         if ($request->boolean('preview')) {
             return view('app.pdf.reports.customer-statement', [
diff --git a/app/Http/Controllers/Company/Report/ExpensesReportController.php b/app/Domains/Reporting/Http/Controllers/ExpensesReportController.php
similarity index 89%
rename from app/Http/Controllers/Company/Report/ExpensesReportController.php
rename to app/Domains/Reporting/Http/Controllers/ExpensesReportController.php
index 6b07367a..242c7551 100644
--- a/app/Http/Controllers/Company/Report/ExpensesReportController.php
+++ b/app/Domains/Reporting/Http/Controllers/ExpensesReportController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Http\Controllers\Company\Report;
+namespace App\Domains\Reporting\Http\Controllers;
 
-use App\Facades\Pdf;
-use App\Http\Controllers\Controller;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Currency;
-use App\Models\Expense;
-use App\Support\Pdf\PdfPageSetup;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Purchases\Models\Expense;
+use App\Platform\Http\Controller;
+use App\Platform\Pdf\Facades\Pdf;
+use App\Platform\Pdf\Rendering\PdfPageSetup;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Carbon\Carbon;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Company/Report/ItemSalesReportController.php b/app/Domains/Reporting/Http/Controllers/ItemSalesReportController.php
similarity index 87%
rename from app/Http/Controllers/Company/Report/ItemSalesReportController.php
rename to app/Domains/Reporting/Http/Controllers/ItemSalesReportController.php
index d01f941c..1cc9f9c2 100644
--- a/app/Http/Controllers/Company/Report/ItemSalesReportController.php
+++ b/app/Domains/Reporting/Http/Controllers/ItemSalesReportController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Http\Controllers\Company\Report;
+namespace App\Domains\Reporting\Http\Controllers;
 
-use App\Facades\Pdf;
-use App\Http\Controllers\Controller;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Currency;
-use App\Models\InvoiceItem;
-use App\Support\Pdf\PdfPageSetup;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Platform\Http\Controller;
+use App\Platform\Pdf\Facades\Pdf;
+use App\Platform\Pdf\Rendering\PdfPageSetup;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Company/Report/ProfitLossReportController.php b/app/Domains/Reporting/Http/Controllers/ProfitLossReportController.php
similarity index 87%
rename from app/Http/Controllers/Company/Report/ProfitLossReportController.php
rename to app/Domains/Reporting/Http/Controllers/ProfitLossReportController.php
index d13cff00..98859f97 100644
--- a/app/Http/Controllers/Company/Report/ProfitLossReportController.php
+++ b/app/Domains/Reporting/Http/Controllers/ProfitLossReportController.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Http\Controllers\Company\Report;
+namespace App\Domains\Reporting\Http\Controllers;
 
-use App\Facades\Pdf;
-use App\Http\Controllers\Controller;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Currency;
-use App\Models\Expense;
-use App\Models\Payment;
-use App\Support\Pdf\PdfPageSetup;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Receivables\Models\Payment;
+use App\Platform\Http\Controller;
+use App\Platform\Pdf\Facades\Pdf;
+use App\Platform\Pdf\Rendering\PdfPageSetup;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Company/Report/TaxSummaryReportController.php b/app/Domains/Reporting/Http/Controllers/TaxSummaryReportController.php
similarity index 89%
rename from app/Http/Controllers/Company/Report/TaxSummaryReportController.php
rename to app/Domains/Reporting/Http/Controllers/TaxSummaryReportController.php
index 0b565710..2cc54071 100644
--- a/app/Http/Controllers/Company/Report/TaxSummaryReportController.php
+++ b/app/Domains/Reporting/Http/Controllers/TaxSummaryReportController.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Http\Controllers\Company\Report;
+namespace App\Domains\Reporting\Http\Controllers;
 
-use App\Facades\Pdf;
-use App\Http\Controllers\Controller;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Currency;
-use App\Models\Tax;
-use App\Support\Pdf\PdfPageSetup;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Taxation\Models\Tax;
+use App\Platform\Http\Controller;
+use App\Platform\Pdf\Facades\Pdf;
+use App\Platform\Pdf\Rendering\PdfPageSetup;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Requests/CustomerStatementRequest.php b/app/Domains/Reporting/Http/Requests/CustomerStatementRequest.php
similarity index 81%
rename from app/Http/Requests/CustomerStatementRequest.php
rename to app/Domains/Reporting/Http/Requests/CustomerStatementRequest.php
index 2c009a6a..aa6dcc31 100644
--- a/app/Http/Requests/CustomerStatementRequest.php
+++ b/app/Domains/Reporting/Http/Requests/CustomerStatementRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Reporting\Http\Requests;
 
-use App\Services\CustomerStatementService;
+use App\Domains\Reporting\Queries\CustomerStatementQuery;
 use Carbon\Carbon;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
@@ -25,7 +25,7 @@ class CustomerStatementRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'type' => ['required', Rule::in([CustomerStatementService::TYPE_ACTIVITY, CustomerStatementService::TYPE_OUTSTANDING])],
+            'type' => ['required', Rule::in([CustomerStatementQuery::TYPE_ACTIVITY, CustomerStatementQuery::TYPE_OUTSTANDING])],
             'from_date' => ['nullable', 'date_format:Y-m-d', 'required_if:type,activity'],
             'to_date' => ['nullable', 'date_format:Y-m-d', 'required_if:type,activity', 'after_or_equal:from_date'],
             'as_of' => ['nullable', 'date_format:Y-m-d', 'required_if:type,outstanding'],
@@ -36,7 +36,7 @@ class CustomerStatementRequest extends FormRequest
 
     protected function prepareForValidation(): void
     {
-        $type = $this->input('type', CustomerStatementService::TYPE_ACTIVITY);
+        $type = $this->input('type', CustomerStatementQuery::TYPE_ACTIVITY);
         $today = Carbon::today();
 
         $this->merge([
diff --git a/app/Http/Requests/SendCustomerStatementRequest.php b/app/Domains/Reporting/Http/Requests/SendCustomerStatementRequest.php
similarity index 82%
rename from app/Http/Requests/SendCustomerStatementRequest.php
rename to app/Domains/Reporting/Http/Requests/SendCustomerStatementRequest.php
index 42fc82fa..cdcc4ee4 100644
--- a/app/Http/Requests/SendCustomerStatementRequest.php
+++ b/app/Domains/Reporting/Http/Requests/SendCustomerStatementRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Reporting\Http\Requests;
 
-use App\Services\CustomerStatementService;
+use App\Domains\Reporting\Queries\CustomerStatementQuery;
 use Carbon\Carbon;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
@@ -25,7 +25,7 @@ class SendCustomerStatementRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'type' => ['required', Rule::in([CustomerStatementService::TYPE_ACTIVITY, CustomerStatementService::TYPE_OUTSTANDING])],
+            'type' => ['required', Rule::in([CustomerStatementQuery::TYPE_ACTIVITY, CustomerStatementQuery::TYPE_OUTSTANDING])],
             'from_date' => ['nullable', 'date_format:Y-m-d', 'required_if:type,activity'],
             'to_date' => ['nullable', 'date_format:Y-m-d', 'required_if:type,activity', 'after_or_equal:from_date'],
             'as_of' => ['nullable', 'date_format:Y-m-d', 'required_if:type,outstanding'],
@@ -39,7 +39,7 @@ class SendCustomerStatementRequest extends FormRequest
 
     protected function prepareForValidation(): void
     {
-        $type = $this->input('type', CustomerStatementService::TYPE_ACTIVITY);
+        $type = $this->input('type', CustomerStatementQuery::TYPE_ACTIVITY);
         $today = Carbon::today();
 
         $this->merge([
diff --git a/app/Http/Resources/CustomerStatementResource.php b/app/Domains/Reporting/Http/Resources/CustomerStatementResource.php
similarity index 96%
rename from app/Http/Resources/CustomerStatementResource.php
rename to app/Domains/Reporting/Http/Resources/CustomerStatementResource.php
index f4dc6850..b69a8ecd 100644
--- a/app/Http/Resources/CustomerStatementResource.php
+++ b/app/Domains/Reporting/Http/Resources/CustomerStatementResource.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Reporting\Http\Resources;
 
+use App\Domains\Contacts\Http\Resources\CustomerResource;
+use App\Domains\Money\Http\Resources\CurrencyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Pagination\LengthAwarePaginator;
diff --git a/app/Mail/SendCustomerStatementMail.php b/app/Domains/Reporting/Mail/SendCustomerStatementMail.php
similarity index 86%
rename from app/Mail/SendCustomerStatementMail.php
rename to app/Domains/Reporting/Mail/SendCustomerStatementMail.php
index 73d797f6..e1163750 100644
--- a/app/Mail/SendCustomerStatementMail.php
+++ b/app/Domains/Reporting/Mail/SendCustomerStatementMail.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Mail;
+namespace App\Domains\Reporting\Mail;
 
-use App\Models\EmailLog;
+use App\Platform\Mail\Models\EmailLog;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
@@ -27,7 +27,7 @@ class SendCustomerStatementMail extends Mailable
             'bcc' => $this->data['bcc'] ?? null,
             'subject' => $this->data['subject'],
             'body' => $this->data['body'],
-            'mailable_type' => $this->data['customer']::class,
+            'mailable_type' => $this->data['customer']->getMorphClass(),
             'mailable_id' => $this->data['customer']->id,
         ]);
 
diff --git a/app/Policies/DashboardPolicy.php b/app/Domains/Reporting/Policies/DashboardPolicy.php
similarity index 74%
rename from app/Policies/DashboardPolicy.php
rename to app/Domains/Reporting/Policies/DashboardPolicy.php
index 94f16b71..b5408f91 100644
--- a/app/Policies/DashboardPolicy.php
+++ b/app/Domains/Reporting/Policies/DashboardPolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Reporting\Policies;
 
-use App\Models\Company;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Policies/ReportPolicy.php b/app/Domains/Reporting/Policies/ReportPolicy.php
similarity index 75%
rename from app/Policies/ReportPolicy.php
rename to app/Domains/Reporting/Policies/ReportPolicy.php
index 92642e6f..16e264e4 100644
--- a/app/Policies/ReportPolicy.php
+++ b/app/Domains/Reporting/Policies/ReportPolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Reporting\Policies;
 
-use App\Models\Company;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Services/CustomerStatementService.php b/app/Domains/Reporting/Queries/CustomerStatementQuery.php
similarity index 98%
rename from app/Services/CustomerStatementService.php
rename to app/Domains/Reporting/Queries/CustomerStatementQuery.php
index 2fa0074d..bb5c282f 100644
--- a/app/Services/CustomerStatementService.php
+++ b/app/Domains/Reporting/Queries/CustomerStatementQuery.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Services;
+namespace App\Domains\Reporting\Queries;
 
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Models\Invoice;
 use Carbon\Carbon;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 
-class CustomerStatementService
+class CustomerStatementQuery
 {
     public const TYPE_ACTIVITY = 'activity';
 
diff --git a/app/Services/CustomerStatementPdfService.php b/app/Domains/Reporting/Rendering/CustomerStatementPdfRenderer.php
similarity index 74%
rename from app/Services/CustomerStatementPdfService.php
rename to app/Domains/Reporting/Rendering/CustomerStatementPdfRenderer.php
index b1dadad5..edcae5bd 100644
--- a/app/Services/CustomerStatementPdfService.php
+++ b/app/Domains/Reporting/Rendering/CustomerStatementPdfRenderer.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Services;
+namespace App\Domains\Reporting\Rendering;
 
-use App\Facades\Pdf;
-use App\Models\CompanySetting;
-use App\Support\Pdf\PdfPageSetup;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Platform\Pdf\Facades\Pdf;
+use App\Platform\Pdf\Rendering\PdfPageSetup;
 use Illuminate\Support\Facades\App;
 
-class CustomerStatementPdfService
+class CustomerStatementPdfRenderer
 {
     public function render(array $statement)
     {
diff --git a/app/Domains/Reporting/ReportingServiceProvider.php b/app/Domains/Reporting/ReportingServiceProvider.php
new file mode 100644
index 00000000..98ff00a2
--- /dev/null
+++ b/app/Domains/Reporting/ReportingServiceProvider.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Domains\Reporting;
+
+use App\Domains\Reporting\Policies\DashboardPolicy;
+use App\Domains\Reporting\Policies\ReportPolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+
+class ReportingServiceProvider extends ServiceProvider
+{
+    public function boot(): void
+    {
+        Gate::define('view dashboard', [DashboardPolicy::class, 'view']);
+        Gate::define('view report', [ReportPolicy::class, 'viewReport']);
+    }
+}
diff --git a/app/Domains/Reporting/routes/company.php b/app/Domains/Reporting/routes/company.php
new file mode 100644
index 00000000..c79742d0
--- /dev/null
+++ b/app/Domains/Reporting/routes/company.php
@@ -0,0 +1,13 @@
+<?php
+
+use App\Domains\Reporting\Http\Controllers\Company\CustomerStatementController;
+use App\Domains\Reporting\Http\Controllers\Company\DashboardController;
+use App\Domains\Reporting\Http\Controllers\Company\SearchController;
+use App\Domains\Reporting\Http\Controllers\Company\SendCustomerStatementController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/dashboard', DashboardController::class);
+Route::get('/search', SearchController::class);
+Route::get('/search/user', [SearchController::class, 'users']);
+Route::get('customers/{customer}/statement', CustomerStatementController::class);
+Route::post('customers/{customer}/statement/send', SendCustomerStatementController::class);
diff --git a/app/Domains/Reporting/routes/web.php b/app/Domains/Reporting/routes/web.php
new file mode 100644
index 00000000..e87b51b1
--- /dev/null
+++ b/app/Domains/Reporting/routes/web.php
@@ -0,0 +1,16 @@
+<?php
+
+use App\Domains\Reporting\Http\Controllers\CustomerSalesReportController;
+use App\Domains\Reporting\Http\Controllers\CustomerStatementReportController;
+use App\Domains\Reporting\Http\Controllers\ExpensesReportController;
+use App\Domains\Reporting\Http\Controllers\ItemSalesReportController;
+use App\Domains\Reporting\Http\Controllers\ProfitLossReportController;
+use App\Domains\Reporting\Http\Controllers\TaxSummaryReportController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/customers/{customer}/statement', CustomerStatementReportController::class);
+Route::get('/sales/customers/{hash}', CustomerSalesReportController::class);
+Route::get('/sales/items/{hash}', ItemSalesReportController::class);
+Route::get('/expenses/{hash}', ExpensesReportController::class);
+Route::get('/tax-summary/{hash}', TaxSummaryReportController::class);
+Route::get('/profit-loss/{hash}', ProfitLossReportController::class);
diff --git a/app/Services/Document/CreditNoteService.php b/app/Domains/Sales/Application/CreditNoteService.php
similarity index 97%
rename from app/Services/Document/CreditNoteService.php
rename to app/Domains/Sales/Application/CreditNoteService.php
index 80cbdce2..961c032e 100644
--- a/app/Services/Document/CreditNoteService.php
+++ b/app/Domains/Sales/Application/CreditNoteService.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace App\Services\Document;
+namespace App\Domains\Sales\Application;
 
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
 use App\Facades\Hashids;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
 use App\Support\CreditNoteAmounts;
+use App\Support\Hashids\HashidConnection;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -34,6 +36,7 @@ class CreditNoteService
     public function __construct(
         private readonly DocumentItemService $documentItemService,
         private readonly InvoiceBalanceService $invoiceBalanceService,
+        private readonly CustomFieldValueWriter $customFieldValueWriter,
     ) {}
 
     /**
@@ -230,7 +233,7 @@ class CreditNoteService
             'sales_tax_address_type' => $invoice->sales_tax_address_type,
         ]);
 
-        $creditNote->unique_hash = Hashids::connection(Invoice::class)->encode($creditNote->id);
+        $creditNote->unique_hash = Hashids::connection(HashidConnection::Invoice->value)->encode($creditNote->id);
         $creditNote->save();
 
         // recompute: false throughout. The calculator has already decided every
@@ -261,7 +264,7 @@ class CreditNoteService
                 ];
             }
 
-            $creditNote->addCustomFields($customFields);
+            $this->customFieldValueWriter->attach($creditNote, $customFields);
         }
 
         return $creditNote;
diff --git a/app/Services/Document/DocumentItemService.php b/app/Domains/Sales/Application/DocumentItemService.php
similarity index 93%
rename from app/Services/Document/DocumentItemService.php
rename to app/Domains/Sales/Application/DocumentItemService.php
index 1c9bdd32..d839821e 100644
--- a/app/Services/Document/DocumentItemService.php
+++ b/app/Domains/Sales/Application/DocumentItemService.php
@@ -1,12 +1,17 @@
 <?php
 
-namespace App\Services\Document;
+namespace App\Domains\Sales\Application;
 
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
 use App\Support\DocumentTotals;
 use Illuminate\Database\Eloquent\Model;
 
 class DocumentItemService
 {
+    public function __construct(
+        private readonly CustomFieldValueWriter $customFieldValueWriter,
+    ) {}
+
     /**
      * Company-currency columns and the column each one is derived from.
      */
@@ -79,7 +84,7 @@ class DocumentItemService
             }
 
             if (array_key_exists('custom_fields', $item) && $item['custom_fields']) {
-                $createdItem->addCustomFields($item['custom_fields']);
+                $this->customFieldValueWriter->attach($createdItem, $item['custom_fields']);
             }
         }
     }
diff --git a/app/Services/Document/EstimateService.php b/app/Domains/Sales/Application/EstimateService.php
similarity index 77%
rename from app/Services/Document/EstimateService.php
rename to app/Domains/Sales/Application/EstimateService.php
index 057a2b10..db12be48 100644
--- a/app/Services/Document/EstimateService.php
+++ b/app/Domains/Sales/Application/EstimateService.php
@@ -1,40 +1,49 @@
 <?php
 
-namespace App\Services\Document;
+namespace App\Domains\Sales\Application;
 
 use App;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Sales\Contracts\DocumentExchangeRateRecorder;
+use App\Domains\Sales\Contracts\EstimateEmailSender;
+use App\Domains\Sales\Contracts\EstimatePdfDataProvider;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
 use App\Facades\Hashids;
-use App\Facades\Pdf;
-use App\Mail\SendEstimateMail;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\CustomField;
-use App\Models\Estimate;
-use App\Models\ExchangeRateLog;
-use App\Models\Invoice;
-use App\Services\Mail\CompanyMailConfigService;
-use App\Support\Pdf\PdfMetadata;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Platform\Mail\Contracts\MailConfigurator;
+use App\Platform\Pdf\Facades\Pdf;
+use App\Platform\Pdf\Rendering\PdfMetadata;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
+use App\Support\Hashids\HashidConnection;
 use Carbon\Carbon;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
-class EstimateService
+class EstimateService implements EstimatePdfDataProvider
 {
     public function __construct(
         private readonly DocumentItemService $documentItemService,
+        private readonly MailConfigurator $mailConfigurator,
+        private readonly CustomFieldValueWriter $customFieldValueWriter,
+        private readonly DocumentExchangeRateRecorder $exchangeRateRecorder,
+        private readonly EstimateEmailSender $estimateEmailSender,
     ) {}
 
-    public function create(Request $request): Estimate
-    {
-        $data = $request->getEstimatePayload();
-
-        if ($request->has('estimateSend')) {
-            $data['status'] = Estimate::STATUS_SENT;
-        }
-
-        $estimate = Estimate::create($data);
-        $estimate->unique_hash = Hashids::connection(Estimate::class)->encode($estimate->id);
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<int, array<string, mixed>>  $items
+     * @param  array<int, array<string, mixed>>|null  $taxes
+     */
+    public function create(
+        array $attributes,
+        array $items,
+        ?array $taxes = null,
+        ?iterable $customFields = null,
+    ): Estimate {
+        $estimate = Estimate::create($attributes);
+        $estimate->unique_hash = Hashids::connection(HashidConnection::Estimate->value)->encode($estimate->id);
         $serial = (new SerialNumberService)
             ->setModel($estimate)
             ->setCompany($estimate->company_id)
@@ -45,46 +54,47 @@ class EstimateService
         $estimate->customer_sequence_number = $serial->nextCustomerSequenceNumber;
         $estimate->save();
 
-        $companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
+        $companyCurrency = CompanySetting::getSetting('currency', $estimate->company_id);
 
-        if ((string) $data['currency_id'] !== $companyCurrency) {
-            ExchangeRateLog::addExchangeRateLog($estimate);
+        if ((string) $attributes['currency_id'] !== $companyCurrency) {
+            $this->exchangeRateRecorder->record($estimate);
         }
 
-        $this->documentItemService->createItems($estimate, $request->items);
+        $this->documentItemService->createItems($estimate, $items);
 
-        if ($request->has('taxes') && (! empty($request->taxes))) {
-            $this->documentItemService->createTaxes($estimate, $request->taxes);
+        if ($taxes) {
+            $this->documentItemService->createTaxes($estimate, $taxes);
         }
 
-        $customFields = $request->customFields;
-
         if ($customFields) {
-            $estimate->addCustomFields($customFields);
+            $this->customFieldValueWriter->attach($estimate, $customFields);
         }
 
         return $estimate;
     }
 
-    public function update(Estimate $estimate, Request $request): Estimate
-    {
-        $data = $request->getEstimatePayload();
-
+    public function update(
+        Estimate $estimate,
+        array $attributes,
+        array $items,
+        ?array $taxes = null,
+        ?iterable $customFields = null,
+    ): Estimate {
         $serial = (new SerialNumberService)
             ->setModel($estimate)
             ->setCompany($estimate->company_id)
-            ->setCustomer($request->customer_id)
+            ->setCustomer($attributes['customer_id'])
             ->setModelObject($estimate->id)
             ->setNextNumbers();
 
-        $data['customer_sequence_number'] = $serial->nextCustomerSequenceNumber;
+        $attributes['customer_sequence_number'] = $serial->nextCustomerSequenceNumber;
 
-        $estimate->update($data);
+        $estimate->update($attributes);
 
-        $companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
+        $companyCurrency = CompanySetting::getSetting('currency', $estimate->company_id);
 
-        if ((string) $data['currency_id'] !== $companyCurrency) {
-            ExchangeRateLog::addExchangeRateLog($estimate);
+        if ((string) $attributes['currency_id'] !== $companyCurrency) {
+            $this->exchangeRateRecorder->record($estimate);
         }
 
         $estimate->items->map(function ($item) {
@@ -98,14 +108,14 @@ class EstimateService
         $estimate->items()->delete();
         $estimate->taxes()->delete();
 
-        $this->documentItemService->createItems($estimate, $request->items);
+        $this->documentItemService->createItems($estimate, $items);
 
-        if ($request->has('taxes') && (! empty($request->taxes))) {
-            $this->documentItemService->createTaxes($estimate, $request->taxes);
+        if ($taxes) {
+            $this->documentItemService->createTaxes($estimate, $taxes);
         }
 
-        if ($request->customFields) {
-            $estimate->updateCustomFields($request->customFields);
+        if ($customFields) {
+            $this->customFieldValueWriter->update($estimate, $customFields);
         }
 
         return Estimate::with([
@@ -114,7 +124,7 @@ class EstimateService
             'items.fields.customField',
             'customer',
             'taxes',
-        ])->find($estimate->id);
+        ])->findOrFail($estimate->id);
     }
 
     public function sendEstimateData(Estimate $estimate, array $data): array
@@ -132,21 +142,14 @@ class EstimateService
     {
         $data = $this->sendEstimateData($estimate, $data);
 
-        CompanyMailConfigService::apply($estimate->company_id);
+        $this->mailConfigurator->applyCompanyConfig($estimate->company_id);
 
         if ($estimate->status == Estimate::STATUS_DRAFT) {
             $estimate->status = Estimate::STATUS_SENT;
             $estimate->save();
         }
 
-        $mail = \Mail::to($data['to']);
-        if (! empty($data['cc'])) {
-            $mail->cc($data['cc']);
-        }
-        if (! empty($data['bcc'])) {
-            $mail->bcc($data['bcc']);
-        }
-        $mail->send(new SendEstimateMail($data));
+        $this->estimateEmailSender->send($data);
 
         return [
             'success' => true,
@@ -154,7 +157,7 @@ class EstimateService
         ];
     }
 
-    public function getPdfData(Estimate $estimate)
+    public function getPdfData(Estimate $estimate): mixed
     {
         $taxes = collect();
 
@@ -266,7 +269,7 @@ class EstimateService
             'sales_tax_address_type' => $estimate->sales_tax_address_type,
         ]);
 
-        $newEstimate->unique_hash = Hashids::connection(Estimate::class)->encode($newEstimate->id);
+        $newEstimate->unique_hash = Hashids::connection(HashidConnection::Estimate->value)->encode($newEstimate->id);
         $newEstimate->save();
 
         $estimate->load('items.taxes');
@@ -286,7 +289,7 @@ class EstimateService
                 ];
             }
 
-            $newEstimate->addCustomFields($customFields);
+            $this->customFieldValueWriter->attach($newEstimate, $customFields);
         }
 
         return $newEstimate;
@@ -355,7 +358,7 @@ class EstimateService
             'sales_tax_address_type' => $estimate->sales_tax_address_type,
         ]);
 
-        $invoice->unique_hash = Hashids::connection(Invoice::class)->encode($invoice->id);
+        $invoice->unique_hash = Hashids::connection(HashidConnection::Invoice->value)->encode($invoice->id);
         $invoice->save();
 
         $this->documentItemService->createItems($invoice, $estimate->items->toArray());
@@ -374,7 +377,7 @@ class EstimateService
                 ];
             }
 
-            $invoice->addCustomFields($customFields);
+            $this->customFieldValueWriter->attach($invoice, $customFields);
         }
 
         $estimate->checkForEstimateConvertAction();
diff --git a/app/Services/Document/InvoiceBalanceService.php b/app/Domains/Sales/Application/InvoiceBalanceService.php
similarity index 94%
rename from app/Services/Document/InvoiceBalanceService.php
rename to app/Domains/Sales/Application/InvoiceBalanceService.php
index edb46918..186eb4cd 100644
--- a/app/Services/Document/InvoiceBalanceService.php
+++ b/app/Domains/Sales/Application/InvoiceBalanceService.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Document;
+namespace App\Domains\Sales\Application;
 
-use App\Models\Invoice;
+use App\Domains\Sales\Models\Invoice;
 
 class InvoiceBalanceService
 {
diff --git a/app/Services/Document/InvoiceService.php b/app/Domains/Sales/Application/InvoiceService.php
similarity index 78%
rename from app/Services/Document/InvoiceService.php
rename to app/Domains/Sales/Application/InvoiceService.php
index 925ce9e0..0262b723 100644
--- a/app/Services/Document/InvoiceService.php
+++ b/app/Domains/Sales/Application/InvoiceService.php
@@ -1,42 +1,51 @@
 <?php
 
-namespace App\Services\Document;
+namespace App\Domains\Sales\Application;
 
 use App;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Sales\Contracts\DocumentExchangeRateRecorder;
+use App\Domains\Sales\Contracts\InvoiceEmailSender;
+use App\Domains\Sales\Contracts\InvoicePdfDataProvider;
+use App\Domains\Sales\Mail\SendInvoiceMail;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
 use App\Facades\Hashids;
-use App\Facades\Pdf;
-use App\Mail\SendCreditNoteMail;
-use App\Mail\SendInvoiceMail;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\CustomField;
-use App\Models\Estimate;
-use App\Models\ExchangeRateLog;
-use App\Models\Invoice;
-use App\Services\Mail\CompanyMailConfigService;
-use App\Support\Pdf\PdfMetadata;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Platform\Mail\Contracts\MailConfigurator;
+use App\Platform\Pdf\Facades\Pdf;
+use App\Platform\Pdf\Rendering\PdfMetadata;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
+use App\Support\Hashids\HashidConnection;
 use Carbon\Carbon;
-use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\Validation\ValidationException;
 
-class InvoiceService
+class InvoiceService implements InvoicePdfDataProvider
 {
     public function __construct(
         private readonly DocumentItemService $documentItemService,
         private readonly CreditNoteService $creditNoteService,
+        private readonly MailConfigurator $mailConfigurator,
+        private readonly CustomFieldValueWriter $customFieldValueWriter,
+        private readonly DocumentExchangeRateRecorder $exchangeRateRecorder,
+        private readonly InvoiceEmailSender $invoiceEmailSender,
     ) {}
 
-    public function create(Request $request): Invoice
-    {
-        $data = $request->getInvoicePayload();
-
-        if ($request->has('invoiceSend')) {
-            $data['status'] = Invoice::STATUS_SENT;
-        }
-
-        $invoice = Invoice::create($data);
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<int, array<string, mixed>>  $items
+     * @param  array<int, array<string, mixed>>|null  $taxes
+     */
+    public function create(
+        array $attributes,
+        array $items,
+        ?array $taxes = null,
+        ?iterable $customFields = null,
+    ): Invoice {
+        $invoice = Invoice::create($attributes);
 
         $serial = (new SerialNumberService)
             ->setModel($invoice)
@@ -47,23 +56,23 @@ class InvoiceService
 
         $invoice->sequence_number = $serial->nextSequenceNumber;
         $invoice->customer_sequence_number = $serial->nextCustomerSequenceNumber;
-        $invoice->unique_hash = Hashids::connection(Invoice::class)->encode($invoice->id);
+        $invoice->unique_hash = Hashids::connection(HashidConnection::Invoice->value)->encode($invoice->id);
         $invoice->save();
 
-        $this->documentItemService->createItems($invoice, $request->items);
+        $this->documentItemService->createItems($invoice, $items);
 
-        $companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
+        $companyCurrency = CompanySetting::getSetting('currency', $invoice->company_id);
 
-        if ((string) $data['currency_id'] !== $companyCurrency) {
-            ExchangeRateLog::addExchangeRateLog($invoice);
+        if ((string) $attributes['currency_id'] !== $companyCurrency) {
+            $this->exchangeRateRecorder->record($invoice);
         }
 
-        if ($request->has('taxes') && (! empty($request->taxes))) {
-            $this->documentItemService->createTaxes($invoice, $request->taxes);
+        if ($taxes) {
+            $this->documentItemService->createTaxes($invoice, $taxes);
         }
 
-        if ($request->customFields) {
-            $invoice->addCustomFields($request->customFields);
+        if ($customFields) {
+            $this->customFieldValueWriter->attach($invoice, $customFields);
         }
 
         return Invoice::with([
@@ -73,60 +82,64 @@ class InvoiceService
             'customer',
             'taxes',
             'creditNotes',
-        ])->find($invoice->id);
+        ])->findOrFail($invoice->id);
     }
 
     /**
      * @throws ValidationException
      */
-    public function update(Invoice $invoice, Request $request): Invoice
-    {
+    public function update(
+        Invoice $invoice,
+        array $attributes,
+        array $items,
+        ?array $taxes = null,
+        ?iterable $customFields = null,
+    ): Invoice {
         $serial = (new SerialNumberService)
             ->setModel($invoice)
             ->setCompany($invoice->company_id)
-            ->setCustomer($request->customer_id)
+            ->setCustomer($attributes['customer_id'])
             ->setSequenceScope(['type' => Invoice::TYPE_INVOICE])
             ->setModelObject($invoice->id)
             ->setNextNumbers();
 
-        $data = $request->getInvoicePayload();
         $oldTotal = $invoice->total;
 
         $totalPaidAmount = $invoice->total - $invoice->due_amount;
 
-        if ($totalPaidAmount > 0 && $invoice->customer_id !== $request->customer_id) {
+        if ($totalPaidAmount > 0 && (int) $invoice->customer_id !== (int) $attributes['customer_id']) {
             throw ValidationException::withMessages([
                 'customer_id' => ['customer_cannot_be_changed_after_payment_is_added'],
             ]);
         }
 
-        if ($data['total'] >= 0 && $data['total'] < $totalPaidAmount) {
+        if ($attributes['total'] >= 0 && $attributes['total'] < $totalPaidAmount) {
             throw ValidationException::withMessages([
                 'total' => ['total_invoice_amount_must_be_more_than_paid_amount'],
             ]);
         }
 
-        if ($oldTotal != $data['total']) {
-            $oldTotal = (int) round($data['total']) - (int) $oldTotal;
+        if ($oldTotal != $attributes['total']) {
+            $oldTotal = (int) round($attributes['total']) - (int) $oldTotal;
         } else {
             $oldTotal = 0;
         }
 
-        $data['due_amount'] = ($invoice->due_amount + $oldTotal);
-        $data['base_due_amount'] = $data['due_amount'] * $data['exchange_rate'];
-        $data['customer_sequence_number'] = $serial->nextCustomerSequenceNumber;
+        $attributes['due_amount'] = ($invoice->due_amount + $oldTotal);
+        $attributes['base_due_amount'] = $attributes['due_amount'] * $attributes['exchange_rate'];
+        $attributes['customer_sequence_number'] = $serial->nextCustomerSequenceNumber;
 
-        $invoice->update($data);
+        $invoice->update($attributes);
 
-        $statusData = $invoice->getInvoiceStatusByAmount($data['due_amount']);
+        $statusData = $invoice->getInvoiceStatusByAmount($attributes['due_amount']);
         if (! empty($statusData)) {
             $invoice->update($statusData);
         }
 
-        $companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
+        $companyCurrency = CompanySetting::getSetting('currency', $invoice->company_id);
 
-        if ((string) $data['currency_id'] !== $companyCurrency) {
-            ExchangeRateLog::addExchangeRateLog($invoice);
+        if ((string) $attributes['currency_id'] !== $companyCurrency) {
+            $this->exchangeRateRecorder->record($invoice);
         }
 
         $invoice->items->map(function ($item) {
@@ -140,14 +153,14 @@ class InvoiceService
         $invoice->items()->delete();
         $invoice->taxes()->delete();
 
-        $this->documentItemService->createItems($invoice, $request->items);
+        $this->documentItemService->createItems($invoice, $items);
 
-        if ($request->has('taxes') && (! empty($request->taxes))) {
-            $this->documentItemService->createTaxes($invoice, $request->taxes);
+        if ($taxes) {
+            $this->documentItemService->createTaxes($invoice, $taxes);
         }
 
-        if ($request->customFields) {
-            $invoice->updateCustomFields($request->customFields);
+        if ($customFields) {
+            $this->customFieldValueWriter->update($invoice, $customFields);
         }
 
         return Invoice::with([
@@ -157,7 +170,7 @@ class InvoiceService
             'customer',
             'taxes',
             'creditNotes',
-        ])->find($invoice->id);
+        ])->findOrFail($invoice->id);
     }
 
     public function delete(Collection $ids): bool
@@ -236,20 +249,9 @@ class InvoiceService
     {
         $data = $this->sendInvoiceData($invoice, $data);
 
-        CompanyMailConfigService::apply($invoice->company_id);
+        $this->mailConfigurator->applyCompanyConfig($invoice->company_id);
 
-        $mail = \Mail::to($data['to']);
-        if (! empty($data['cc'])) {
-            $mail->cc($data['cc']);
-        }
-        if (! empty($data['bcc'])) {
-            $mail->bcc($data['bcc']);
-        }
-        // A credit note travels through the same send channel as the invoice it
-        // reverses; only the template (and its EmailLog entry) differs.
-        $mail->send($invoice->isCreditNote()
-            ? new SendCreditNoteMail($data)
-            : new SendInvoiceMail($data));
+        $this->invoiceEmailSender->send($data, $invoice->isCreditNote());
 
         if ($invoice->status == Invoice::STATUS_DRAFT) {
             $invoice->status = Invoice::STATUS_SENT;
@@ -263,7 +265,7 @@ class InvoiceService
         ];
     }
 
-    public function getPdfData(Invoice $invoice)
+    public function getPdfData(Invoice $invoice): mixed
     {
         $taxes = collect();
 
@@ -382,7 +384,7 @@ class InvoiceService
             'sales_tax_address_type' => $invoice->sales_tax_address_type,
         ]);
 
-        $newInvoice->unique_hash = Hashids::connection(Invoice::class)->encode($newInvoice->id);
+        $newInvoice->unique_hash = Hashids::connection(HashidConnection::Invoice->value)->encode($newInvoice->id);
         $newInvoice->save();
 
         $invoice->load('items.taxes');
@@ -402,7 +404,7 @@ class InvoiceService
                 ];
             }
 
-            $newInvoice->addCustomFields($customFields);
+            $this->customFieldValueWriter->attach($newInvoice, $customFields);
         }
 
         return $newInvoice;
@@ -451,7 +453,7 @@ class InvoiceService
             'sales_tax_address_type' => $invoice->sales_tax_address_type,
         ]);
 
-        $estimate->unique_hash = Hashids::connection(Estimate::class)->encode($estimate->id);
+        $estimate->unique_hash = Hashids::connection(HashidConnection::Estimate->value)->encode($estimate->id);
         $estimate->save();
 
         $this->documentItemService->createItems($estimate, $invoice->items->toArray());
@@ -470,7 +472,7 @@ class InvoiceService
                 ];
             }
 
-            $estimate->addCustomFields($customFields);
+            $this->customFieldValueWriter->attach($estimate, $customFields);
         }
 
         return $estimate;
diff --git a/app/Services/Document/RecurringInvoiceService.php b/app/Domains/Sales/Application/RecurringInvoiceService.php
similarity index 78%
rename from app/Services/Document/RecurringInvoiceService.php
rename to app/Domains/Sales/Application/RecurringInvoiceService.php
index 661523aa..7a6d5a93 100644
--- a/app/Services/Document/RecurringInvoiceService.php
+++ b/app/Domains/Sales/Application/RecurringInvoiceService.php
@@ -1,15 +1,16 @@
 <?php
 
-namespace App\Services\Document;
+namespace App\Domains\Sales\Application;
 
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
+use App\Domains\Sales\Contracts\DocumentExchangeRateRecorder;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\RecurringInvoice;
 use App\Facades\Hashids;
-use App\Http\Requests\RecurringInvoiceRequest;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Customer;
-use App\Models\ExchangeRateLog;
-use App\Models\Invoice;
-use App\Models\RecurringInvoice;
+use App\Support\Hashids\HashidConnection;
 use Carbon\Carbon;
 use Illuminate\Support\Collection;
 
@@ -18,53 +19,67 @@ class RecurringInvoiceService
     public function __construct(
         private readonly DocumentItemService $documentItemService,
         private readonly InvoiceService $invoiceService,
+        private readonly CustomFieldValueWriter $customFieldValueWriter,
+        private readonly DocumentExchangeRateRecorder $exchangeRateRecorder,
     ) {}
 
-    public function create(RecurringInvoiceRequest $request): RecurringInvoice
-    {
-        $recurringInvoice = RecurringInvoice::create($request->getRecurringInvoicePayload());
+    /**
+     * @param  array<string, mixed>  $attributes
+     * @param  array<int, array<string, mixed>>  $items
+     * @param  array<int, array<string, mixed>>|null  $taxes
+     */
+    public function create(
+        array $attributes,
+        array $items,
+        ?array $taxes = null,
+        ?iterable $customFields = null,
+    ): RecurringInvoice {
+        $recurringInvoice = RecurringInvoice::create($attributes);
 
-        $companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
+        $companyCurrency = CompanySetting::getSetting('currency', $recurringInvoice->company_id);
 
         if ((string) $recurringInvoice['currency_id'] !== $companyCurrency) {
-            ExchangeRateLog::addExchangeRateLog($recurringInvoice);
+            $this->exchangeRateRecorder->record($recurringInvoice);
         }
 
-        $this->createItems($recurringInvoice, $request->items);
+        $this->createItems($recurringInvoice, $items);
 
-        if ($request->has('taxes') && (! empty($request->taxes))) {
-            $this->createTaxes($recurringInvoice, $request->taxes);
+        if ($taxes) {
+            $this->createTaxes($recurringInvoice, $taxes);
         }
 
-        if ($request->customFields) {
-            $recurringInvoice->addCustomFields($request->customFields);
+        if ($customFields) {
+            $this->customFieldValueWriter->attach($recurringInvoice, $customFields);
         }
 
         return $recurringInvoice;
     }
 
-    public function update(RecurringInvoice $recurringInvoice, RecurringInvoiceRequest $request): RecurringInvoice
-    {
-        $data = $request->getRecurringInvoicePayload();
+    public function update(
+        RecurringInvoice $recurringInvoice,
+        array $attributes,
+        array $items,
+        ?array $taxes = null,
+        ?iterable $customFields = null,
+    ): RecurringInvoice {
+        $recurringInvoice->update($attributes);
 
-        $recurringInvoice->update($data);
+        $companyCurrency = CompanySetting::getSetting('currency', $recurringInvoice->company_id);
 
-        $companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
-
-        if ((string) $data['currency_id'] !== $companyCurrency) {
-            ExchangeRateLog::addExchangeRateLog($recurringInvoice);
+        if ((string) $attributes['currency_id'] !== $companyCurrency) {
+            $this->exchangeRateRecorder->record($recurringInvoice);
         }
 
         $recurringInvoice->items()->delete();
-        $this->createItems($recurringInvoice, $request->items);
+        $this->createItems($recurringInvoice, $items);
 
         $recurringInvoice->taxes()->delete();
-        if ($request->has('taxes') && (! empty($request->taxes))) {
-            $this->createTaxes($recurringInvoice, $request->taxes);
+        if ($taxes) {
+            $this->createTaxes($recurringInvoice, $taxes);
         }
 
-        if ($request->customFields) {
-            $recurringInvoice->updateCustomFields($request->customFields);
+        if ($customFields) {
+            $this->customFieldValueWriter->update($recurringInvoice, $customFields);
         }
 
         return $recurringInvoice;
@@ -171,7 +186,7 @@ class RecurringInvoiceService
         $newInvoice['base_tax'] = $recurringInvoice->exchange_rate * $recurringInvoice->tax;
         $newInvoice['base_total'] = $recurringInvoice->exchange_rate * $recurringInvoice->total;
         $invoice = Invoice::create($newInvoice);
-        $invoice->unique_hash = Hashids::connection(Invoice::class)->encode($invoice->id);
+        $invoice->unique_hash = Hashids::connection(HashidConnection::Invoice->value)->encode($invoice->id);
         $invoice->save();
 
         $recurringInvoice->load('items.taxes');
@@ -191,7 +206,7 @@ class RecurringInvoiceService
                 ];
             }
 
-            $invoice->addCustomFields($customField);
+            $this->customFieldValueWriter->attach($invoice, $customField);
         }
 
         if ($recurringInvoice->send_automatically == true) {
diff --git a/app/Services/Document/SerialNumberService.php b/app/Domains/Sales/Application/SerialNumberService.php
similarity index 96%
rename from app/Services/Document/SerialNumberService.php
rename to app/Domains/Sales/Application/SerialNumberService.php
index ab9519e7..aa648322 100644
--- a/app/Services/Document/SerialNumberService.php
+++ b/app/Domains/Sales/Application/SerialNumberService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Services\Document;
+namespace App\Domains\Sales\Application;
 
-use App\Models\CompanySetting;
-use App\Models\Customer;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Models\Customer;
 
 class SerialNumberService
 {
@@ -111,15 +111,13 @@ class SerialNumberService
     /**
      * @return string
      */
-    public function getNextNumber($data = null)
+    public function getNextNumber(?string $format = null)
     {
         $modelName = strtolower(class_basename($this->model));
         $settingKey = $this->settingKey ?: $modelName.'_number_format';
         $companyId = $this->company;
 
-        if (request()->has('format')) {
-            $format = request()->get('format');
-        } else {
+        if ($format === null) {
             $format = CompanySetting::getSetting(
                 $settingKey,
                 $companyId
diff --git a/app/Console/Commands/CheckEstimateStatus.php b/app/Domains/Sales/Console/CheckEstimateStatus.php
similarity index 93%
rename from app/Console/Commands/CheckEstimateStatus.php
rename to app/Domains/Sales/Console/CheckEstimateStatus.php
index da7afe5d..55a5aed9 100644
--- a/app/Console/Commands/CheckEstimateStatus.php
+++ b/app/Domains/Sales/Console/CheckEstimateStatus.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Domains\Sales\Console;
 
-use App\Models\Estimate;
+use App\Domains\Sales\Models\Estimate;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 
diff --git a/app/Console/Commands/CheckInvoiceStatus.php b/app/Domains/Sales/Console/CheckInvoiceStatus.php
similarity index 94%
rename from app/Console/Commands/CheckInvoiceStatus.php
rename to app/Domains/Sales/Console/CheckInvoiceStatus.php
index be6e1a75..65433073 100644
--- a/app/Console/Commands/CheckInvoiceStatus.php
+++ b/app/Domains/Sales/Console/CheckInvoiceStatus.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Domains\Sales\Console;
 
-use App\Models\Invoice;
+use App\Domains\Sales\Models\Invoice;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 
diff --git a/app/Domains/Sales/Contracts/DocumentExchangeRateRecorder.php b/app/Domains/Sales/Contracts/DocumentExchangeRateRecorder.php
new file mode 100644
index 00000000..66a9602b
--- /dev/null
+++ b/app/Domains/Sales/Contracts/DocumentExchangeRateRecorder.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Sales\Contracts;
+
+use Illuminate\Database\Eloquent\Model;
+
+interface DocumentExchangeRateRecorder
+{
+    public function record(Model $document): void;
+}
diff --git a/app/Domains/Sales/Contracts/EstimateEmailSender.php b/app/Domains/Sales/Contracts/EstimateEmailSender.php
new file mode 100644
index 00000000..2120441c
--- /dev/null
+++ b/app/Domains/Sales/Contracts/EstimateEmailSender.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Domains\Sales\Contracts;
+
+interface EstimateEmailSender
+{
+    /** @param array<string, mixed> $data */
+    public function send(array $data): void;
+}
diff --git a/app/Domains/Sales/Contracts/EstimatePdfDataProvider.php b/app/Domains/Sales/Contracts/EstimatePdfDataProvider.php
new file mode 100644
index 00000000..3091afb4
--- /dev/null
+++ b/app/Domains/Sales/Contracts/EstimatePdfDataProvider.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Sales\Contracts;
+
+use App\Domains\Sales\Models\Estimate;
+
+interface EstimatePdfDataProvider
+{
+    public function getPdfData(Estimate $estimate): mixed;
+}
diff --git a/app/Domains/Sales/Contracts/InvoiceEmailSender.php b/app/Domains/Sales/Contracts/InvoiceEmailSender.php
new file mode 100644
index 00000000..df4364a3
--- /dev/null
+++ b/app/Domains/Sales/Contracts/InvoiceEmailSender.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Domains\Sales\Contracts;
+
+interface InvoiceEmailSender
+{
+    /** @param array<string, mixed> $data */
+    public function send(array $data, bool $creditNote): void;
+}
diff --git a/app/Domains/Sales/Contracts/InvoicePdfDataProvider.php b/app/Domains/Sales/Contracts/InvoicePdfDataProvider.php
new file mode 100644
index 00000000..6b7a68df
--- /dev/null
+++ b/app/Domains/Sales/Contracts/InvoicePdfDataProvider.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Domains\Sales\Contracts;
+
+use App\Domains\Sales\Models\Invoice;
+
+interface InvoicePdfDataProvider
+{
+    public function getPdfData(Invoice $invoice): mixed;
+}
diff --git a/app/Http/Controllers/Company/Estimate/EstimateTemplatesController.php b/app/Domains/Sales/Http/Controllers/Company/EstimateTemplatesController.php
similarity index 74%
rename from app/Http/Controllers/Company/Estimate/EstimateTemplatesController.php
rename to app/Domains/Sales/Http/Controllers/Company/EstimateTemplatesController.php
index 4b5df455..b54ef0a7 100644
--- a/app/Http/Controllers/Company/Estimate/EstimateTemplatesController.php
+++ b/app/Domains/Sales/Http/Controllers/Company/EstimateTemplatesController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Company\Estimate;
+namespace App\Domains\Sales\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Models\Estimate;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Domains\Sales\Models\Estimate;
+use App\Platform\Http\Controller;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Company/Estimate/EstimatesController.php b/app/Domains/Sales/Http/Controllers/Company/EstimatesController.php
similarity index 72%
rename from app/Http/Controllers/Company/Estimate/EstimatesController.php
rename to app/Domains/Sales/Http/Controllers/Company/EstimatesController.php
index 34a6b932..51e400b1 100644
--- a/app/Http/Controllers/Company/Estimate/EstimatesController.php
+++ b/app/Domains/Sales/Http/Controllers/Company/EstimatesController.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Http\Controllers\Company\Estimate;
+namespace App\Domains\Sales\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\DeleteEstimatesRequest;
-use App\Http\Requests\EstimatesRequest;
-use App\Http\Requests\SendEstimatesRequest;
-use App\Http\Resources\EstimateResource;
-use App\Http\Resources\InvoiceResource;
-use App\Jobs\GenerateEstimatePdfJob;
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Services\Document\EstimateService;
+use App\Domains\Sales\Application\EstimateService;
+use App\Domains\Sales\Http\Requests\DeleteEstimatesRequest;
+use App\Domains\Sales\Http\Requests\EstimatesRequest;
+use App\Domains\Sales\Http\Requests\SendEstimatesRequest;
+use App\Domains\Sales\Http\Resources\EstimateResource;
+use App\Domains\Sales\Http\Resources\InvoiceResource;
+use App\Domains\Sales\Jobs\GenerateEstimatePdfJob;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Markdown;
 
@@ -44,7 +44,12 @@ class EstimatesController extends Controller
     {
         $this->authorize('create', Estimate::class);
 
-        $estimate = $this->estimateService->create($request);
+        $estimate = $this->estimateService->create(
+            attributes: $request->getEstimatePayload(),
+            items: $request->input('items'),
+            taxes: $request->has('taxes') ? $request->input('taxes') : null,
+            customFields: $this->customFields($request),
+        );
 
         if ($request->has('estimateSend')) {
             $this->estimateService->send($estimate, $request->only(['title', 'body']));
@@ -66,7 +71,13 @@ class EstimatesController extends Controller
     {
         $this->authorize('update', $estimate);
 
-        $estimate = $this->estimateService->update($estimate, $request);
+        $estimate = $this->estimateService->update(
+            estimate: $estimate,
+            attributes: $request->getEstimatePayload(),
+            items: $request->input('items'),
+            taxes: $request->has('taxes') ? $request->input('taxes') : null,
+            customFields: $this->customFields($request),
+        );
 
         GenerateEstimatePdfJob::dispatch($estimate, true);
 
@@ -141,4 +152,11 @@ class EstimatesController extends Controller
             'success' => true,
         ]);
     }
+
+    private function customFields(EstimatesRequest $request): ?iterable
+    {
+        $customFields = $request->input('customFields');
+
+        return is_iterable($customFields) ? $customFields : null;
+    }
 }
diff --git a/app/Http/Controllers/Company/Invoice/InvoiceTemplatesController.php b/app/Domains/Sales/Http/Controllers/Company/InvoiceTemplatesController.php
similarity index 77%
rename from app/Http/Controllers/Company/Invoice/InvoiceTemplatesController.php
rename to app/Domains/Sales/Http/Controllers/Company/InvoiceTemplatesController.php
index 8332afb5..fe64452e 100644
--- a/app/Http/Controllers/Company/Invoice/InvoiceTemplatesController.php
+++ b/app/Domains/Sales/Http/Controllers/Company/InvoiceTemplatesController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Company\Invoice;
+namespace App\Domains\Sales\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Models\Invoice;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Http\Controller;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Company/Invoice/InvoicesController.php b/app/Domains/Sales/Http/Controllers/Company/InvoicesController.php
similarity index 81%
rename from app/Http/Controllers/Company/Invoice/InvoicesController.php
rename to app/Domains/Sales/Http/Controllers/Company/InvoicesController.php
index 92a95c66..79ed6b37 100644
--- a/app/Http/Controllers/Company/Invoice/InvoicesController.php
+++ b/app/Domains/Sales/Http/Controllers/Company/InvoicesController.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace App\Http\Controllers\Company\Invoice;
+namespace App\Domains\Sales\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests;
-use App\Http\Requests\ChangeInvoiceStatusRequest;
-use App\Http\Requests\CreateCreditNoteRequest;
-use App\Http\Requests\DeleteInvoiceRequest;
-use App\Http\Requests\SendInvoiceRequest;
-use App\Http\Resources\CreditNoteResource;
-use App\Http\Resources\EstimateResource;
-use App\Http\Resources\InvoiceResource;
-use App\Jobs\GenerateInvoicePdfJob;
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Services\Document\CreditNoteService;
-use App\Services\Document\InvoiceService;
+use App\Domains\Sales\Application\CreditNoteService;
+use App\Domains\Sales\Application\InvoiceService;
+use App\Domains\Sales\Http\Requests\ChangeInvoiceStatusRequest;
+use App\Domains\Sales\Http\Requests\CreateCreditNoteRequest;
+use App\Domains\Sales\Http\Requests\DeleteInvoiceRequest;
+use App\Domains\Sales\Http\Requests\InvoicesRequest;
+use App\Domains\Sales\Http\Requests\SendInvoiceRequest;
+use App\Domains\Sales\Http\Resources\CreditNoteResource;
+use App\Domains\Sales\Http\Resources\EstimateResource;
+use App\Domains\Sales\Http\Resources\InvoiceResource;
+use App\Domains\Sales\Jobs\GenerateInvoicePdfJob;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Markdown;
@@ -59,11 +59,16 @@ class InvoicesController extends Controller
      * @param  Request  $request
      * @return JsonResponse
      */
-    public function store(Requests\InvoicesRequest $request)
+    public function store(InvoicesRequest $request)
     {
         $this->authorize('create', Invoice::class);
 
-        $invoice = $this->invoiceService->create($request);
+        $invoice = $this->invoiceService->create(
+            attributes: $request->getInvoicePayload(),
+            items: $request->input('items'),
+            taxes: $request->has('taxes') ? $request->input('taxes') : null,
+            customFields: $this->customFields($request),
+        );
 
         if ($request->has('invoiceSend')) {
             $this->invoiceService->send($invoice, $request->only(['subject', 'body']));
@@ -103,11 +108,17 @@ class InvoicesController extends Controller
      * @param  Request  $request
      * @return JsonResponse
      */
-    public function update(Requests\InvoicesRequest $request, Invoice $invoice)
+    public function update(InvoicesRequest $request, Invoice $invoice)
     {
         $this->authorize('update', $invoice);
 
-        $invoice = $this->invoiceService->update($invoice, $request);
+        $invoice = $this->invoiceService->update(
+            invoice: $invoice,
+            attributes: $request->getInvoicePayload(),
+            items: $request->input('items'),
+            taxes: $request->has('taxes') ? $request->input('taxes') : null,
+            customFields: $this->customFields($request),
+        );
 
         GenerateInvoicePdfJob::dispatch($invoice, true);
 
@@ -250,4 +261,11 @@ class InvoicesController extends Controller
             'success' => true,
         ]);
     }
+
+    private function customFields(InvoicesRequest $request): ?iterable
+    {
+        $customFields = $request->input('customFields');
+
+        return is_iterable($customFields) ? $customFields : null;
+    }
 }
diff --git a/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php b/app/Domains/Sales/Http/Controllers/Company/RecurringInvoiceController.php
similarity index 68%
rename from app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php
rename to app/Domains/Sales/Http/Controllers/Company/RecurringInvoiceController.php
index 05121b2f..2bdf7f2c 100644
--- a/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php
+++ b/app/Domains/Sales/Http/Controllers/Company/RecurringInvoiceController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Company\RecurringInvoice;
+namespace App\Domains\Sales\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\RecurringInvoiceRequest;
-use App\Http\Resources\RecurringInvoiceResource;
-use App\Models\RecurringInvoice;
-use App\Services\Document\RecurringInvoiceService;
+use App\Domains\Sales\Application\RecurringInvoiceService;
+use App\Domains\Sales\Http\Requests\RecurringInvoiceRequest;
+use App\Domains\Sales\Http\Resources\RecurringInvoiceResource;
+use App\Domains\Sales\Models\RecurringInvoice;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -47,7 +47,12 @@ class RecurringInvoiceController extends Controller
     {
         $this->authorize('create', RecurringInvoice::class);
 
-        $recurringInvoice = $this->recurringInvoiceService->create($request);
+        $recurringInvoice = $this->recurringInvoiceService->create(
+            attributes: $request->getRecurringInvoicePayload(),
+            items: $request->input('items'),
+            taxes: $request->has('taxes') ? $request->input('taxes') : null,
+            customFields: $this->customFields($request),
+        );
 
         return new RecurringInvoiceResource($recurringInvoice);
     }
@@ -74,7 +79,13 @@ class RecurringInvoiceController extends Controller
     {
         $this->authorize('update', $recurringInvoice);
 
-        $this->recurringInvoiceService->update($recurringInvoice, $request);
+        $this->recurringInvoiceService->update(
+            recurringInvoice: $recurringInvoice,
+            attributes: $request->getRecurringInvoicePayload(),
+            items: $request->input('items'),
+            taxes: $request->has('taxes') ? $request->input('taxes') : null,
+            customFields: $this->customFields($request),
+        );
 
         return new RecurringInvoiceResource($recurringInvoice);
     }
@@ -99,4 +110,11 @@ class RecurringInvoiceController extends Controller
             'success' => true,
         ]);
     }
+
+    private function customFields(RecurringInvoiceRequest $request): ?iterable
+    {
+        $customFields = $request->input('customFields');
+
+        return is_iterable($customFields) ? $customFields : null;
+    }
 }
diff --git a/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceFrequencyController.php b/app/Domains/Sales/Http/Controllers/Company/RecurringInvoiceFrequencyController.php
similarity index 74%
rename from app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceFrequencyController.php
rename to app/Domains/Sales/Http/Controllers/Company/RecurringInvoiceFrequencyController.php
index b98fea63..dbc58f48 100644
--- a/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceFrequencyController.php
+++ b/app/Domains/Sales/Http/Controllers/Company/RecurringInvoiceFrequencyController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Company\RecurringInvoice;
+namespace App\Domains\Sales\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Models\RecurringInvoice;
+use App\Domains\Sales\Models\RecurringInvoice;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 
 class RecurringInvoiceFrequencyController extends Controller
diff --git a/app/Http/Controllers/Company/General/SerialNumberController.php b/app/Domains/Sales/Http/Controllers/Company/SerialNumberController.php
similarity index 82%
rename from app/Http/Controllers/Company/General/SerialNumberController.php
rename to app/Domains/Sales/Http/Controllers/Company/SerialNumberController.php
index 0c746886..48e56264 100644
--- a/app/Http/Controllers/Company/General/SerialNumberController.php
+++ b/app/Domains/Sales/Http/Controllers/Company/SerialNumberController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Company\General;
+namespace App\Domains\Sales\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Services\Document\SerialNumberService;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Application\SerialNumberService;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -28,7 +28,7 @@ class SerialNumberController extends Controller
                     $nextNumber = $serial->setModel($invoice)
                         ->setSequenceScope(['type' => Invoice::TYPE_INVOICE])
                         ->setModelObject($request->model_id)
-                        ->getNextNumber();
+                        ->getNextNumber($request->input('format'));
 
                     break;
 
@@ -37,21 +37,21 @@ class SerialNumberController extends Controller
                         ->setSettingKey('credit_note_number_format')
                         ->setSequenceScope(['type' => Invoice::TYPE_CREDIT_NOTE])
                         ->setModelObject($request->model_id)
-                        ->getNextNumber();
+                        ->getNextNumber($request->input('format'));
 
                     break;
 
                 case 'estimate':
                     $nextNumber = $serial->setModel($estimate)
                         ->setModelObject($request->model_id)
-                        ->getNextNumber();
+                        ->getNextNumber($request->input('format'));
 
                     break;
 
                 case 'payment':
                     $nextNumber = $serial->setModel($payment)
                         ->setModelObject($request->model_id)
-                        ->getNextNumber();
+                        ->getNextNumber($request->input('format'));
 
                     break;
 
diff --git a/app/Http/Controllers/CustomerPortal/Estimate/AcceptEstimateController.php b/app/Domains/Sales/Http/Controllers/CustomerPortal/AcceptEstimateController.php
similarity index 74%
rename from app/Http/Controllers/CustomerPortal/Estimate/AcceptEstimateController.php
rename to app/Domains/Sales/Http/Controllers/CustomerPortal/AcceptEstimateController.php
index 72dbf789..60c0d429 100644
--- a/app/Http/Controllers/CustomerPortal/Estimate/AcceptEstimateController.php
+++ b/app/Domains/Sales/Http/Controllers/CustomerPortal/AcceptEstimateController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal\Estimate;
+namespace App\Domains\Sales\Http\Controllers\CustomerPortal;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\Customer\EstimateResource;
-use App\Models\Company;
-use App\Models\Estimate;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Sales\Http\Resources\CustomerPortal\EstimateResource;
+use App\Domains\Sales\Models\Estimate;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Http/Controllers/CustomerPortal/EstimatePdfController.php b/app/Domains/Sales/Http/Controllers/CustomerPortal/EstimatePdfController.php
similarity index 80%
rename from app/Http/Controllers/CustomerPortal/EstimatePdfController.php
rename to app/Domains/Sales/Http/Controllers/CustomerPortal/EstimatePdfController.php
index e3483837..3c96a508 100644
--- a/app/Http/Controllers/CustomerPortal/EstimatePdfController.php
+++ b/app/Domains/Sales/Http/Controllers/CustomerPortal/EstimatePdfController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal;
+namespace App\Domains\Sales\Http\Controllers\CustomerPortal;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\EstimateResource;
-use App\Mail\EstimateViewedMail;
-use App\Models\CompanySetting;
-use App\Models\Customer;
-use App\Models\EmailLog;
-use App\Models\Estimate;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Http\Resources\EstimateResource;
+use App\Domains\Sales\Mail\EstimateViewedMail;
+use App\Domains\Sales\Models\Estimate;
+use App\Platform\Http\Controller;
+use App\Platform\Mail\Models\EmailLog;
 use Illuminate\Http\Request;
 
 class EstimatePdfController extends Controller
diff --git a/app/Http/Controllers/CustomerPortal/Estimate/EstimatesController.php b/app/Domains/Sales/Http/Controllers/CustomerPortal/EstimatesController.php
similarity index 87%
rename from app/Http/Controllers/CustomerPortal/Estimate/EstimatesController.php
rename to app/Domains/Sales/Http/Controllers/CustomerPortal/EstimatesController.php
index 1259f11b..7f8e3e3d 100644
--- a/app/Http/Controllers/CustomerPortal/Estimate/EstimatesController.php
+++ b/app/Domains/Sales/Http/Controllers/CustomerPortal/EstimatesController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal\Estimate;
+namespace App\Domains\Sales\Http\Controllers\CustomerPortal;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\Customer\EstimateResource;
-use App\Models\Company;
-use App\Models\Estimate;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Sales\Http\Resources\CustomerPortal\EstimateResource;
+use App\Domains\Sales\Models\Estimate;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Http/Controllers/CustomerPortal/InvoicePdfController.php b/app/Domains/Sales/Http/Controllers/CustomerPortal/InvoicePdfController.php
similarity index 83%
rename from app/Http/Controllers/CustomerPortal/InvoicePdfController.php
rename to app/Domains/Sales/Http/Controllers/CustomerPortal/InvoicePdfController.php
index 1e02df65..a0708002 100644
--- a/app/Http/Controllers/CustomerPortal/InvoicePdfController.php
+++ b/app/Domains/Sales/Http/Controllers/CustomerPortal/InvoicePdfController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal;
+namespace App\Domains\Sales\Http\Controllers\CustomerPortal;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\Customer\InvoiceResource as CustomerInvoiceResource;
-use App\Mail\InvoiceViewedMail;
-use App\Models\CompanySetting;
-use App\Models\Customer;
-use App\Models\EmailLog;
-use App\Models\Invoice;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Http\Resources\CustomerPortal\InvoiceResource as CustomerInvoiceResource;
+use App\Domains\Sales\Mail\InvoiceViewedMail;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Http\Controller;
+use App\Platform\Mail\Models\EmailLog;
 use Illuminate\Http\Request;
 
 class InvoicePdfController extends Controller
diff --git a/app/Http/Controllers/CustomerPortal/Invoice/InvoicesController.php b/app/Domains/Sales/Http/Controllers/CustomerPortal/InvoicesController.php
similarity index 85%
rename from app/Http/Controllers/CustomerPortal/Invoice/InvoicesController.php
rename to app/Domains/Sales/Http/Controllers/CustomerPortal/InvoicesController.php
index 5d157056..4e6f3d0e 100644
--- a/app/Http/Controllers/CustomerPortal/Invoice/InvoicesController.php
+++ b/app/Domains/Sales/Http/Controllers/CustomerPortal/InvoicesController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\CustomerPortal\Invoice;
+namespace App\Domains\Sales\Http\Controllers\CustomerPortal;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\Customer\InvoiceResource;
-use App\Models\Company;
-use App\Models\Invoice;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Sales\Http\Resources\CustomerPortal\InvoiceResource;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Domains/Sales/Http/Controllers/DocumentPdfController.php b/app/Domains/Sales/Http/Controllers/DocumentPdfController.php
new file mode 100644
index 00000000..d2f3d0e0
--- /dev/null
+++ b/app/Domains/Sales/Http/Controllers/DocumentPdfController.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Domains\Sales\Http\Controllers;
+
+use App\Domains\Sales\Application\EstimateService;
+use App\Domains\Sales\Application\InvoiceService;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Http\Controller;
+use Illuminate\Http\Request;
+
+class DocumentPdfController extends Controller
+{
+    public function __construct(
+        private readonly InvoiceService $invoiceService,
+        private readonly EstimateService $estimateService,
+    ) {}
+
+    public function invoice(Request $request, Invoice $invoice)
+    {
+        if ($request->has('preview')) {
+            return $this->invoiceService->getPdfData($invoice);
+        }
+
+        return $invoice->getGeneratedPDFOrStream('invoice');
+    }
+
+    public function estimate(Request $request, Estimate $estimate)
+    {
+        if ($request->has('preview')) {
+            return $this->estimateService->getPdfData($estimate);
+        }
+
+        return $estimate->getGeneratedPDFOrStream('estimate');
+    }
+}
diff --git a/app/Http/Requests/ChangeInvoiceStatusRequest.php b/app/Domains/Sales/Http/Requests/ChangeInvoiceStatusRequest.php
similarity index 88%
rename from app/Http/Requests/ChangeInvoiceStatusRequest.php
rename to app/Domains/Sales/Http/Requests/ChangeInvoiceStatusRequest.php
index 534303ed..37e2e49f 100644
--- a/app/Http/Requests/ChangeInvoiceStatusRequest.php
+++ b/app/Domains/Sales/Http/Requests/ChangeInvoiceStatusRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Sales\Http\Requests;
 
-use App\Models\Invoice;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Http/Requests/CreateCreditNoteRequest.php b/app/Domains/Sales/Http/Requests/CreateCreditNoteRequest.php
similarity index 98%
rename from app/Http/Requests/CreateCreditNoteRequest.php
rename to app/Domains/Sales/Http/Requests/CreateCreditNoteRequest.php
index e2066b49..7efbbd04 100644
--- a/app/Http/Requests/CreateCreditNoteRequest.php
+++ b/app/Domains/Sales/Http/Requests/CreateCreditNoteRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Sales\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/DeleteEstimatesRequest.php b/app/Domains/Sales/Http/Requests/DeleteEstimatesRequest.php
similarity index 93%
rename from app/Http/Requests/DeleteEstimatesRequest.php
rename to app/Domains/Sales/Http/Requests/DeleteEstimatesRequest.php
index b94fbb6d..197cb182 100644
--- a/app/Http/Requests/DeleteEstimatesRequest.php
+++ b/app/Domains/Sales/Http/Requests/DeleteEstimatesRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Sales\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/DeleteInvoiceRequest.php b/app/Domains/Sales/Http/Requests/DeleteInvoiceRequest.php
similarity index 91%
rename from app/Http/Requests/DeleteInvoiceRequest.php
rename to app/Domains/Sales/Http/Requests/DeleteInvoiceRequest.php
index 0ddf09ff..f74e93dc 100644
--- a/app/Http/Requests/DeleteInvoiceRequest.php
+++ b/app/Domains/Sales/Http/Requests/DeleteInvoiceRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Sales\Http\Requests;
 
-use App\Models\Invoice;
+use App\Domains\Sales\Models\Invoice;
 use App\Rules\CreditNoteDeletedTogether;
 use App\Rules\RelationNotExist;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Requests/EstimatesRequest.php b/app/Domains/Sales/Http/Requests/EstimatesRequest.php
similarity index 95%
rename from app/Http/Requests/EstimatesRequest.php
rename to app/Domains/Sales/Http/Requests/EstimatesRequest.php
index 333802bb..69742064 100644
--- a/app/Http/Requests/EstimatesRequest.php
+++ b/app/Domains/Sales/Http/Requests/EstimatesRequest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Sales\Http\Requests;
 
-use App\Models\CompanySetting;
-use App\Models\Customer;
-use App\Models\Estimate;
-use App\Rules\PdfTemplateExists;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\Estimate;
+use App\Platform\Pdf\Rules\PdfTemplateExists;
 use App\Support\DocumentTotals;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/InvoicesRequest.php b/app/Domains/Sales/Http/Requests/InvoicesRequest.php
similarity index 96%
rename from app/Http/Requests/InvoicesRequest.php
rename to app/Domains/Sales/Http/Requests/InvoicesRequest.php
index 2a085cb3..73524e6c 100644
--- a/app/Http/Requests/InvoicesRequest.php
+++ b/app/Domains/Sales/Http/Requests/InvoicesRequest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Sales\Http\Requests;
 
-use App\Models\CompanySetting;
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Rules\PdfTemplateExists;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Pdf\Rules\PdfTemplateExists;
 use App\Support\DocumentTotals;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/RecurringInvoiceRequest.php b/app/Domains/Sales/Http/Requests/RecurringInvoiceRequest.php
similarity index 96%
rename from app/Http/Requests/RecurringInvoiceRequest.php
rename to app/Domains/Sales/Http/Requests/RecurringInvoiceRequest.php
index ebb025d6..fa6c1e8b 100644
--- a/app/Http/Requests/RecurringInvoiceRequest.php
+++ b/app/Domains/Sales/Http/Requests/RecurringInvoiceRequest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Sales\Http\Requests;
 
-use App\Models\CompanySetting;
-use App\Models\Customer;
-use App\Models\RecurringInvoice;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\RecurringInvoice;
 use App\Support\DocumentTotals;
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/SendEstimatesRequest.php b/app/Domains/Sales/Http/Requests/SendEstimatesRequest.php
similarity index 94%
rename from app/Http/Requests/SendEstimatesRequest.php
rename to app/Domains/Sales/Http/Requests/SendEstimatesRequest.php
index 45163e0b..93bc6ccc 100644
--- a/app/Http/Requests/SendEstimatesRequest.php
+++ b/app/Domains/Sales/Http/Requests/SendEstimatesRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Sales\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/SendInvoiceRequest.php b/app/Domains/Sales/Http/Requests/SendInvoiceRequest.php
similarity index 94%
rename from app/Http/Requests/SendInvoiceRequest.php
rename to app/Domains/Sales/Http/Requests/SendInvoiceRequest.php
index a5f72a6c..5e2a5f60 100644
--- a/app/Http/Requests/SendInvoiceRequest.php
+++ b/app/Domains/Sales/Http/Requests/SendInvoiceRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Sales\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Resources/CreditNoteResource.php b/app/Domains/Sales/Http/Resources/CreditNoteResource.php
similarity index 97%
rename from app/Http/Resources/CreditNoteResource.php
rename to app/Domains/Sales/Http/Resources/CreditNoteResource.php
index 43fce473..f5b23075 100644
--- a/app/Http/Resources/CreditNoteResource.php
+++ b/app/Domains/Sales/Http/Resources/CreditNoteResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Sales\Http\Resources;
 
 /**
  * API representation of a credit note (Stornorechnung).
diff --git a/app/Http/Resources/EstimateCollection.php b/app/Domains/Sales/Http/Resources/CustomerPortal/EstimateCollection.php
similarity index 85%
rename from app/Http/Resources/EstimateCollection.php
rename to app/Domains/Sales/Http/Resources/CustomerPortal/EstimateCollection.php
index 2427e29c..e7be6c23 100644
--- a/app/Http/Resources/EstimateCollection.php
+++ b/app/Domains/Sales/Http/Resources/CustomerPortal/EstimateCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Sales\Http\Resources\CustomerPortal;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/app/Http/Resources/EstimateItemCollection.php b/app/Domains/Sales/Http/Resources/CustomerPortal/EstimateItemCollection.php
similarity index 86%
rename from app/Http/Resources/EstimateItemCollection.php
rename to app/Domains/Sales/Http/Resources/CustomerPortal/EstimateItemCollection.php
index 35ab5a12..26f4075e 100644
--- a/app/Http/Resources/EstimateItemCollection.php
+++ b/app/Domains/Sales/Http/Resources/CustomerPortal/EstimateItemCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Sales\Http\Resources\CustomerPortal;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/app/Http/Resources/Customer/EstimateItemResource.php b/app/Domains/Sales/Http/Resources/CustomerPortal/EstimateItemResource.php
similarity index 87%
rename from app/Http/Resources/Customer/EstimateItemResource.php
rename to app/Domains/Sales/Http/Resources/CustomerPortal/EstimateItemResource.php
index 3841dce9..f2dd9621 100644
--- a/app/Http/Resources/Customer/EstimateItemResource.php
+++ b/app/Domains/Sales/Http/Resources/CustomerPortal/EstimateItemResource.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Sales\Http\Resources\CustomerPortal;
 
+use App\Domains\Metadata\Http\Resources\CustomerPortal\CustomFieldValueResource;
+use App\Domains\Taxation\Http\Resources\CustomerPortal\TaxResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/Customer/EstimateResource.php b/app/Domains/Sales/Http/Resources/CustomerPortal/EstimateResource.php
similarity index 86%
rename from app/Http/Resources/Customer/EstimateResource.php
rename to app/Domains/Sales/Http/Resources/CustomerPortal/EstimateResource.php
index a8172cc2..7d907bd3 100644
--- a/app/Http/Resources/Customer/EstimateResource.php
+++ b/app/Domains/Sales/Http/Resources/CustomerPortal/EstimateResource.php
@@ -1,7 +1,12 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Sales\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\CompanyResource;
+use App\Domains\Contacts\Http\Resources\CustomerPortal\CustomerResource;
+use App\Domains\Metadata\Http\Resources\CustomerPortal\CustomFieldValueResource;
+use App\Domains\Money\Http\Resources\CustomerPortal\CurrencyResource;
+use App\Domains\Taxation\Http\Resources\CustomerPortal\TaxResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/InvoiceCollection.php b/app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceCollection.php
similarity index 85%
rename from app/Http/Resources/InvoiceCollection.php
rename to app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceCollection.php
index 822003cb..9e730054 100644
--- a/app/Http/Resources/InvoiceCollection.php
+++ b/app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Sales\Http\Resources\CustomerPortal;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/app/Http/Resources/InvoiceItemCollection.php b/app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceItemCollection.php
similarity index 86%
rename from app/Http/Resources/InvoiceItemCollection.php
rename to app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceItemCollection.php
index dd2599b9..2dce0a66 100644
--- a/app/Http/Resources/InvoiceItemCollection.php
+++ b/app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceItemCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Sales\Http\Resources\CustomerPortal;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/app/Http/Resources/Customer/InvoiceItemResource.php b/app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceItemResource.php
similarity index 88%
rename from app/Http/Resources/Customer/InvoiceItemResource.php
rename to app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceItemResource.php
index 370ca3ad..2783cb4a 100644
--- a/app/Http/Resources/Customer/InvoiceItemResource.php
+++ b/app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceItemResource.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Sales\Http\Resources\CustomerPortal;
 
+use App\Domains\Metadata\Http\Resources\CustomerPortal\CustomFieldValueResource;
+use App\Domains\Taxation\Http\Resources\CustomerPortal\TaxResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/Customer/InvoiceResource.php b/app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceResource.php
similarity index 88%
rename from app/Http/Resources/Customer/InvoiceResource.php
rename to app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceResource.php
index 028853f7..30dcb1d5 100644
--- a/app/Http/Resources/Customer/InvoiceResource.php
+++ b/app/Domains/Sales/Http/Resources/CustomerPortal/InvoiceResource.php
@@ -1,7 +1,12 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Sales\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\CompanyResource;
+use App\Domains\Contacts\Http\Resources\CustomerPortal\CustomerResource;
+use App\Domains\Metadata\Http\Resources\CustomerPortal\CustomFieldValueResource;
+use App\Domains\Money\Http\Resources\CustomerPortal\CurrencyResource;
+use App\Domains\Taxation\Http\Resources\CustomerPortal\TaxResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/Customer/EstimateCollection.php b/app/Domains/Sales/Http/Resources/EstimateCollection.php
similarity index 89%
rename from app/Http/Resources/Customer/EstimateCollection.php
rename to app/Domains/Sales/Http/Resources/EstimateCollection.php
index d6d42c06..48f1e48a 100644
--- a/app/Http/Resources/Customer/EstimateCollection.php
+++ b/app/Domains/Sales/Http/Resources/EstimateCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Sales\Http\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/app/Http/Resources/Customer/EstimateItemCollection.php b/app/Domains/Sales/Http/Resources/EstimateItemCollection.php
similarity index 89%
rename from app/Http/Resources/Customer/EstimateItemCollection.php
rename to app/Domains/Sales/Http/Resources/EstimateItemCollection.php
index c12139fc..be633ab5 100644
--- a/app/Http/Resources/Customer/EstimateItemCollection.php
+++ b/app/Domains/Sales/Http/Resources/EstimateItemCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Sales\Http\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/app/Http/Resources/EstimateItemResource.php b/app/Domains/Sales/Http/Resources/EstimateItemResource.php
similarity index 90%
rename from app/Http/Resources/EstimateItemResource.php
rename to app/Domains/Sales/Http/Resources/EstimateItemResource.php
index d8bfaecd..efd11537 100644
--- a/app/Http/Resources/EstimateItemResource.php
+++ b/app/Domains/Sales/Http/Resources/EstimateItemResource.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Sales\Http\Resources;
 
+use App\Domains\Metadata\Http\Resources\CustomFieldValueResource;
+use App\Domains\Taxation\Http\Resources\TaxResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/EstimateResource.php b/app/Domains/Sales/Http/Resources/EstimateResource.php
similarity index 88%
rename from app/Http/Resources/EstimateResource.php
rename to app/Domains/Sales/Http/Resources/EstimateResource.php
index c77b937f..269f5ca4 100644
--- a/app/Http/Resources/EstimateResource.php
+++ b/app/Domains/Sales/Http/Resources/EstimateResource.php
@@ -1,7 +1,13 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Sales\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Accounts\Http\Resources\UserResource;
+use App\Domains\Contacts\Http\Resources\CustomerResource;
+use App\Domains\Metadata\Http\Resources\CustomFieldValueResource;
+use App\Domains\Money\Http\Resources\CurrencyResource;
+use App\Domains\Taxation\Http\Resources\TaxResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/Customer/InvoiceCollection.php b/app/Domains/Sales/Http/Resources/InvoiceCollection.php
similarity index 89%
rename from app/Http/Resources/Customer/InvoiceCollection.php
rename to app/Domains/Sales/Http/Resources/InvoiceCollection.php
index 1484c0a7..2e596c16 100644
--- a/app/Http/Resources/Customer/InvoiceCollection.php
+++ b/app/Domains/Sales/Http/Resources/InvoiceCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Sales\Http\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/app/Http/Resources/Customer/InvoiceItemCollection.php b/app/Domains/Sales/Http/Resources/InvoiceItemCollection.php
similarity index 89%
rename from app/Http/Resources/Customer/InvoiceItemCollection.php
rename to app/Domains/Sales/Http/Resources/InvoiceItemCollection.php
index 1f714f55..ec1af186 100644
--- a/app/Http/Resources/Customer/InvoiceItemCollection.php
+++ b/app/Domains/Sales/Http/Resources/InvoiceItemCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Sales\Http\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/app/Http/Resources/InvoiceItemResource.php b/app/Domains/Sales/Http/Resources/InvoiceItemResource.php
similarity index 90%
rename from app/Http/Resources/InvoiceItemResource.php
rename to app/Domains/Sales/Http/Resources/InvoiceItemResource.php
index 33145fc4..68456455 100644
--- a/app/Http/Resources/InvoiceItemResource.php
+++ b/app/Domains/Sales/Http/Resources/InvoiceItemResource.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Sales\Http\Resources;
 
+use App\Domains\Metadata\Http\Resources\CustomFieldValueResource;
+use App\Domains\Taxation\Http\Resources\TaxResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/InvoiceResource.php b/app/Domains/Sales/Http/Resources/InvoiceResource.php
similarity index 95%
rename from app/Http/Resources/InvoiceResource.php
rename to app/Domains/Sales/Http/Resources/InvoiceResource.php
index b250a7da..fdba9890 100644
--- a/app/Http/Resources/InvoiceResource.php
+++ b/app/Domains/Sales/Http/Resources/InvoiceResource.php
@@ -1,7 +1,13 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Sales\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Accounts\Http\Resources\UserResource;
+use App\Domains\Contacts\Http\Resources\CustomerResource;
+use App\Domains\Metadata\Http\Resources\CustomFieldValueResource;
+use App\Domains\Money\Http\Resources\CurrencyResource;
+use App\Domains\Taxation\Http\Resources\TaxResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/RecurringInvoiceCollection.php b/app/Domains/Sales/Http/Resources/RecurringInvoiceCollection.php
similarity index 89%
rename from app/Http/Resources/RecurringInvoiceCollection.php
rename to app/Domains/Sales/Http/Resources/RecurringInvoiceCollection.php
index b5a29e1a..8ef50c61 100644
--- a/app/Http/Resources/RecurringInvoiceCollection.php
+++ b/app/Domains/Sales/Http/Resources/RecurringInvoiceCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Sales\Http\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/app/Http/Resources/RecurringInvoiceResource.php b/app/Domains/Sales/Http/Resources/RecurringInvoiceResource.php
similarity index 89%
rename from app/Http/Resources/RecurringInvoiceResource.php
rename to app/Domains/Sales/Http/Resources/RecurringInvoiceResource.php
index 4c182b67..f240339d 100644
--- a/app/Http/Resources/RecurringInvoiceResource.php
+++ b/app/Domains/Sales/Http/Resources/RecurringInvoiceResource.php
@@ -1,7 +1,13 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Sales\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Accounts\Http\Resources\UserResource;
+use App\Domains\Contacts\Http\Resources\CustomerResource;
+use App\Domains\Metadata\Http\Resources\CustomFieldValueResource;
+use App\Domains\Money\Http\Resources\CurrencyResource;
+use App\Domains\Taxation\Http\Resources\TaxResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Jobs/GenerateEstimatePdfJob.php b/app/Domains/Sales/Jobs/GenerateEstimatePdfJob.php
similarity index 96%
rename from app/Jobs/GenerateEstimatePdfJob.php
rename to app/Domains/Sales/Jobs/GenerateEstimatePdfJob.php
index 8c2e0daa..2e468eef 100644
--- a/app/Jobs/GenerateEstimatePdfJob.php
+++ b/app/Domains/Sales/Jobs/GenerateEstimatePdfJob.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Domains\Sales\Jobs;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/GenerateInvoicePdfJob.php b/app/Domains/Sales/Jobs/GenerateInvoicePdfJob.php
similarity index 96%
rename from app/Jobs/GenerateInvoicePdfJob.php
rename to app/Domains/Sales/Jobs/GenerateInvoicePdfJob.php
index 04edd7a3..fd1560fc 100644
--- a/app/Jobs/GenerateInvoicePdfJob.php
+++ b/app/Domains/Sales/Jobs/GenerateInvoicePdfJob.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Domains\Sales\Jobs;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Mail/EstimateViewedMail.php b/app/Domains/Sales/Mail/EstimateViewedMail.php
similarity index 95%
rename from app/Mail/EstimateViewedMail.php
rename to app/Domains/Sales/Mail/EstimateViewedMail.php
index b9e1bfe9..b99acfc7 100644
--- a/app/Mail/EstimateViewedMail.php
+++ b/app/Domains/Sales/Mail/EstimateViewedMail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Mail;
+namespace App\Domains\Sales\Mail;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
diff --git a/app/Mail/InvoiceViewedMail.php b/app/Domains/Sales/Mail/InvoiceViewedMail.php
similarity index 95%
rename from app/Mail/InvoiceViewedMail.php
rename to app/Domains/Sales/Mail/InvoiceViewedMail.php
index a43b8662..0dfccb4c 100644
--- a/app/Mail/InvoiceViewedMail.php
+++ b/app/Domains/Sales/Mail/InvoiceViewedMail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Mail;
+namespace App\Domains\Sales\Mail;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
diff --git a/app/Mail/SendCreditNoteMail.php b/app/Domains/Sales/Mail/SendCreditNoteMail.php
similarity index 81%
rename from app/Mail/SendCreditNoteMail.php
rename to app/Domains/Sales/Mail/SendCreditNoteMail.php
index 1ef7ec60..5889d7d8 100644
--- a/app/Mail/SendCreditNoteMail.php
+++ b/app/Domains/Sales/Mail/SendCreditNoteMail.php
@@ -1,10 +1,12 @@
 <?php
 
-namespace App\Mail;
+namespace App\Domains\Sales\Mail;
 
+use App\Domains\Sales\Models\Invoice;
 use App\Facades\Hashids;
-use App\Models\EmailLog;
-use App\Models\Invoice;
+use App\Platform\Mail\Models\EmailLog;
+use App\Platform\Persistence\ModelIdentityMap;
+use App\Support\Hashids\HashidConnection;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
@@ -37,11 +39,11 @@ class SendCreditNoteMail extends Mailable
             'bcc' => $this->data['bcc'] ?? null,
             'subject' => $this->data['subject'],
             'body' => $this->data['body'],
-            'mailable_type' => Invoice::class,
+            'mailable_type' => ModelIdentityMap::aliasFor(Invoice::class),
             'mailable_id' => $this->data['invoice']['id'],
         ]);
 
-        $log->token = Hashids::connection(EmailLog::class)->encode($log->id);
+        $log->token = Hashids::connection(HashidConnection::EmailLog->value)->encode($log->id);
         $log->save();
 
         $this->data['url'] = route('invoice', ['email_log' => $log->token]);
diff --git a/app/Mail/SendEstimateMail.php b/app/Domains/Sales/Mail/SendEstimateMail.php
similarity index 79%
rename from app/Mail/SendEstimateMail.php
rename to app/Domains/Sales/Mail/SendEstimateMail.php
index 6cff44e5..a4e25f4b 100644
--- a/app/Mail/SendEstimateMail.php
+++ b/app/Domains/Sales/Mail/SendEstimateMail.php
@@ -1,10 +1,12 @@
 <?php
 
-namespace App\Mail;
+namespace App\Domains\Sales\Mail;
 
+use App\Domains\Sales\Models\Estimate;
 use App\Facades\Hashids;
-use App\Models\EmailLog;
-use App\Models\Estimate;
+use App\Platform\Mail\Models\EmailLog;
+use App\Platform\Persistence\ModelIdentityMap;
+use App\Support\Hashids\HashidConnection;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
@@ -40,11 +42,11 @@ class SendEstimateMail extends Mailable
             'bcc' => $this->data['bcc'] ?? null,
             'subject' => $this->data['subject'],
             'body' => $this->data['body'],
-            'mailable_type' => Estimate::class,
+            'mailable_type' => ModelIdentityMap::aliasFor(Estimate::class),
             'mailable_id' => $this->data['estimate']['id'],
         ]);
 
-        $log->token = Hashids::connection(EmailLog::class)->encode($log->id);
+        $log->token = Hashids::connection(HashidConnection::EmailLog->value)->encode($log->id);
         $log->save();
 
         $this->data['url'] = route('estimate', ['email_log' => $log->token]);
diff --git a/app/Mail/SendInvoiceMail.php b/app/Domains/Sales/Mail/SendInvoiceMail.php
similarity index 79%
rename from app/Mail/SendInvoiceMail.php
rename to app/Domains/Sales/Mail/SendInvoiceMail.php
index 2f6bec6d..e9dccbab 100644
--- a/app/Mail/SendInvoiceMail.php
+++ b/app/Domains/Sales/Mail/SendInvoiceMail.php
@@ -1,10 +1,12 @@
 <?php
 
-namespace App\Mail;
+namespace App\Domains\Sales\Mail;
 
+use App\Domains\Sales\Models\Invoice;
 use App\Facades\Hashids;
-use App\Models\EmailLog;
-use App\Models\Invoice;
+use App\Platform\Mail\Models\EmailLog;
+use App\Platform\Persistence\ModelIdentityMap;
+use App\Support\Hashids\HashidConnection;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
@@ -40,11 +42,11 @@ class SendInvoiceMail extends Mailable
             'bcc' => $this->data['bcc'] ?? null,
             'subject' => $this->data['subject'],
             'body' => $this->data['body'],
-            'mailable_type' => Invoice::class,
+            'mailable_type' => ModelIdentityMap::aliasFor(Invoice::class),
             'mailable_id' => $this->data['invoice']['id'],
         ]);
 
-        $log->token = Hashids::connection(EmailLog::class)->encode($log->id);
+        $log->token = Hashids::connection(HashidConnection::EmailLog->value)->encode($log->id);
         $log->save();
 
         $this->data['url'] = route('invoice', ['email_log' => $log->token]);
diff --git a/app/Models/Estimate.php b/app/Domains/Sales/Models/Estimate.php
similarity index 92%
rename from app/Models/Estimate.php
rename to app/Domains/Sales/Models/Estimate.php
index a815c945..fdb39d4c 100644
--- a/app/Models/Estimate.php
+++ b/app/Domains/Sales/Models/Estimate.php
@@ -1,13 +1,20 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Sales\Models;
 
-use App\Services\Document\EstimateService;
-use App\Support\Pdf\PdfHtmlSanitizer;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Concerns\HasCustomFields;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Sales\Contracts\EstimatePdfDataProvider;
+use App\Domains\Taxation\Models\Tax;
+use App\Platform\Mail\Models\EmailLog;
+use App\Platform\Pdf\Concerns\GeneratesPdf;
+use App\Platform\Pdf\Rendering\PdfHtmlSanitizer;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use App\Support\SafeOrderBy;
-use App\Traits\GeneratesPdfTrait;
-use App\Traits\HasCustomFieldsTrait;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -20,8 +27,10 @@ use Spatie\MediaLibrary\InteractsWithMedia;
 
 class Estimate extends Model implements HasMedia
 {
-    use GeneratesPdfTrait;
-    use HasCustomFieldsTrait;
+    protected $table = 'estimates';
+
+    use GeneratesPdf;
+    use HasCustomFields;
     use HasFactory;
     use InteractsWithMedia;
 
@@ -72,7 +81,7 @@ class Estimate extends Model implements HasMedia
 
     public function emailLogs(): MorphMany
     {
-        return $this->morphMany('App\Models\EmailLog', 'mailable');
+        return $this->morphMany(EmailLog::class, 'mailable');
     }
 
     public function items(): HasMany
@@ -216,7 +225,7 @@ class Estimate extends Model implements HasMedia
 
     public function getPDFData(): mixed
     {
-        return app(EstimateService::class)->getPdfData($this);
+        return app(EstimatePdfDataProvider::class)->getPdfData($this);
     }
 
     public function getCompanyAddress(): string|false
diff --git a/app/Models/EstimateItem.php b/app/Domains/Sales/Models/EstimateItem.php
similarity index 82%
rename from app/Models/EstimateItem.php
rename to app/Domains/Sales/Models/EstimateItem.php
index 516e85d9..d98d5ba4 100644
--- a/app/Models/EstimateItem.php
+++ b/app/Domains/Sales/Models/EstimateItem.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Sales\Models;
 
-use App\Traits\HasCustomFieldsTrait;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Metadata\Concerns\HasCustomFields;
+use App\Domains\Taxation\Models\Tax;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -11,7 +13,9 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class EstimateItem extends Model
 {
-    use HasCustomFieldsTrait;
+    protected $table = 'estimate_items';
+
+    use HasCustomFields;
     use HasFactory;
 
     protected $guarded = [
diff --git a/app/Models/Invoice.php b/app/Domains/Sales/Models/Invoice.php
similarity index 94%
rename from app/Models/Invoice.php
rename to app/Domains/Sales/Models/Invoice.php
index a4728ab1..5fc01ac8 100644
--- a/app/Models/Invoice.php
+++ b/app/Domains/Sales/Models/Invoice.php
@@ -1,13 +1,23 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Sales\Models;
 
-use App\Services\Document\InvoiceService;
-use App\Support\Pdf\PdfHtmlSanitizer;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Concerns\HasCustomFields;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Receivables\Models\Transaction;
+use App\Domains\Sales\Contracts\InvoicePdfDataProvider;
+use App\Domains\Taxation\Models\Tax;
+use App\Platform\Mail\Models\EmailLog;
+use App\Platform\Pdf\Concerns\GeneratesPdf;
+use App\Platform\Pdf\Rendering\PdfHtmlSanitizer;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use App\Support\SafeOrderBy;
-use App\Traits\GeneratesPdfTrait;
-use App\Traits\HasCustomFieldsTrait;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -22,8 +32,10 @@ use Spatie\MediaLibrary\InteractsWithMedia;
 
 class Invoice extends Model implements HasMedia
 {
-    use GeneratesPdfTrait;
-    use HasCustomFieldsTrait;
+    protected $table = 'invoices';
+
+    use GeneratesPdf;
+    use HasCustomFields;
     use HasFactory;
     use InteractsWithMedia;
 
@@ -84,7 +96,7 @@ class Invoice extends Model implements HasMedia
 
     public function emailLogs(): MorphMany
     {
-        return $this->morphMany('App\Models\EmailLog', 'mailable');
+        return $this->morphMany(EmailLog::class, 'mailable');
     }
 
     public function items(): HasMany
@@ -384,7 +396,7 @@ class Invoice extends Model implements HasMedia
 
     public function getPDFData(): mixed
     {
-        return app(InvoiceService::class)->getPdfData($this);
+        return app(InvoicePdfDataProvider::class)->getPdfData($this);
     }
 
     public function getEmailAttachmentSetting(): bool
diff --git a/app/Models/InvoiceItem.php b/app/Domains/Sales/Models/InvoiceItem.php
similarity index 90%
rename from app/Models/InvoiceItem.php
rename to app/Domains/Sales/Models/InvoiceItem.php
index 39755414..dc4ecbde 100644
--- a/app/Models/InvoiceItem.php
+++ b/app/Domains/Sales/Models/InvoiceItem.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Sales\Models;
 
-use App\Traits\HasCustomFieldsTrait;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Metadata\Concerns\HasCustomFields;
+use App\Domains\Taxation\Models\Tax;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -13,7 +15,9 @@ use Illuminate\Support\Facades\DB;
 
 class InvoiceItem extends Model
 {
-    use HasCustomFieldsTrait;
+    protected $table = 'invoice_items';
+
+    use HasCustomFields;
     use HasFactory;
 
     protected $guarded = [
diff --git a/app/Models/RecurringInvoice.php b/app/Domains/Sales/Models/RecurringInvoice.php
similarity index 93%
rename from app/Models/RecurringInvoice.php
rename to app/Domains/Sales/Models/RecurringInvoice.php
index 2b8297ab..fda157c7 100644
--- a/app/Models/RecurringInvoice.php
+++ b/app/Domains/Sales/Models/RecurringInvoice.php
@@ -1,9 +1,15 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Sales\Models;
 
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Concerns\HasCustomFields;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Taxation\Models\Tax;
 use App\Support\SafeOrderBy;
-use App\Traits\HasCustomFieldsTrait;
 use Carbon\Carbon;
 use Cron;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -13,7 +19,9 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class RecurringInvoice extends Model
 {
-    use HasCustomFieldsTrait;
+    protected $table = 'recurring_invoices';
+
+    use HasCustomFields;
     use HasFactory;
 
     protected $guarded = [
diff --git a/app/Policies/CreditNotePolicy.php b/app/Domains/Sales/Policies/CreditNotePolicy.php
similarity index 88%
rename from app/Policies/CreditNotePolicy.php
rename to app/Domains/Sales/Policies/CreditNotePolicy.php
index 77d01a78..59f6c384 100644
--- a/app/Policies/CreditNotePolicy.php
+++ b/app/Domains/Sales/Policies/CreditNotePolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Sales\Policies;
 
-use App\Models\Invoice;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Policies/EstimatePolicy.php b/app/Domains/Sales/Policies/EstimatePolicy.php
similarity index 96%
rename from app/Policies/EstimatePolicy.php
rename to app/Domains/Sales/Policies/EstimatePolicy.php
index c0ff77f3..85a71d16 100644
--- a/app/Policies/EstimatePolicy.php
+++ b/app/Domains/Sales/Policies/EstimatePolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Sales\Policies;
 
-use App\Models\Estimate;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Sales\Models\Estimate;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Policies/InvoicePolicy.php b/app/Domains/Sales/Policies/InvoicePolicy.php
similarity index 95%
rename from app/Policies/InvoicePolicy.php
rename to app/Domains/Sales/Policies/InvoicePolicy.php
index 2615e05f..5d2b4cde 100644
--- a/app/Policies/InvoicePolicy.php
+++ b/app/Domains/Sales/Policies/InvoicePolicy.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Sales\Policies;
 
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Policies/RecurringInvoicePolicy.php b/app/Domains/Sales/Policies/RecurringInvoicePolicy.php
similarity index 96%
rename from app/Policies/RecurringInvoicePolicy.php
rename to app/Domains/Sales/Policies/RecurringInvoicePolicy.php
index 059ff953..805730a8 100644
--- a/app/Policies/RecurringInvoicePolicy.php
+++ b/app/Domains/Sales/Policies/RecurringInvoicePolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Sales\Policies;
 
-use App\Models\RecurringInvoice;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Sales\Models\RecurringInvoice;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Illuminate\Auth\Access\Response;
 use Silber\Bouncer\BouncerFacade;
diff --git a/app/Domains/Sales/SalesServiceProvider.php b/app/Domains/Sales/SalesServiceProvider.php
new file mode 100644
index 00000000..31a98fe8
--- /dev/null
+++ b/app/Domains/Sales/SalesServiceProvider.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Domains\Sales;
+
+use App\Adapters\Sales\LaravelEstimateEmailSender;
+use App\Adapters\Sales\LaravelInvoiceEmailSender;
+use App\Adapters\Sales\MoneyDocumentExchangeRateRecorder;
+use App\Domains\Sales\Application\EstimateService;
+use App\Domains\Sales\Application\InvoiceService;
+use App\Domains\Sales\Console\CheckEstimateStatus;
+use App\Domains\Sales\Console\CheckInvoiceStatus;
+use App\Domains\Sales\Contracts\DocumentExchangeRateRecorder;
+use App\Domains\Sales\Contracts\EstimateEmailSender;
+use App\Domains\Sales\Contracts\EstimatePdfDataProvider;
+use App\Domains\Sales\Contracts\InvoiceEmailSender;
+use App\Domains\Sales\Contracts\InvoicePdfDataProvider;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\RecurringInvoice;
+use App\Domains\Sales\Policies\CreditNotePolicy;
+use App\Domains\Sales\Policies\EstimatePolicy;
+use App\Domains\Sales\Policies\InvoicePolicy;
+use App\Domains\Sales\Policies\RecurringInvoicePolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+
+class SalesServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->bind(EstimatePdfDataProvider::class, EstimateService::class);
+        $this->app->bind(InvoicePdfDataProvider::class, InvoiceService::class);
+        $this->app->bind(DocumentExchangeRateRecorder::class, MoneyDocumentExchangeRateRecorder::class);
+        $this->app->bind(EstimateEmailSender::class, LaravelEstimateEmailSender::class);
+        $this->app->bind(InvoiceEmailSender::class, LaravelInvoiceEmailSender::class);
+    }
+
+    public function boot(): void
+    {
+        $this->commands([
+            CheckEstimateStatus::class,
+            CheckInvoiceStatus::class,
+        ]);
+
+        Gate::policy(Estimate::class, EstimatePolicy::class);
+        Gate::policy(Invoice::class, InvoicePolicy::class);
+        Gate::policy(RecurringInvoice::class, RecurringInvoicePolicy::class);
+        Gate::define('send invoice', [InvoicePolicy::class, 'send']);
+        Gate::define('create credit note', [CreditNotePolicy::class, 'create']);
+        Gate::define('send estimate', [EstimatePolicy::class, 'send']);
+        Gate::define('delete multiple invoices', [InvoicePolicy::class, 'deleteMultiple']);
+        Gate::define('delete multiple estimates', [EstimatePolicy::class, 'deleteMultiple']);
+        Gate::define('delete multiple recurring invoices', [RecurringInvoicePolicy::class, 'deleteMultiple']);
+    }
+}
diff --git a/app/Domains/Sales/routes/company.php b/app/Domains/Sales/routes/company.php
new file mode 100644
index 00000000..16ce67a0
--- /dev/null
+++ b/app/Domains/Sales/routes/company.php
@@ -0,0 +1,36 @@
+<?php
+
+use App\Domains\Sales\Http\Controllers\Company\EstimatesController;
+use App\Domains\Sales\Http\Controllers\Company\EstimateTemplatesController;
+use App\Domains\Sales\Http\Controllers\Company\InvoicesController;
+use App\Domains\Sales\Http\Controllers\Company\InvoiceTemplatesController;
+use App\Domains\Sales\Http\Controllers\Company\RecurringInvoiceController;
+use App\Domains\Sales\Http\Controllers\Company\RecurringInvoiceFrequencyController;
+use App\Domains\Sales\Http\Controllers\Company\SerialNumberController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/next-number', [SerialNumberController::class, 'nextNumber']);
+Route::get('/number-placeholders', [SerialNumberController::class, 'placeholders']);
+
+Route::get('/invoices/{invoice}/send/preview', [InvoicesController::class, 'sendPreview']);
+Route::post('/invoices/{invoice}/send', [InvoicesController::class, 'send']);
+Route::post('/invoices/{invoice}/clone', [InvoicesController::class, 'clone']);
+Route::post('/invoices/{invoice}/convert-to-estimate', [InvoicesController::class, 'convertToEstimate']);
+Route::post('/invoices/{invoice}/credit-note', [InvoicesController::class, 'createCreditNote']);
+Route::post('/invoices/{invoice}/status', [InvoicesController::class, 'changeStatus']);
+Route::post('/invoices/delete', [InvoicesController::class, 'delete']);
+Route::get('/invoices/templates', InvoiceTemplatesController::class);
+Route::apiResource('invoices', InvoicesController::class);
+
+Route::get('/recurring-invoice-frequency', RecurringInvoiceFrequencyController::class);
+Route::post('/recurring-invoices/delete', [RecurringInvoiceController::class, 'delete']);
+Route::apiResource('recurring-invoices', RecurringInvoiceController::class);
+
+Route::get('/estimates/{estimate}/send/preview', [EstimatesController::class, 'sendPreview']);
+Route::post('/estimates/{estimate}/send', [EstimatesController::class, 'send']);
+Route::post('/estimates/{estimate}/clone', [EstimatesController::class, 'clone']);
+Route::post('/estimates/{estimate}/status', [EstimatesController::class, 'changeStatus']);
+Route::post('/estimates/{estimate}/convert-to-invoice', [EstimatesController::class, 'convertToInvoice']);
+Route::get('/estimates/templates', EstimateTemplatesController::class);
+Route::post('/estimates/delete', [EstimatesController::class, 'delete']);
+Route::apiResource('estimates', EstimatesController::class);
diff --git a/app/Domains/Sales/routes/customer.php b/app/Domains/Sales/routes/customer.php
new file mode 100644
index 00000000..26b4462c
--- /dev/null
+++ b/app/Domains/Sales/routes/customer.php
@@ -0,0 +1,12 @@
+<?php
+
+use App\Domains\Sales\Http\Controllers\CustomerPortal\AcceptEstimateController;
+use App\Domains\Sales\Http\Controllers\CustomerPortal\EstimatesController;
+use App\Domains\Sales\Http\Controllers\CustomerPortal\InvoicesController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('invoices', [InvoicesController::class, 'index']);
+Route::get('invoices/{id}', [InvoicesController::class, 'show']);
+Route::post('/estimate/{estimate}/status', AcceptEstimateController::class);
+Route::get('estimates', [EstimatesController::class, 'index']);
+Route::get('estimates/{id}', [EstimatesController::class, 'show']);
diff --git a/app/Domains/Sales/routes/pdf.php b/app/Domains/Sales/routes/pdf.php
new file mode 100644
index 00000000..4af76a25
--- /dev/null
+++ b/app/Domains/Sales/routes/pdf.php
@@ -0,0 +1,7 @@
+<?php
+
+use App\Domains\Sales\Http\Controllers\DocumentPdfController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/invoices/pdf/{invoice:unique_hash}', [DocumentPdfController::class, 'invoice']);
+Route::get('/estimates/pdf/{estimate:unique_hash}', [DocumentPdfController::class, 'estimate']);
diff --git a/app/Domains/Sales/routes/public.php b/app/Domains/Sales/routes/public.php
new file mode 100644
index 00000000..e4c766b2
--- /dev/null
+++ b/app/Domains/Sales/routes/public.php
@@ -0,0 +1,10 @@
+<?php
+
+use App\Domains\Sales\Http\Controllers\CustomerPortal\EstimatePdfController;
+use App\Domains\Sales\Http\Controllers\CustomerPortal\InvoicePdfController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/invoices/{email_log:token}', [InvoicePdfController::class, 'getInvoice']);
+Route::get('/invoices/view/{email_log:token}', [InvoicePdfController::class, 'getPdf'])->name('invoice');
+Route::get('/estimates/{email_log:token}', [EstimatePdfController::class, 'getEstimate']);
+Route::get('/estimates/view/{email_log:token}', [EstimatePdfController::class, 'getPdf'])->name('estimate');
diff --git a/app/Http/Controllers/Company/Settings/TaxTypesController.php b/app/Domains/Taxation/Http/Controllers/TaxTypesController.php
similarity index 89%
rename from app/Http/Controllers/Company/Settings/TaxTypesController.php
rename to app/Domains/Taxation/Http/Controllers/TaxTypesController.php
index 0615dbdd..23ccded1 100644
--- a/app/Http/Controllers/Company/Settings/TaxTypesController.php
+++ b/app/Domains/Taxation/Http/Controllers/TaxTypesController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Company\Settings;
+namespace App\Domains\Taxation\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\TaxTypeRequest;
-use App\Http\Resources\TaxTypeResource;
-use App\Models\TaxType;
+use App\Domains\Taxation\Http\Requests\TaxTypeRequest;
+use App\Domains\Taxation\Http\Resources\TaxTypeResource;
+use App\Domains\Taxation\Models\TaxType;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
diff --git a/app/Http/Requests/TaxTypeRequest.php b/app/Domains/Taxation/Http/Requests/TaxTypeRequest.php
similarity index 96%
rename from app/Http/Requests/TaxTypeRequest.php
rename to app/Domains/Taxation/Http/Requests/TaxTypeRequest.php
index 3afbaeaa..72bbd978 100644
--- a/app/Http/Requests/TaxTypeRequest.php
+++ b/app/Domains/Taxation/Http/Requests/TaxTypeRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Domains\Taxation\Http\Requests;
 
-use App\Models\TaxType;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Http/Resources/Customer/TaxResource.php b/app/Domains/Taxation/Http/Resources/CustomerPortal/TaxResource.php
similarity index 91%
rename from app/Http/Resources/Customer/TaxResource.php
rename to app/Domains/Taxation/Http/Resources/CustomerPortal/TaxResource.php
index f995f916..1351b742 100644
--- a/app/Http/Resources/Customer/TaxResource.php
+++ b/app/Domains/Taxation/Http/Resources/CustomerPortal/TaxResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Taxation\Http\Resources\CustomerPortal;
 
+use App\Domains\Money\Http\Resources\CustomerPortal\CurrencyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/Customer/TaxTypeResource.php b/app/Domains/Taxation/Http/Resources/CustomerPortal/TaxTypeResource.php
similarity index 86%
rename from app/Http/Resources/Customer/TaxTypeResource.php
rename to app/Domains/Taxation/Http/Resources/CustomerPortal/TaxTypeResource.php
index e2a5f26b..19a13596 100644
--- a/app/Http/Resources/Customer/TaxTypeResource.php
+++ b/app/Domains/Taxation/Http/Resources/CustomerPortal/TaxTypeResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources\Customer;
+namespace App\Domains\Taxation\Http\Resources\CustomerPortal;
 
+use App\Domains\Accounts\Http\Resources\CustomerPortal\CompanyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/TaxResource.php b/app/Domains/Taxation/Http/Resources/TaxResource.php
similarity index 93%
rename from app/Http/Resources/TaxResource.php
rename to app/Domains/Taxation/Http/Resources/TaxResource.php
index 81c7b9ed..7d694b38 100644
--- a/app/Http/Resources/TaxResource.php
+++ b/app/Domains/Taxation/Http/Resources/TaxResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Taxation\Http\Resources;
 
+use App\Domains\Money\Http\Resources\CurrencyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Http/Resources/TaxTypeResource.php b/app/Domains/Taxation/Http/Resources/TaxTypeResource.php
similarity index 90%
rename from app/Http/Resources/TaxTypeResource.php
rename to app/Domains/Taxation/Http/Resources/TaxTypeResource.php
index 845cbd32..cac2518b 100644
--- a/app/Http/Resources/TaxTypeResource.php
+++ b/app/Domains/Taxation/Http/Resources/TaxTypeResource.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Domains\Taxation\Http\Resources;
 
+use App\Domains\Accounts\Http\Resources\CompanyResource;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/app/Models/Tax.php b/app/Domains/Taxation/Models/Tax.php
similarity index 90%
rename from app/Models/Tax.php
rename to app/Domains/Taxation/Models/Tax.php
index 6234390c..90834021 100644
--- a/app/Models/Tax.php
+++ b/app/Domains/Taxation/Models/Tax.php
@@ -1,7 +1,15 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Taxation\Models;
 
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\EstimateItem;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Sales\Models\RecurringInvoice;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -11,6 +19,8 @@ use Illuminate\Support\Facades\DB;
 
 class Tax extends Model
 {
+    protected $table = 'taxes';
+
     use HasFactory;
 
     protected $guarded = [
diff --git a/app/Models/TaxType.php b/app/Domains/Taxation/Models/TaxType.php
similarity index 96%
rename from app/Models/TaxType.php
rename to app/Domains/Taxation/Models/TaxType.php
index 9ee3c567..56bb1553 100644
--- a/app/Models/TaxType.php
+++ b/app/Domains/Taxation/Models/TaxType.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Models;
+namespace App\Domains\Taxation\Models;
 
+use App\Domains\Accounts\Models\Company;
 use App\Support\SafeOrderBy;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\Builder;
@@ -13,6 +14,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class TaxType extends Model
 {
+    protected $table = 'tax_types';
+
     use HasFactory;
 
     protected $guarded = [
diff --git a/app/Policies/TaxTypePolicy.php b/app/Domains/Taxation/Policies/TaxTypePolicy.php
similarity index 95%
rename from app/Policies/TaxTypePolicy.php
rename to app/Domains/Taxation/Policies/TaxTypePolicy.php
index f7c7a35e..e3609cb9 100644
--- a/app/Policies/TaxTypePolicy.php
+++ b/app/Domains/Taxation/Policies/TaxTypePolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Domains\Taxation\Policies;
 
-use App\Models\TaxType;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Domains/Taxation/TaxationServiceProvider.php b/app/Domains/Taxation/TaxationServiceProvider.php
new file mode 100644
index 00000000..7bccfcf4
--- /dev/null
+++ b/app/Domains/Taxation/TaxationServiceProvider.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Domains\Taxation;
+
+use App\Domains\Taxation\Models\TaxType;
+use App\Domains\Taxation\Policies\TaxTypePolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+
+class TaxationServiceProvider extends ServiceProvider
+{
+    public function boot(): void
+    {
+        Gate::policy(TaxType::class, TaxTypePolicy::class);
+    }
+}
diff --git a/app/Domains/Taxation/routes/company.php b/app/Domains/Taxation/routes/company.php
new file mode 100644
index 00000000..67741e19
--- /dev/null
+++ b/app/Domains/Taxation/routes/company.php
@@ -0,0 +1,6 @@
+<?php
+
+use App\Domains\Taxation\Http\Controllers\TaxTypesController;
+use Illuminate\Support\Facades\Route;
+
+Route::apiResource('tax-types', TaxTypesController::class);
diff --git a/app/Facades/Pdf.php b/app/Facades/Pdf.php
deleted file mode 100644
index 1f284454..00000000
--- a/app/Facades/Pdf.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Facades;
-
-use Illuminate\Support\Facades\Facade;
-
-/**
- * @method static \App\Support\Pdf\ResponseStream loadView(string $template, array $metadata = [], ?\App\Support\Pdf\PdfPageSetup $page = null)
- */
-class Pdf extends Facade
-{
-    protected static function getFacadeAccessor()
-    {
-        return 'pdf.driver';
-    }
-}
diff --git a/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php b/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php
deleted file mode 100644
index acc151d0..00000000
--- a/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin\Settings;
-
-use App\Http\Controllers\Controller;
-use App\Http\Requests\PDFConfigurationRequest;
-use App\Models\Setting;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Http\JsonResponse;
-
-class PDFConfigurationController extends Controller
-{
-    /**
-     * Driver-neutral page geometry. Each maps onto `pdf.page.*` in config, and is
-     * read and written for every driver rather than being nested under one.
-     */
-    private const PAGE_SETTINGS = [
-        'pdf_paper_width',
-        'pdf_paper_height',
-        'pdf_orientation',
-        'pdf_margin_top',
-        'pdf_margin_right',
-        'pdf_margin_bottom',
-        'pdf_margin_left',
-    ];
-
-    /**
-     * Stored in the same string-valued settings table, so kept apart from the
-     * lengths above: it needs an explicit cast in both directions rather than
-     * being passed through.
-     */
-    private const PAGE_BOOLEANS = [
-        'pdf_page_numbers',
-    ];
-
-    /**
-     * Returns the available drivers
-     *
-     * @throws AuthorizationException
-     */
-    public function getDrivers(): JsonResponse
-    {
-        $this->authorize('manage pdf config');
-
-        $drivers = [
-            'dompdf',
-            'gotenberg',
-        ];
-
-        return response()->json($drivers);
-    }
-
-    /**
-     * Return the PDF settings
-     *
-     * @throws AuthorizationException
-     */
-    public function getEnvironment(): JsonResponse
-    {
-        $this->authorize('manage pdf config');
-
-        $pdfSettings = Setting::getSettings(array_merge(
-            ['pdf_driver', 'gotenberg_host', 'gotenberg_pdfa'],
-            self::PAGE_SETTINGS,
-            self::PAGE_BOOLEANS,
-        ));
-
-        $config = [
-            'pdf_driver' => $pdfSettings['pdf_driver'] ?? config('pdf.driver'),
-            'gotenberg_host' => $pdfSettings['gotenberg_host'] ?? config('pdf.connections.gotenberg.host'),
-            'gotenberg_pdfa' => $pdfSettings['gotenberg_pdfa'] ?? config('pdf.connections.gotenberg.pdfa') ?? '',
-        ];
-
-        // Page geometry applies to whichever driver is selected, so it is always
-        // returned rather than nested under a driver branch.
-        foreach (self::PAGE_SETTINGS as $setting) {
-            $config[$setting] = $pdfSettings[$setting] ?? config(self::configKeyFor($setting));
-        }
-
-        foreach (self::PAGE_BOOLEANS as $setting) {
-            $config[$setting] = filter_var(
-                $pdfSettings[$setting] ?? config(self::configKeyFor($setting)),
-                FILTER_VALIDATE_BOOLEAN
-            );
-        }
-
-        return response()->json($config);
-    }
-
-    /**
-     * Saves the settings
-     *
-     * @throws AuthorizationException
-     */
-    public function saveEnvironment(PDFConfigurationRequest $request): JsonResponse
-    {
-        $this->authorize('manage pdf config');
-
-        // Prepare PDF settings for database storage
-        $pdfSettings = $this->preparePDFSettingsForDatabase($request);
-
-        // Save PDF settings to database
-        Setting::setSettings($pdfSettings);
-
-        return response()->json([
-            'success' => 'pdf_variables_save_successfully',
-        ]);
-    }
-
-    /**
-     * Prepare PDF settings for database storage
-     */
-    private function preparePDFSettingsForDatabase(PDFConfigurationRequest $request): array
-    {
-        $driver = $request->get('pdf_driver');
-
-        $settings = ['pdf_driver' => $driver];
-
-        // Page geometry is saved for every driver: switching between them should
-        // not lose the paper size, which is what happened while it was a
-        // Gotenberg-only setting.
-        foreach (self::PAGE_SETTINGS as $setting) {
-            $settings[$setting] = $request->get($setting);
-        }
-
-        // Only written when the form actually submitted it. Page numbers are a
-        // Gotenberg capability and the dompdf form does not render the control,
-        // so an unconditional write would clear the operator's choice every time
-        // they saved from the other driver.
-        foreach (self::PAGE_BOOLEANS as $setting) {
-            if ($request->has($setting)) {
-                $settings[$setting] = $request->boolean($setting) ? '1' : '0';
-            }
-        }
-
-        if ($driver === 'gotenberg') {
-            $settings['gotenberg_host'] = $request->get('gotenberg_host');
-            $settings['gotenberg_pdfa'] = $request->get('gotenberg_pdfa') ?? '';
-        }
-
-        return $settings;
-    }
-
-    /**
-     * Maps a settings key onto its config counterpart, e.g.
-     * `pdf_margin_top` -> `pdf.page.margin_top`.
-     */
-    private static function configKeyFor(string $setting): string
-    {
-        return 'pdf.page.'.substr($setting, strlen('pdf_'));
-    }
-}
diff --git a/app/Http/Controllers/Company/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Company/Auth/ConfirmPasswordController.php
deleted file mode 100644
index ac26a4f1..00000000
--- a/app/Http/Controllers/Company/Auth/ConfirmPasswordController.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Company\Auth;
-
-use App\Http\Controllers\Controller;
-use App\Providers\AppServiceProvider;
-use Illuminate\Foundation\Auth\ConfirmsPasswords;
-
-class ConfirmPasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Confirm Password Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password confirmations and
-    | uses a simple trait to include the behavior. You're free to explore
-    | this trait and override any functions that require customization.
-    |
-    */
-
-    use ConfirmsPasswords;
-
-    /**
-     * Where to redirect users when the intended url fails.
-     *
-     * @var string
-     */
-    protected $redirectTo = AppServiceProvider::HOME;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
-}
diff --git a/app/Http/Controllers/Company/Auth/RegisterController.php b/app/Http/Controllers/Company/Auth/RegisterController.php
deleted file mode 100644
index 5a222b63..00000000
--- a/app/Http/Controllers/Company/Auth/RegisterController.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Company\Auth;
-
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Providers\AppServiceProvider;
-use Illuminate\Foundation\Auth\RegistersUsers;
-use Illuminate\Support\Facades\Validator;
-
-class RegisterController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Register Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller handles the registration of new users as well as their
-    | validation and creation. By default this controller uses a trait to
-    | provide this functionality without requiring any additional code.
-    |
-    */
-
-    use RegistersUsers;
-
-    /**
-     * Where to redirect users after registration.
-     *
-     * @var string
-     */
-    protected $redirectTo = AppServiceProvider::HOME;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
-
-    /**
-     * Get a validator for an incoming registration request.
-     *
-     * @return \Illuminate\Contracts\Validation\Validator
-     */
-    protected function validator(array $data)
-    {
-        return Validator::make($data, [
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
-            'password' => ['required', 'string', 'min:8', 'confirmed'],
-        ]);
-    }
-
-    /**
-     * Create a new user instance after a valid registration.
-     *
-     * @return \App\User
-     */
-    protected function create(array $data)
-    {
-        $user = User::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => $data['password'],
-        ]);
-
-        $user->setSettings(['language' => 'default']);
-
-        return $user;
-    }
-}
diff --git a/app/Http/Controllers/Company/Auth/VerificationController.php b/app/Http/Controllers/Company/Auth/VerificationController.php
deleted file mode 100644
index 68ea2302..00000000
--- a/app/Http/Controllers/Company/Auth/VerificationController.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Company\Auth;
-
-use App\Http\Controllers\Controller;
-use App\Providers\AppServiceProvider;
-use Illuminate\Foundation\Auth\VerifiesEmails;
-
-class VerificationController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Email Verification Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling email verification for any
-    | user that recently registered with the application. Emails may also
-    | be re-sent if the user didn't receive the original email message.
-    |
-    */
-
-    use VerifiesEmails;
-
-    /**
-     * Where to redirect users after verification.
-     *
-     * @var string
-     */
-    protected $redirectTo = AppServiceProvider::HOME;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('auth');
-        $this->middleware('signed')->only('verify');
-        $this->middleware('throttle:6,1')->only('verify', 'resend');
-    }
-}
diff --git a/app/Http/Controllers/Company/Config/FiscalYearsController.php b/app/Http/Controllers/Company/Config/FiscalYearsController.php
deleted file mode 100644
index b2f0f8ad..00000000
--- a/app/Http/Controllers/Company/Config/FiscalYearsController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Company\Config;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-
-class FiscalYearsController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @return Response
-     */
-    public function __invoke(Request $request)
-    {
-        return response()->json([
-            'fiscal_years' => config('invoiceshelf.fiscal_years'),
-        ]);
-    }
-}
diff --git a/app/Http/Controllers/Company/Config/LanguagesController.php b/app/Http/Controllers/Company/Config/LanguagesController.php
deleted file mode 100644
index 6bcaa1bd..00000000
--- a/app/Http/Controllers/Company/Config/LanguagesController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Company\Config;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-
-class LanguagesController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @return Response
-     */
-    public function __invoke(Request $request)
-    {
-        return response()->json([
-            'languages' => config('invoiceshelf.languages'),
-        ]);
-    }
-}
diff --git a/app/Http/Controllers/Company/Config/RetrospectiveEditsController.php b/app/Http/Controllers/Company/Config/RetrospectiveEditsController.php
deleted file mode 100644
index fa2795c3..00000000
--- a/app/Http/Controllers/Company/Config/RetrospectiveEditsController.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Company\Config;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-
-class RetrospectiveEditsController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @return Response
-     */
-    public function __invoke(Request $request)
-    {
-        return response()->json([
-            'retrospective_edits' => config('invoiceshelf.retrospective_edits'),
-        ]);
-    }
-}
diff --git a/app/Http/Controllers/Company/Customer/CustomerStatsController.php b/app/Http/Controllers/Company/Customer/CustomerStatsController.php
deleted file mode 100644
index c646ee20..00000000
--- a/app/Http/Controllers/Company/Customer/CustomerStatsController.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Company\Customer;
-
-use App\Http\Controllers\Controller;
-use App\Http\Resources\CustomerResource;
-use App\Models\Customer;
-use App\Services\CustomerService;
-use App\Services\CustomerStatementService;
-use Illuminate\Http\Request;
-
-class CustomerStatsController extends Controller
-{
-    public function __construct(
-        private readonly CustomerService $customerService,
-        private readonly CustomerStatementService $customerStatementService,
-    ) {}
-
-    public function __invoke(Request $request, Customer $customer)
-    {
-        $this->authorize('view', $customer);
-
-        $chartData = $this->customerService->getStats(
-            $customer,
-            $request->header('company'),
-            $request->has('previous_year')
-        );
-
-        $customer = Customer::find($customer->id);
-        $this->customerStatementService->hydrateAccountSummaries([$customer]);
-
-        return (new CustomerResource($customer))
-            ->additional(['meta' => [
-                'chartData' => $chartData,
-            ]]);
-    }
-}
diff --git a/app/Http/Controllers/Company/Settings/CompanyController.php b/app/Http/Controllers/Company/Settings/CompanyController.php
deleted file mode 100644
index 781082f9..00000000
--- a/app/Http/Controllers/Company/Settings/CompanyController.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Company\Settings;
-
-use App\Http\Controllers\Controller;
-use App\Http\Requests\CompanyLogoRequest;
-use App\Http\Requests\CompanyRequest;
-use App\Http\Resources\CompanyResource;
-use App\Models\Company;
-
-class CompanyController extends Controller
-{
-    public function updateCompany(CompanyRequest $request)
-    {
-        $company = Company::find($request->header('company'));
-
-        $this->authorize('manage company', $company);
-
-        $company->update($request->getCompanyPayload());
-
-        $company->address()->updateOrCreate(['company_id' => $company->id], $request->address);
-
-        return new CompanyResource($company);
-    }
-
-    public function uploadCompanyLogo(CompanyLogoRequest $request)
-    {
-        $company = Company::find($request->header('company'));
-
-        $this->authorize('manage company', $company);
-
-        $data = json_decode($request->company_logo);
-
-        if (isset($request->is_company_logo_removed) && (bool) $request->is_company_logo_removed) {
-            $company->clearMediaCollection('logo');
-        }
-        if ($data) {
-            $company = Company::find($request->header('company'));
-
-            if ($company) {
-                $company->clearMediaCollection('logo');
-
-                $company->addMediaFromBase64($data->data)
-                    ->usingFileName($data->name)
-                    ->toMediaCollection('logo');
-            }
-        }
-
-        return response()->json([
-            'success' => true,
-        ]);
-    }
-}
diff --git a/app/Http/Controllers/CustomerPortal/General/DashboardController.php b/app/Http/Controllers/CustomerPortal/General/DashboardController.php
deleted file mode 100644
index 6a900d4e..00000000
--- a/app/Http/Controllers/CustomerPortal/General/DashboardController.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CustomerPortal\General;
-
-use App\Http\Controllers\Controller;
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Models\Payment;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Auth;
-
-class DashboardController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @return Response
-     */
-    public function __invoke(Request $request)
-    {
-        $user = Auth::guard('customer')->user();
-
-        $amountDue = Invoice::whereCustomer($user->id)
-            ->where('status', '<>', 'DRAFT')
-            ->sum('due_amount');
-        // Counts issued invoices only; a credit note is a reversal document,
-        // not another invoice the customer received.
-        $invoiceCount = Invoice::whereCustomer($user->id)
-            ->where('type', Invoice::TYPE_INVOICE)
-            ->where('status', '<>', 'DRAFT')
-            ->count();
-        $estimatesCount = Estimate::whereCustomer($user->id)
-            ->where('status', '<>', 'DRAFT')
-            ->count();
-        $paymentCount = Payment::whereCustomer($user->id)
-            ->count();
-
-        return response()->json([
-            'due_amount' => $amountDue,
-            'recentInvoices' => Invoice::whereCustomer($user->id)->where('status', '<>', 'DRAFT')->take(5)->latest()->get(),
-            'recentEstimates' => Estimate::whereCustomer($user->id)->where('status', '<>', 'DRAFT')->take(5)->latest()->get(),
-            'invoice_count' => $invoiceCount,
-            'estimate_count' => $estimatesCount,
-            'payment_count' => $paymentCount,
-        ]);
-    }
-}
diff --git a/app/Http/Controllers/CustomerPortal/General/ProfileController.php b/app/Http/Controllers/CustomerPortal/General/ProfileController.php
deleted file mode 100644
index 56d8aab6..00000000
--- a/app/Http/Controllers/CustomerPortal/General/ProfileController.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\CustomerPortal\General;
-
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Customer\CustomerProfileRequest;
-use App\Http\Resources\Customer\CustomerResource;
-use App\Models\Company;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class ProfileController extends Controller
-{
-    public function updateProfile(Company $company, CustomerProfileRequest $request)
-    {
-        $customer = Auth::guard('customer')->user();
-
-        $customer->update($request->validated());
-
-        if (isset($request->is_customer_avatar_removed) && (bool) $request->is_customer_avatar_removed) {
-            $customer->clearMediaCollection('customer_avatar');
-        }
-        if ($customer && $request->hasFile('customer_avatar')) {
-            $customer->clearMediaCollection('customer_avatar');
-
-            $customer->addMediaFromRequest('customer_avatar')
-                ->toMediaCollection('customer_avatar');
-        }
-
-        if ($request->billing !== null) {
-            $customer->shippingAddress()->delete();
-            $customer->addresses()->create($request->getShippingAddress());
-        }
-
-        if ($request->shipping !== null) {
-            $customer->billingAddress()->delete();
-            $customer->addresses()->create($request->getBillingAddress());
-        }
-
-        return new CustomerResource($customer);
-    }
-
-    public function getUser(Request $request)
-    {
-        $customer = Auth::guard('customer')->user();
-
-        return new CustomerResource($customer);
-    }
-}
diff --git a/app/Http/Controllers/Pdf/DocumentPdfController.php b/app/Http/Controllers/Pdf/DocumentPdfController.php
deleted file mode 100644
index 6222c18c..00000000
--- a/app/Http/Controllers/Pdf/DocumentPdfController.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Pdf;
-
-use App\Http\Controllers\Controller;
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Services\Document\EstimateService;
-use App\Services\Document\InvoiceService;
-use App\Services\Document\PaymentService;
-use Illuminate\Http\Request;
-
-class DocumentPdfController extends Controller
-{
-    public function __construct(
-        private readonly InvoiceService $invoiceService,
-        private readonly EstimateService $estimateService,
-        private readonly PaymentService $paymentService,
-    ) {}
-
-    public function invoice(Request $request, Invoice $invoice)
-    {
-        if ($request->has('preview')) {
-            return $this->invoiceService->getPdfData($invoice);
-        }
-
-        return $invoice->getGeneratedPDFOrStream('invoice');
-    }
-
-    public function estimate(Request $request, Estimate $estimate)
-    {
-        if ($request->has('preview')) {
-            return $this->estimateService->getPdfData($estimate);
-        }
-
-        return $estimate->getGeneratedPDFOrStream('estimate');
-    }
-
-    public function payment(Request $request, Payment $payment)
-    {
-        if ($request->has('preview')) {
-            // Through the service, so the preview gets the same shared data and
-            // the same custom-override resolution as the rendered receipt. This
-            // used to name the built-in view directly, so a preview ignored an
-            // override and rendered with no data at all.
-            return $this->paymentService->getPdfData($payment);
-        }
-
-        return $payment->getGeneratedPDFOrStream('payment');
-    }
-}
diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php
deleted file mode 100644
index 76b2ffd4..00000000
--- a/app/Http/Requests/Request.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-abstract class Request extends FormRequest
-{
-    //
-}
diff --git a/app/Http/Requests/UnzipUpdateRequest.php b/app/Http/Requests/UnzipUpdateRequest.php
deleted file mode 100644
index 22301969..00000000
--- a/app/Http/Requests/UnzipUpdateRequest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UnzipUpdateRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     */
-    public function rules(): array
-    {
-        return [
-            'path' => [
-                'required',
-                'regex:/^[\.\/\w\-]+$/',
-            ],
-            'module' => [
-                'nullable',
-                'string',
-            ],
-            'module_name' => [
-                'required_without:module',
-                'string',
-            ],
-        ];
-    }
-}
diff --git a/app/Http/Resources/AddressCollection.php b/app/Http/Resources/AddressCollection.php
deleted file mode 100644
index 840663fb..00000000
--- a/app/Http/Resources/AddressCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class AddressCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/CompanyCollection.php b/app/Http/Resources/CompanyCollection.php
deleted file mode 100644
index 8a44f1dc..00000000
--- a/app/Http/Resources/CompanyCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CompanyCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/CountryCollection.php b/app/Http/Resources/CountryCollection.php
deleted file mode 100644
index 7404d4ba..00000000
--- a/app/Http/Resources/CountryCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CountryCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/CurrencyCollection.php b/app/Http/Resources/CurrencyCollection.php
deleted file mode 100644
index 586b8572..00000000
--- a/app/Http/Resources/CurrencyCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CurrencyCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/CustomFieldCollection.php b/app/Http/Resources/CustomFieldCollection.php
deleted file mode 100644
index 54a0fd2d..00000000
--- a/app/Http/Resources/CustomFieldCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CustomFieldCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/CustomFieldValueCollection.php b/app/Http/Resources/CustomFieldValueCollection.php
deleted file mode 100644
index 9d24299a..00000000
--- a/app/Http/Resources/CustomFieldValueCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CustomFieldValueCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/Customer/CustomFieldValueCollection.php b/app/Http/Resources/Customer/CustomFieldValueCollection.php
deleted file mode 100644
index c61b78cf..00000000
--- a/app/Http/Resources/Customer/CustomFieldValueCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Customer;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CustomFieldValueCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/Customer/ExpenseCollection.php b/app/Http/Resources/Customer/ExpenseCollection.php
deleted file mode 100644
index c0c8a3b0..00000000
--- a/app/Http/Resources/Customer/ExpenseCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Customer;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ExpenseCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/Customer/PaymentCollection.php b/app/Http/Resources/Customer/PaymentCollection.php
deleted file mode 100644
index 3268873c..00000000
--- a/app/Http/Resources/Customer/PaymentCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Customer;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class PaymentCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/Customer/PaymentMethodCollection.php b/app/Http/Resources/Customer/PaymentMethodCollection.php
deleted file mode 100644
index fbf49415..00000000
--- a/app/Http/Resources/Customer/PaymentMethodCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Customer;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class PaymentMethodCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/Customer/TaxCollection.php b/app/Http/Resources/Customer/TaxCollection.php
deleted file mode 100644
index 80dab1c5..00000000
--- a/app/Http/Resources/Customer/TaxCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources\Customer;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class TaxCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/CustomerCollection.php b/app/Http/Resources/CustomerCollection.php
deleted file mode 100644
index f742e343..00000000
--- a/app/Http/Resources/CustomerCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CustomerCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/ExchangeRateProviderCollection.php b/app/Http/Resources/ExchangeRateProviderCollection.php
deleted file mode 100644
index 38f93ff1..00000000
--- a/app/Http/Resources/ExchangeRateProviderCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ExchangeRateProviderCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/ExpenseCategoryCollection.php b/app/Http/Resources/ExpenseCategoryCollection.php
deleted file mode 100644
index e716440c..00000000
--- a/app/Http/Resources/ExpenseCategoryCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ExpenseCategoryCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/ExpenseCollection.php b/app/Http/Resources/ExpenseCollection.php
deleted file mode 100644
index b4f3dfb5..00000000
--- a/app/Http/Resources/ExpenseCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ExpenseCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/ItemCollection.php b/app/Http/Resources/ItemCollection.php
deleted file mode 100644
index f0414e7a..00000000
--- a/app/Http/Resources/ItemCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class ItemCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/NoteCollection.php b/app/Http/Resources/NoteCollection.php
deleted file mode 100644
index 9aa4edcf..00000000
--- a/app/Http/Resources/NoteCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class NoteCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/PaymentCollection.php b/app/Http/Resources/PaymentCollection.php
deleted file mode 100644
index 653dca24..00000000
--- a/app/Http/Resources/PaymentCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class PaymentCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/PaymentMethodCollection.php b/app/Http/Resources/PaymentMethodCollection.php
deleted file mode 100644
index e288aeee..00000000
--- a/app/Http/Resources/PaymentMethodCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class PaymentMethodCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/RoleCollection.php b/app/Http/Resources/RoleCollection.php
deleted file mode 100644
index 437560fb..00000000
--- a/app/Http/Resources/RoleCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class RoleCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/TaxCollection.php b/app/Http/Resources/TaxCollection.php
deleted file mode 100644
index a795dc91..00000000
--- a/app/Http/Resources/TaxCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class TaxCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/TaxTypeCollection.php b/app/Http/Resources/TaxTypeCollection.php
deleted file mode 100644
index b44c9b84..00000000
--- a/app/Http/Resources/TaxTypeCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class TaxTypeCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/TransactionCollection.php b/app/Http/Resources/TransactionCollection.php
deleted file mode 100644
index 2aead4b4..00000000
--- a/app/Http/Resources/TransactionCollection.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class TransactionCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     * @return array|Arrayable|\JsonSerializable
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/UnitCollection.php b/app/Http/Resources/UnitCollection.php
deleted file mode 100644
index 72dee3a2..00000000
--- a/app/Http/Resources/UnitCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class UnitCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Http/Resources/UserCollection.php b/app/Http/Resources/UserCollection.php
deleted file mode 100644
index f1ce6150..00000000
--- a/app/Http/Resources/UserCollection.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Http\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class UserCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  Request  $request
-     */
-    public function toArray($request): array
-    {
-        return parent::toArray($request);
-    }
-}
diff --git a/app/Listeners/Updates/Listener.php b/app/Listeners/Updates/Listener.php
deleted file mode 100644
index 5b9f395e..00000000
--- a/app/Listeners/Updates/Listener.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Listeners\Updates;
-
-// Implementation taken from Akaunting - https://github.com/akaunting/akaunting
-class Listener
-{
-    public const VERSION = '';
-
-    /**
-     * Check if should listen.
-     *
-     * @return bool
-     */
-    protected function isListenerFired($event)
-    {
-        // Do not apply to the same or newer versions
-        if (version_compare(static::VERSION, $event->old, '<=')) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/app/Platform/Ai/AiServiceProvider.php b/app/Platform/Ai/AiServiceProvider.php
new file mode 100644
index 00000000..fb46ef5d
--- /dev/null
+++ b/app/Platform/Ai/AiServiceProvider.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Platform\Ai;
+
+use App\Platform\Ai\Application\AiToolRegistry;
+use App\Platform\Ai\Application\Tools\GetCompanyStatsTool;
+use App\Platform\Ai\Application\Tools\GetCustomerTool;
+use App\Platform\Ai\Application\Tools\GetInvoiceTool;
+use App\Platform\Ai\Application\Tools\ListExpenseCategoriesTool;
+use App\Platform\Ai\Application\Tools\ListOverdueInvoicesTool;
+use App\Platform\Ai\Application\Tools\ListRecentPaymentsTool;
+use App\Platform\Ai\Application\Tools\RankExpenseCategoriesTool;
+use App\Platform\Ai\Application\Tools\RankTopCustomersTool;
+use App\Platform\Ai\Application\Tools\RankTopItemsTool;
+use App\Platform\Ai\Application\Tools\SearchCustomersTool;
+use App\Platform\Ai\Application\Tools\SearchInvoicesTool;
+use App\Platform\Ai\Application\Tools\SearchItemsTool;
+use App\Platform\Ai\Drivers\OpenRouterDriver;
+use App\Platform\Ai\Models\AiConversation;
+use App\Platform\Ai\Policies\AiAccessPolicy;
+use App\Platform\Ai\Policies\AiConversationPolicy;
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Support\ServiceProvider;
+use InvoiceShelf\Modules\Registry;
+
+/**
+ * Binds the AI tool registry as a singleton and registers every built-in
+ * read-only tool the chat assistant can call.
+ *
+ * Modules that ship additional tools should extend the registry from their
+ * own ServiceProvider::boot() by resolving AiToolRegistry from the container
+ * and calling register() on it.
+ */
+class AiServiceProvider extends ServiceProvider
+{
+    public function boot(): void
+    {
+        Gate::policy(AiConversation::class, AiConversationPolicy::class);
+        Gate::define('manage ai config', [AiAccessPolicy::class, 'manageConfiguration']);
+        Gate::define('use ai', [AiAccessPolicy::class, 'use']);
+
+        RateLimiter::for('ai', function (Request $request) {
+            $user = $request->user();
+            $companyId = $request->header('company') ?? 'noop';
+            $key = $user ? "{$user->id}:{$companyId}" : $request->ip();
+
+            return Limit::perMinute(30)->by($key);
+        });
+
+        Registry::registerAiDriver('openrouter', [
+            'class' => OpenRouterDriver::class,
+            'label' => 'settings.ai.openrouter',
+            'website' => 'https://openrouter.ai',
+            'default_base_url' => 'https://openrouter.ai/api/v1',
+            'supported_roles' => ['chat', 'text_generation'],
+            'suggested_models' => [
+                ['value' => 'anthropic/claude-sonnet-4.6', 'label' => 'Anthropic Claude Sonnet 4.6'],
+                ['value' => 'anthropic/claude-haiku-4.5', 'label' => 'Anthropic Claude Haiku 4.5'],
+                ['value' => 'anthropic/claude-opus-4.6', 'label' => 'Anthropic Claude Opus 4.6'],
+                ['value' => 'openai/gpt-5.4', 'label' => 'OpenAI GPT-5.4'],
+                ['value' => 'openai/gpt-5.4-mini', 'label' => 'OpenAI GPT-5.4 mini'],
+                ['value' => 'google/gemini-3.1-pro-preview', 'label' => 'Google Gemini 3.1 Pro (preview)'],
+                ['value' => 'google/gemini-3.1-flash-lite-preview', 'label' => 'Google Gemini 3.1 Flash Lite (preview)'],
+                ['value' => 'z-ai/glm-5.1', 'label' => 'Z.AI GLM 5.1'],
+                ['value' => 'z-ai/glm-4.7-flash', 'label' => 'Z.AI GLM 4.7 Flash'],
+            ],
+            'config_fields' => [
+                [
+                    'key' => 'base_url',
+                    'type' => 'text',
+                    'label' => 'settings.ai.base_url',
+                    'default' => 'https://openrouter.ai/api/v1',
+                ],
+            ],
+        ]);
+    }
+
+    public function register(): void
+    {
+        $this->app->singleton(AiToolRegistry::class, function (Application $app): AiToolRegistry {
+            $registry = new AiToolRegistry;
+
+            // Built-in read-only tools (order is presentation-only; the LLM picks).
+            $registry->register(new SearchInvoicesTool);
+            $registry->register(new GetInvoiceTool);
+            $registry->register(new ListOverdueInvoicesTool);
+            $registry->register(new SearchCustomersTool);
+            $registry->register(new GetCustomerTool);
+            $registry->register(new ListRecentPaymentsTool);
+            $registry->register(new SearchItemsTool);
+            $registry->register(new ListExpenseCategoriesTool);
+            $registry->register(new GetCompanyStatsTool);
+
+            // Ranking tools — group-by aggregates the individual-record
+            // tools above can't express.
+            $registry->register(new RankTopCustomersTool);
+            $registry->register(new RankTopItemsTool);
+            $registry->register(new RankExpenseCategoriesTool);
+
+            return $registry;
+        });
+    }
+}
diff --git a/app/Services/Ai/AiAssistantService.php b/app/Platform/Ai/Application/AiAssistantService.php
similarity index 97%
rename from app/Services/Ai/AiAssistantService.php
rename to app/Platform/Ai/Application/AiAssistantService.php
index a0c85e91..ac4b0e66 100644
--- a/app/Services/Ai/AiAssistantService.php
+++ b/app/Platform/Ai/Application/AiAssistantService.php
@@ -1,15 +1,14 @@
 <?php
 
-namespace App\Services\Ai;
+namespace App\Platform\Ai\Application;
 
-use App\Models\AiConversation;
-use App\Models\AiMessage;
-use App\Models\Company;
-use App\Models\User;
-use App\Services\AiConfigurationService;
-use App\Support\Ai\AiChatResponse;
-use App\Support\Ai\AiException;
-use App\Support\Ai\PromptLoader;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Ai\Data\AiChatResponse;
+use App\Platform\Ai\Exceptions\AiException;
+use App\Platform\Ai\Models\AiConversation;
+use App\Platform\Ai\Models\AiMessage;
+use App\Platform\Ai\Prompting\PromptLoader;
 use Carbon\Carbon;
 use InvalidArgumentException;
 use Throwable;
diff --git a/app/Services/AiConfigurationService.php b/app/Platform/Ai/Application/AiConfigurationService.php
similarity index 98%
rename from app/Services/AiConfigurationService.php
rename to app/Platform/Ai/Application/AiConfigurationService.php
index f37ee37a..b5028943 100644
--- a/app/Services/AiConfigurationService.php
+++ b/app/Platform/Ai/Application/AiConfigurationService.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Services;
+namespace App\Platform\Ai\Application;
 
-use App\Models\CompanySetting;
-use App\Models\Setting;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Platform\Ai\Contracts\AiDriver;
+use App\Platform\Ai\Drivers\AiDriverFactory;
+use App\Platform\Operations\Models\Setting;
 use App\Rules\PublicHttpUrl;
-use App\Support\Ai\AiDriver;
-use App\Support\Ai\AiDriverFactory;
 use Illuminate\Support\Facades\Crypt;
 use InvoiceShelf\Modules\Registry;
 
diff --git a/app/Services/Ai/AiTextGenerationService.php b/app/Platform/Ai/Application/AiTextGenerationService.php
similarity index 96%
rename from app/Services/Ai/AiTextGenerationService.php
rename to app/Platform/Ai/Application/AiTextGenerationService.php
index eb8f3e15..feb710dc 100644
--- a/app/Services/Ai/AiTextGenerationService.php
+++ b/app/Platform/Ai/Application/AiTextGenerationService.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace App\Services\Ai;
+namespace App\Platform\Ai\Application;
 
-use App\Services\AiConfigurationService;
-use App\Support\Ai\AiException;
-use App\Support\Ai\PromptLoader;
+use App\Platform\Ai\Exceptions\AiException;
+use App\Platform\Ai\Prompting\PromptLoader;
 
 /**
  * Stateless one-shot text generation for the WYSIWYG popup.
diff --git a/app/Services/Ai/AiToolRegistry.php b/app/Platform/Ai/Application/AiToolRegistry.php
similarity index 95%
rename from app/Services/Ai/AiToolRegistry.php
rename to app/Platform/Ai/Application/AiToolRegistry.php
index 4803647c..1b60629b 100644
--- a/app/Services/Ai/AiToolRegistry.php
+++ b/app/Platform/Ai/Application/AiToolRegistry.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace App\Services\Ai;
+namespace App\Platform\Ai\Application;
 
-use App\Models\User;
-use App\Services\Ai\Tools\AiTool;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Ai\Application\Tools\AiTool;
 use InvalidArgumentException;
 
 /**
  * In-memory registry of AiTool instances.
  *
- * Register tools from a service provider (see `App\Providers\AiServiceProvider`)
+ * Register tools from a service provider (see `App\Platform\Ai\AiServiceProvider`)
  * at app boot; the AiAssistantService reads `schemas()` to populate the LLM's
  * tool-calling payload and calls `execute()` when the model returns a tool_call.
  *
diff --git a/app/Services/Ai/Tools/AiTool.php b/app/Platform/Ai/Application/Tools/AiTool.php
similarity index 99%
rename from app/Services/Ai/Tools/AiTool.php
rename to app/Platform/Ai/Application/Tools/AiTool.php
index cef115d1..2ebe2f9f 100644
--- a/app/Services/Ai/Tools/AiTool.php
+++ b/app/Platform/Ai/Application/Tools/AiTool.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
 /**
  * Abstract base class for read-only AI tools invokable by the chat assistant.
diff --git a/app/Services/Ai/Tools/Concerns/ResolvesPeriod.php b/app/Platform/Ai/Application/Tools/Concerns/ResolvesPeriod.php
similarity index 97%
rename from app/Services/Ai/Tools/Concerns/ResolvesPeriod.php
rename to app/Platform/Ai/Application/Tools/Concerns/ResolvesPeriod.php
index 220daf33..fe5074a5 100644
--- a/app/Services/Ai/Tools/Concerns/ResolvesPeriod.php
+++ b/app/Platform/Ai/Application/Tools/Concerns/ResolvesPeriod.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Ai\Tools\Concerns;
+namespace App\Platform\Ai\Application\Tools\Concerns;
 
 use Carbon\Carbon;
 
diff --git a/app/Services/Ai/Tools/GetCompanyStatsTool.php b/app/Platform/Ai/Application/Tools/GetCompanyStatsTool.php
similarity index 94%
rename from app/Services/Ai/Tools/GetCompanyStatsTool.php
rename to app/Platform/Ai/Application/Tools/GetCompanyStatsTool.php
index 0de161bf..eafa0a90 100644
--- a/app/Services/Ai/Tools/GetCompanyStatsTool.php
+++ b/app/Platform/Ai/Application/Tools/GetCompanyStatsTool.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\Expense;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Services\Ai\Tools\Concerns\ResolvesPeriod;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Ai\Application\Tools\Concerns\ResolvesPeriod;
 
 /**
  * Aggregate stats for the current company over a time window.
diff --git a/app/Services/Ai/Tools/GetCustomerTool.php b/app/Platform/Ai/Application/Tools/GetCustomerTool.php
similarity index 95%
rename from app/Services/Ai/Tools/GetCustomerTool.php
rename to app/Platform/Ai/Application/Tools/GetCustomerTool.php
index 61c09db3..f64f22dd 100644
--- a/app/Services/Ai/Tools/GetCustomerTool.php
+++ b/app/Platform/Ai/Application/Tools/GetCustomerTool.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\Customer;
-use App\Models\Invoice;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\Invoice;
 
 class GetCustomerTool extends AiTool
 {
diff --git a/app/Services/Ai/Tools/GetInvoiceTool.php b/app/Platform/Ai/Application/Tools/GetInvoiceTool.php
similarity index 97%
rename from app/Services/Ai/Tools/GetInvoiceTool.php
rename to app/Platform/Ai/Application/Tools/GetInvoiceTool.php
index afd38dbc..3c9601b9 100644
--- a/app/Services/Ai/Tools/GetInvoiceTool.php
+++ b/app/Platform/Ai/Application/Tools/GetInvoiceTool.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\Invoice;
+use App\Domains\Sales\Models\Invoice;
 
 /**
  * Fetch one invoice's full details by invoice_number, including items and taxes.
diff --git a/app/Services/Ai/Tools/ListExpenseCategoriesTool.php b/app/Platform/Ai/Application/Tools/ListExpenseCategoriesTool.php
similarity index 89%
rename from app/Services/Ai/Tools/ListExpenseCategoriesTool.php
rename to app/Platform/Ai/Application/Tools/ListExpenseCategoriesTool.php
index e9d756cc..7852b284 100644
--- a/app/Services/Ai/Tools/ListExpenseCategoriesTool.php
+++ b/app/Platform/Ai/Application/Tools/ListExpenseCategoriesTool.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\Expense;
-use App\Models\ExpenseCategory;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Purchases\Models\ExpenseCategory;
 
 class ListExpenseCategoriesTool extends AiTool
 {
diff --git a/app/Services/Ai/Tools/ListOverdueInvoicesTool.php b/app/Platform/Ai/Application/Tools/ListOverdueInvoicesTool.php
similarity index 95%
rename from app/Services/Ai/Tools/ListOverdueInvoicesTool.php
rename to app/Platform/Ai/Application/Tools/ListOverdueInvoicesTool.php
index 0b565cba..48f3a8b1 100644
--- a/app/Services/Ai/Tools/ListOverdueInvoicesTool.php
+++ b/app/Platform/Ai/Application/Tools/ListOverdueInvoicesTool.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\Invoice;
+use App\Domains\Sales\Models\Invoice;
 
 class ListOverdueInvoicesTool extends AiTool
 {
diff --git a/app/Services/Ai/Tools/ListRecentPaymentsTool.php b/app/Platform/Ai/Application/Tools/ListRecentPaymentsTool.php
similarity index 97%
rename from app/Services/Ai/Tools/ListRecentPaymentsTool.php
rename to app/Platform/Ai/Application/Tools/ListRecentPaymentsTool.php
index d5d1caa8..95fb17c2 100644
--- a/app/Services/Ai/Tools/ListRecentPaymentsTool.php
+++ b/app/Platform/Ai/Application/Tools/ListRecentPaymentsTool.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\Payment;
+use App\Domains\Receivables\Models\Payment;
 use Carbon\Carbon;
 
 class ListRecentPaymentsTool extends AiTool
diff --git a/app/Services/Ai/Tools/RankExpenseCategoriesTool.php b/app/Platform/Ai/Application/Tools/RankExpenseCategoriesTool.php
similarity index 94%
rename from app/Services/Ai/Tools/RankExpenseCategoriesTool.php
rename to app/Platform/Ai/Application/Tools/RankExpenseCategoriesTool.php
index fdd8b68d..9dc46ea9 100644
--- a/app/Services/Ai/Tools/RankExpenseCategoriesTool.php
+++ b/app/Platform/Ai/Application/Tools/RankExpenseCategoriesTool.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\Expense;
-use App\Models\ExpenseCategory;
-use App\Services\Ai\Tools\Concerns\ResolvesPeriod;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Purchases\Models\ExpenseCategory;
+use App\Platform\Ai\Application\Tools\Concerns\ResolvesPeriod;
 use Illuminate\Support\Facades\DB;
 
 /**
diff --git a/app/Services/Ai/Tools/RankTopCustomersTool.php b/app/Platform/Ai/Application/Tools/RankTopCustomersTool.php
similarity index 97%
rename from app/Services/Ai/Tools/RankTopCustomersTool.php
rename to app/Platform/Ai/Application/Tools/RankTopCustomersTool.php
index 11fc29fc..d521ffa1 100644
--- a/app/Services/Ai/Tools/RankTopCustomersTool.php
+++ b/app/Platform/Ai/Application/Tools/RankTopCustomersTool.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Services\Ai\Tools\Concerns\ResolvesPeriod;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Ai\Application\Tools\Concerns\ResolvesPeriod;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 
diff --git a/app/Services/Ai/Tools/RankTopItemsTool.php b/app/Platform/Ai/Application/Tools/RankTopItemsTool.php
similarity index 95%
rename from app/Services/Ai/Tools/RankTopItemsTool.php
rename to app/Platform/Ai/Application/Tools/RankTopItemsTool.php
index d61da586..ea74b1e6 100644
--- a/app/Services/Ai/Tools/RankTopItemsTool.php
+++ b/app/Platform/Ai/Application/Tools/RankTopItemsTool.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\InvoiceItem;
-use App\Models\Item;
-use App\Services\Ai\Tools\Concerns\ResolvesPeriod;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Platform\Ai\Application\Tools\Concerns\ResolvesPeriod;
 use Illuminate\Support\Facades\DB;
 
 /**
diff --git a/app/Services/Ai/Tools/SearchCustomersTool.php b/app/Platform/Ai/Application/Tools/SearchCustomersTool.php
similarity index 96%
rename from app/Services/Ai/Tools/SearchCustomersTool.php
rename to app/Platform/Ai/Application/Tools/SearchCustomersTool.php
index 72b52cb7..6ed71911 100644
--- a/app/Services/Ai/Tools/SearchCustomersTool.php
+++ b/app/Platform/Ai/Application/Tools/SearchCustomersTool.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\Customer;
+use App\Domains\Contacts\Models\Customer;
 
 class SearchCustomersTool extends AiTool
 {
diff --git a/app/Services/Ai/Tools/SearchInvoicesTool.php b/app/Platform/Ai/Application/Tools/SearchInvoicesTool.php
similarity index 97%
rename from app/Services/Ai/Tools/SearchInvoicesTool.php
rename to app/Platform/Ai/Application/Tools/SearchInvoicesTool.php
index 89fd2f13..b1635ab0 100644
--- a/app/Services/Ai/Tools/SearchInvoicesTool.php
+++ b/app/Platform/Ai/Application/Tools/SearchInvoicesTool.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\Invoice;
+use App\Domains\Sales\Models\Invoice;
 
 /**
  * Search invoices by free text, status, and/or customer, scoped to the current company.
diff --git a/app/Services/Ai/Tools/SearchItemsTool.php b/app/Platform/Ai/Application/Tools/SearchItemsTool.php
similarity index 96%
rename from app/Services/Ai/Tools/SearchItemsTool.php
rename to app/Platform/Ai/Application/Tools/SearchItemsTool.php
index fe3f2a16..7656aa48 100644
--- a/app/Services/Ai/Tools/SearchItemsTool.php
+++ b/app/Platform/Ai/Application/Tools/SearchItemsTool.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Ai\Tools;
+namespace App\Platform\Ai\Application\Tools;
 
-use App\Models\Item;
+use App\Domains\Catalog\Models\Item;
 
 class SearchItemsTool extends AiTool
 {
diff --git a/app/Support/Ai/AiDriver.php b/app/Platform/Ai/Contracts/AiDriver.php
similarity index 94%
rename from app/Support/Ai/AiDriver.php
rename to app/Platform/Ai/Contracts/AiDriver.php
index 9d123929..017b3bb9 100644
--- a/app/Support/Ai/AiDriver.php
+++ b/app/Platform/Ai/Contracts/AiDriver.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace App\Support\Ai;
+namespace App\Platform\Ai\Contracts;
+
+use App\Platform\Ai\Data\AiChatResponse;
+use App\Platform\Ai\Exceptions\AiException;
 
 /**
  * Abstract base for AI drivers.
@@ -17,7 +20,7 @@ namespace App\Support\Ai;
  *     Stateless single-shot prompt → text.
  *
  * Drivers are registered with the host via the module Registry (see
- * App\Providers\DriverRegistryProvider for built-ins and
+ * App\Platform\Ai\AiServiceProvider for built-ins and
  * InvoiceShelf\Modules\Registry::registerAiDriver() for module-contributed ones).
  */
 abstract class AiDriver
diff --git a/app/Support/Ai/AiChatResponse.php b/app/Platform/Ai/Data/AiChatResponse.php
similarity index 97%
rename from app/Support/Ai/AiChatResponse.php
rename to app/Platform/Ai/Data/AiChatResponse.php
index dc8e2d61..67bf6c18 100644
--- a/app/Support/Ai/AiChatResponse.php
+++ b/app/Platform/Ai/Data/AiChatResponse.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Ai;
+namespace App\Platform\Ai\Data;
 
 /**
  * Provider-agnostic chat completion response.
diff --git a/app/Support/Ai/AiDriverFactory.php b/app/Platform/Ai/Drivers/AiDriverFactory.php
similarity index 97%
rename from app/Support/Ai/AiDriverFactory.php
rename to app/Platform/Ai/Drivers/AiDriverFactory.php
index 3d8d575f..2bf219b3 100644
--- a/app/Support/Ai/AiDriverFactory.php
+++ b/app/Platform/Ai/Drivers/AiDriverFactory.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Support\Ai;
+namespace App\Platform\Ai\Drivers;
 
+use App\Platform\Ai\Contracts\AiDriver;
 use InvalidArgumentException;
 use InvoiceShelf\Modules\Registry;
 
diff --git a/app/Support/Ai/OpenRouterDriver.php b/app/Platform/Ai/Drivers/OpenRouterDriver.php
similarity index 97%
rename from app/Support/Ai/OpenRouterDriver.php
rename to app/Platform/Ai/Drivers/OpenRouterDriver.php
index 5f0642dc..203a1616 100644
--- a/app/Support/Ai/OpenRouterDriver.php
+++ b/app/Platform/Ai/Drivers/OpenRouterDriver.php
@@ -1,7 +1,10 @@
 <?php
 
-namespace App\Support\Ai;
+namespace App\Platform\Ai\Drivers;
 
+use App\Platform\Ai\Contracts\AiDriver;
+use App\Platform\Ai\Data\AiChatResponse;
+use App\Platform\Ai\Exceptions\AiException;
 use App\Support\Net\BlockedUrlException;
 use App\Support\Net\PrivateNetworkGuard;
 use Illuminate\Support\Facades\Http;
diff --git a/app/Support/Ai/AiException.php b/app/Platform/Ai/Exceptions/AiException.php
similarity index 94%
rename from app/Support/Ai/AiException.php
rename to app/Platform/Ai/Exceptions/AiException.php
index 1c4dab9c..c2271a11 100644
--- a/app/Support/Ai/AiException.php
+++ b/app/Platform/Ai/Exceptions/AiException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Ai;
+namespace App\Platform\Ai\Exceptions;
 
 use RuntimeException;
 use Throwable;
diff --git a/app/Http/Controllers/Admin/Settings/AiConfigurationController.php b/app/Platform/Ai/Http/Admin/AiConfigurationController.php
similarity index 94%
rename from app/Http/Controllers/Admin/Settings/AiConfigurationController.php
rename to app/Platform/Ai/Http/Admin/AiConfigurationController.php
index 7c3c378c..de6a2571 100644
--- a/app/Http/Controllers/Admin/Settings/AiConfigurationController.php
+++ b/app/Platform/Ai/Http/Admin/AiConfigurationController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Settings;
+namespace App\Platform\Ai\Http\Admin;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Ai\Application\AiConfigurationService;
+use App\Platform\Ai\Drivers\AiDriverFactory;
+use App\Platform\Ai\Exceptions\AiException;
+use App\Platform\Http\Controller;
 use App\Rules\PublicHttpUrl;
-use App\Services\AiConfigurationService;
-use App\Support\Ai\AiDriverFactory;
-use App\Support\Ai\AiException;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Company/Ai/ChatController.php b/app/Platform/Ai/Http/Company/ChatController.php
similarity index 93%
rename from app/Http/Controllers/Company/Ai/ChatController.php
rename to app/Platform/Ai/Http/Company/ChatController.php
index f3d66d0f..8e5b65a8 100644
--- a/app/Http/Controllers/Company/Ai/ChatController.php
+++ b/app/Platform/Ai/Http/Company/ChatController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Company\Ai;
+namespace App\Platform\Ai\Http\Company;
 
-use App\Http\Controllers\Controller;
-use App\Models\AiConversation;
-use App\Services\Ai\AiAssistantService;
-use App\Support\Ai\AiException;
+use App\Platform\Ai\Application\AiAssistantService;
+use App\Platform\Ai\Exceptions\AiException;
+use App\Platform\Ai\Models\AiConversation;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Http/Controllers/Company/Settings/CompanyAiConfigurationController.php b/app/Platform/Ai/Http/Company/CompanyAiConfigurationController.php
similarity index 93%
rename from app/Http/Controllers/Company/Settings/CompanyAiConfigurationController.php
rename to app/Platform/Ai/Http/Company/CompanyAiConfigurationController.php
index 4f2084f3..b1207d9e 100644
--- a/app/Http/Controllers/Company/Settings/CompanyAiConfigurationController.php
+++ b/app/Platform/Ai/Http/Company/CompanyAiConfigurationController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Company\Settings;
+namespace App\Platform\Ai\Http\Company;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Ai\Application\AiConfigurationService;
+use App\Platform\Ai\Drivers\AiDriverFactory;
+use App\Platform\Ai\Exceptions\AiException;
+use App\Platform\Http\Controller;
 use App\Rules\PublicHttpUrl;
-use App\Services\AiConfigurationService;
-use App\Support\Ai\AiDriverFactory;
-use App\Support\Ai\AiException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Http/Controllers/Company/Ai/ConversationController.php b/app/Platform/Ai/Http/Company/ConversationController.php
similarity index 96%
rename from app/Http/Controllers/Company/Ai/ConversationController.php
rename to app/Platform/Ai/Http/Company/ConversationController.php
index fa7f54a5..505a0d15 100644
--- a/app/Http/Controllers/Company/Ai/ConversationController.php
+++ b/app/Platform/Ai/Http/Company/ConversationController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Company\Ai;
+namespace App\Platform\Ai\Http\Company;
 
-use App\Http\Controllers\Controller;
-use App\Models\AiConversation;
+use App\Platform\Ai\Models\AiConversation;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Http/Controllers/Company/Ai/GenerationController.php b/app/Platform/Ai/Http/Company/GenerationController.php
similarity index 88%
rename from app/Http/Controllers/Company/Ai/GenerationController.php
rename to app/Platform/Ai/Http/Company/GenerationController.php
index 0cd49df1..a7e8eb31 100644
--- a/app/Http/Controllers/Company/Ai/GenerationController.php
+++ b/app/Platform/Ai/Http/Company/GenerationController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Company\Ai;
+namespace App\Platform\Ai\Http\Company;
 
-use App\Http\Controllers\Controller;
-use App\Services\Ai\AiTextGenerationService;
-use App\Support\Ai\AiException;
+use App\Platform\Ai\Application\AiTextGenerationService;
+use App\Platform\Ai\Exceptions\AiException;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Http/Controllers/Setup/AiConfigurationController.php b/app/Platform/Ai/Http/Setup/AiConfigurationController.php
similarity index 94%
rename from app/Http/Controllers/Setup/AiConfigurationController.php
rename to app/Platform/Ai/Http/Setup/AiConfigurationController.php
index 266a5e70..eab6dec8 100644
--- a/app/Http/Controllers/Setup/AiConfigurationController.php
+++ b/app/Platform/Ai/Http/Setup/AiConfigurationController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Setup;
+namespace App\Platform\Ai\Http\Setup;
 
-use App\Http\Controllers\Controller;
-use App\Models\Setting;
+use App\Platform\Ai\Application\AiConfigurationService;
+use App\Platform\Http\Controller;
+use App\Platform\Operations\Models\Setting;
 use App\Rules\PublicHttpUrl;
-use App\Services\AiConfigurationService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
diff --git a/app/Models/AiConversation.php b/app/Platform/Ai/Models/AiConversation.php
similarity index 85%
rename from app/Models/AiConversation.php
rename to app/Platform/Ai/Models/AiConversation.php
index bd3acd44..802fda93 100644
--- a/app/Models/AiConversation.php
+++ b/app/Platform/Ai/Models/AiConversation.php
@@ -1,7 +1,9 @@
 <?php
 
-namespace App\Models;
+namespace App\Platform\Ai\Models;
 
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -16,6 +18,8 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
  */
 class AiConversation extends Model
 {
+    protected $table = 'ai_conversations';
+
     use HasFactory;
 
     protected $guarded = ['id'];
diff --git a/app/Models/AiMessage.php b/app/Platform/Ai/Models/AiMessage.php
similarity index 95%
rename from app/Models/AiMessage.php
rename to app/Platform/Ai/Models/AiMessage.php
index 1b5e2f49..734f0941 100644
--- a/app/Models/AiMessage.php
+++ b/app/Platform/Ai/Models/AiMessage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Platform\Ai\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -20,6 +20,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  */
 class AiMessage extends Model
 {
+    protected $table = 'ai_messages';
+
     use HasFactory;
 
     public const ROLE_USER = 'user';
diff --git a/app/Platform/Ai/Policies/AiAccessPolicy.php b/app/Platform/Ai/Policies/AiAccessPolicy.php
new file mode 100644
index 00000000..9bc9cd9e
--- /dev/null
+++ b/app/Platform/Ai/Policies/AiAccessPolicy.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Platform\Ai\Policies;
+
+use App\Domains\Accounts\Models\User;
+
+class AiAccessPolicy
+{
+    public function manageConfiguration(User $user): bool
+    {
+        return $user->isSuperAdmin();
+    }
+
+    /**
+     * Feature configuration applies the instance and company kill switches.
+     */
+    public function use(User $user): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Policies/AiConversationPolicy.php b/app/Platform/Ai/Policies/AiConversationPolicy.php
similarity index 89%
rename from app/Policies/AiConversationPolicy.php
rename to app/Platform/Ai/Policies/AiConversationPolicy.php
index 34e90a1a..9523e190 100644
--- a/app/Policies/AiConversationPolicy.php
+++ b/app/Platform/Ai/Policies/AiConversationPolicy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Policies;
+namespace App\Platform\Ai\Policies;
 
-use App\Models\AiConversation;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Ai\Models\AiConversation;
 
 /**
  * Conversation visibility is strictly per-user per-company.
diff --git a/app/Support/Ai/PromptLoader.php b/app/Platform/Ai/Prompting/PromptLoader.php
similarity index 98%
rename from app/Support/Ai/PromptLoader.php
rename to app/Platform/Ai/Prompting/PromptLoader.php
index c1ab7c65..38a47b4c 100644
--- a/app/Support/Ai/PromptLoader.php
+++ b/app/Platform/Ai/Prompting/PromptLoader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Ai;
+namespace App\Platform\Ai\Prompting;
 
 use RuntimeException;
 
diff --git a/app/Platform/Ai/routes/company.php b/app/Platform/Ai/routes/company.php
new file mode 100644
index 00000000..7bc2d25b
--- /dev/null
+++ b/app/Platform/Ai/routes/company.php
@@ -0,0 +1,26 @@
+<?php
+
+use App\Platform\Ai\Http\Admin\AiConfigurationController;
+use App\Platform\Ai\Http\Company\ChatController;
+use App\Platform\Ai\Http\Company\CompanyAiConfigurationController;
+use App\Platform\Ai\Http\Company\ConversationController;
+use App\Platform\Ai\Http\Company\GenerationController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/ai/drivers', [AiConfigurationController::class, 'getDrivers']);
+Route::get('/ai/config', [AiConfigurationController::class, 'getConfig']);
+Route::post('/ai/config', [AiConfigurationController::class, 'saveConfig']);
+Route::post('/ai/test', [AiConfigurationController::class, 'testConnection']);
+
+Route::get('/company/ai/config', [CompanyAiConfigurationController::class, 'getConfig']);
+Route::post('/company/ai/config', [CompanyAiConfigurationController::class, 'saveConfig']);
+Route::post('/company/ai/test', [CompanyAiConfigurationController::class, 'testConnection']);
+
+Route::middleware('throttle:ai')->group(function () {
+    Route::post('/ai/chat', ChatController::class);
+    Route::get('/ai/conversations', [ConversationController::class, 'index']);
+    Route::get('/ai/conversations/{id}', [ConversationController::class, 'show']);
+    Route::patch('/ai/conversations/{id}', [ConversationController::class, 'update']);
+    Route::delete('/ai/conversations/{id}', [ConversationController::class, 'destroy']);
+    Route::post('/ai/generate', GenerationController::class);
+});
diff --git a/app/Platform/Ai/routes/installer.php b/app/Platform/Ai/routes/installer.php
new file mode 100644
index 00000000..11cd2706
--- /dev/null
+++ b/app/Platform/Ai/routes/installer.php
@@ -0,0 +1,7 @@
+<?php
+
+use App\Platform\Ai\Http\Setup\AiConfigurationController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/ai/config', [AiConfigurationController::class, 'show']);
+Route::post('/ai/config', [AiConfigurationController::class, 'save']);
diff --git a/app/Http/Controllers/Controller.php b/app/Platform/Http/Controller.php
similarity index 91%
rename from app/Http/Controllers/Controller.php
rename to app/Platform/Http/Controller.php
index 345847e2..4fa1bd77 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Platform/Http/Controller.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Platform\Http;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
diff --git a/app/Platform/Mail/Application/EloquentEmailLogWriter.php b/app/Platform/Mail/Application/EloquentEmailLogWriter.php
new file mode 100644
index 00000000..06f20be1
--- /dev/null
+++ b/app/Platform/Mail/Application/EloquentEmailLogWriter.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Platform\Mail\Application;
+
+use App\Facades\Hashids;
+use App\Platform\Mail\Contracts\EmailLogWriter;
+use App\Platform\Mail\Models\EmailLog;
+use App\Platform\Persistence\ModelIdentityMap;
+use App\Support\Hashids\HashidConnection;
+use Illuminate\Database\Eloquent\Model;
+
+class EloquentEmailLogWriter implements EmailLogWriter
+{
+    public function record(Model $mailable, array $message): string
+    {
+        $log = EmailLog::create([
+            ...$message,
+            'mailable_type' => ModelIdentityMap::aliasFor($mailable::class),
+            'mailable_id' => $mailable->getKey(),
+        ]);
+
+        $log->token = Hashids::connection(HashidConnection::EmailLog->value)->encode($log->id);
+        $log->save();
+
+        return $log->token;
+    }
+}
diff --git a/app/Services/Mail/MailConfigurationService.php b/app/Platform/Mail/Application/MailConfigurationService.php
similarity index 98%
rename from app/Services/Mail/MailConfigurationService.php
rename to app/Platform/Mail/Application/MailConfigurationService.php
index 3a4db7c7..1999e9df 100644
--- a/app/Services/Mail/MailConfigurationService.php
+++ b/app/Platform/Mail/Application/MailConfigurationService.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Services\Mail;
+namespace App\Platform\Mail\Application;
 
-use App\Models\CompanySetting;
-use App\Models\Setting;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Platform\Mail\Contracts\MailConfigurator;
+use App\Platform\Operations\Models\Setting;
 use Aws\Sdk;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Mail;
@@ -12,7 +13,7 @@ use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
 use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
 
-class MailConfigurationService
+class MailConfigurationService implements MailConfigurator
 {
     public const DEFAULT_DRIVER = 'sendmail';
 
diff --git a/app/Platform/Mail/Contracts/EmailLogWriter.php b/app/Platform/Mail/Contracts/EmailLogWriter.php
new file mode 100644
index 00000000..3a6200ee
--- /dev/null
+++ b/app/Platform/Mail/Contracts/EmailLogWriter.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Platform\Mail\Contracts;
+
+use Illuminate\Database\Eloquent\Model;
+
+interface EmailLogWriter
+{
+    /**
+     * @param  array{from: string, to: string, cc?: string|null, bcc?: string|null, subject: string, body: string}  $message
+     */
+    public function record(Model $mailable, array $message): string;
+}
diff --git a/app/Platform/Mail/Contracts/MailConfigurator.php b/app/Platform/Mail/Contracts/MailConfigurator.php
new file mode 100644
index 00000000..7637f931
--- /dev/null
+++ b/app/Platform/Mail/Contracts/MailConfigurator.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Platform\Mail\Contracts;
+
+interface MailConfigurator
+{
+    public function applyGlobalConfig(): void;
+
+    public function applyCompanyConfig(int|string $companyId): void;
+}
diff --git a/app/Http/Controllers/Admin/Settings/MailConfigurationController.php b/app/Platform/Mail/Http/Admin/MailConfigurationController.php
similarity index 88%
rename from app/Http/Controllers/Admin/Settings/MailConfigurationController.php
rename to app/Platform/Mail/Http/Admin/MailConfigurationController.php
index 0abd988e..364d11ac 100755
--- a/app/Http/Controllers/Admin/Settings/MailConfigurationController.php
+++ b/app/Platform/Mail/Http/Admin/MailConfigurationController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Settings;
+namespace App\Platform\Mail\Http\Admin;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\MailEnvironmentRequest;
-use App\Mail\TestMail;
-use App\Models\Setting;
-use App\Services\Mail\MailConfigurationService;
+use App\Platform\Http\Controller;
+use App\Platform\Mail\Application\MailConfigurationService;
+use App\Platform\Mail\Http\Requests\MailEnvironmentRequest;
+use App\Platform\Mail\Mailables\TestMail;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Company/Settings/CompanyMailConfigurationController.php b/app/Platform/Mail/Http/Company/CompanyMailConfigurationController.php
similarity index 80%
rename from app/Http/Controllers/Company/Settings/CompanyMailConfigurationController.php
rename to app/Platform/Mail/Http/Company/CompanyMailConfigurationController.php
index 3eca1fbf..7fa9194f 100644
--- a/app/Http/Controllers/Company/Settings/CompanyMailConfigurationController.php
+++ b/app/Platform/Mail/Http/Company/CompanyMailConfigurationController.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Company\Settings;
+namespace App\Platform\Mail\Http\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\CompanyMailConfigurationRequest;
-use App\Mail\TestMail;
-use App\Services\Mail\CompanyMailConfigService;
-use App\Services\Mail\MailConfigurationService;
+use App\Platform\Http\Controller;
+use App\Platform\Mail\Application\MailConfigurationService;
+use App\Platform\Mail\Http\Requests\CompanyMailConfigurationRequest;
+use App\Platform\Mail\Mailables\TestMail;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
@@ -49,7 +48,7 @@ class CompanyMailConfigurationController extends Controller
             'message' => 'required',
         ]);
 
-        CompanyMailConfigService::apply($request->header('company'));
+        $this->mailConfigurationService->applyCompanyConfig($request->header('company'));
 
         Mail::to($request->to)->send(new TestMail($request->subject, $request->message));
 
diff --git a/app/Http/Requests/CompanyMailConfigurationRequest.php b/app/Platform/Mail/Http/Requests/CompanyMailConfigurationRequest.php
similarity index 89%
rename from app/Http/Requests/CompanyMailConfigurationRequest.php
rename to app/Platform/Mail/Http/Requests/CompanyMailConfigurationRequest.php
index 44c4a3ff..8bfe9003 100644
--- a/app/Http/Requests/CompanyMailConfigurationRequest.php
+++ b/app/Platform/Mail/Http/Requests/CompanyMailConfigurationRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Platform\Mail\Http\Requests;
 
-use App\Services\Mail\MailConfigurationService;
+use App\Platform\Mail\Application\MailConfigurationService;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Http/Requests/MailEnvironmentRequest.php b/app/Platform/Mail/Http/Requests/MailEnvironmentRequest.php
similarity index 83%
rename from app/Http/Requests/MailEnvironmentRequest.php
rename to app/Platform/Mail/Http/Requests/MailEnvironmentRequest.php
index 9c560303..0ad9f67d 100644
--- a/app/Http/Requests/MailEnvironmentRequest.php
+++ b/app/Platform/Mail/Http/Requests/MailEnvironmentRequest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Platform\Mail\Http\Requests;
 
-use App\Services\Mail\MailConfigurationService;
+use App\Platform\Mail\Application\MailConfigurationService;
 use Illuminate\Foundation\Http\FormRequest;
 
 class MailEnvironmentRequest extends FormRequest
diff --git a/app/Platform/Mail/MailServiceProvider.php b/app/Platform/Mail/MailServiceProvider.php
new file mode 100644
index 00000000..fa33ebb8
--- /dev/null
+++ b/app/Platform/Mail/MailServiceProvider.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Platform\Mail;
+
+use App\Platform\Mail\Application\EloquentEmailLogWriter;
+use App\Platform\Mail\Application\MailConfigurationService;
+use App\Platform\Mail\Contracts\EmailLogWriter;
+use App\Platform\Mail\Contracts\MailConfigurator;
+use App\Platform\Mail\Policies\MailAccessPolicy;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+
+class MailServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->singleton(MailConfigurationService::class);
+        $this->app->bind(
+            MailConfigurator::class,
+            fn (Application $app): MailConfigurator => $app->make(MailConfigurationService::class),
+        );
+        $this->app->bind(EmailLogWriter::class, EloquentEmailLogWriter::class);
+    }
+
+    public function boot(): void
+    {
+        Gate::define('manage email config', [MailAccessPolicy::class, 'manageConfiguration']);
+    }
+}
diff --git a/app/Mail/TestMail.php b/app/Platform/Mail/Mailables/TestMail.php
similarity index 94%
rename from app/Mail/TestMail.php
rename to app/Platform/Mail/Mailables/TestMail.php
index 3cf04477..a9b87f60 100644
--- a/app/Mail/TestMail.php
+++ b/app/Platform/Mail/Mailables/TestMail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Mail;
+namespace App\Platform\Mail\Mailables;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
diff --git a/app/Models/EmailLog.php b/app/Platform/Mail/Models/EmailLog.php
similarity index 91%
rename from app/Models/EmailLog.php
rename to app/Platform/Mail/Models/EmailLog.php
index d4c2157b..4dc113e7 100644
--- a/app/Models/EmailLog.php
+++ b/app/Platform/Mail/Models/EmailLog.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Models;
+namespace App\Platform\Mail\Models;
 
+use App\Domains\Accounts\Models\CompanySetting;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -9,6 +10,8 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class EmailLog extends Model
 {
+    protected $table = 'email_logs';
+
     use HasFactory;
 
     protected $guarded = ['id'];
diff --git a/app/Platform/Mail/Policies/MailAccessPolicy.php b/app/Platform/Mail/Policies/MailAccessPolicy.php
new file mode 100644
index 00000000..625d27c2
--- /dev/null
+++ b/app/Platform/Mail/Policies/MailAccessPolicy.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Platform\Mail\Policies;
+
+use App\Domains\Accounts\Models\User;
+
+class MailAccessPolicy
+{
+    public function manageConfiguration(User $user): bool
+    {
+        return $user->isSuperAdmin();
+    }
+}
diff --git a/app/Platform/Mail/routes/company.php b/app/Platform/Mail/routes/company.php
new file mode 100644
index 00000000..652b9613
--- /dev/null
+++ b/app/Platform/Mail/routes/company.php
@@ -0,0 +1,15 @@
+<?php
+
+use App\Platform\Mail\Http\Admin\MailConfigurationController;
+use App\Platform\Mail\Http\Company\CompanyMailConfigurationController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/mail/drivers', [MailConfigurationController::class, 'getMailDrivers']);
+Route::get('/mail/config', [MailConfigurationController::class, 'getMailEnvironment']);
+Route::post('/mail/config', [MailConfigurationController::class, 'saveMailEnvironment']);
+Route::post('/mail/test', [MailConfigurationController::class, 'testEmailConfig']);
+
+Route::get('/company/mail/config', [CompanyMailConfigurationController::class, 'getDefaultConfig']);
+Route::get('/company/mail/company-config', [CompanyMailConfigurationController::class, 'getMailConfig']);
+Route::post('/company/mail/company-config', [CompanyMailConfigurationController::class, 'saveMailConfig']);
+Route::post('/company/mail/company-test', [CompanyMailConfigurationController::class, 'testMailConfig']);
diff --git a/app/Console/Commands/InstallModuleCommand.php b/app/Platform/Modules/Console/InstallModuleCommand.php
similarity index 89%
rename from app/Console/Commands/InstallModuleCommand.php
rename to app/Platform/Modules/Console/InstallModuleCommand.php
index ac6d7cea..47fe046e 100644
--- a/app/Console/Commands/InstallModuleCommand.php
+++ b/app/Platform/Modules/Console/InstallModuleCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Platform\Modules\Console;
 
-use App\Support\Module\ModuleInstaller;
+use App\Platform\Modules\Runtime\ModuleInstaller;
 use Illuminate\Console\Command;
 
 class InstallModuleCommand extends Command
diff --git a/app/Console/Commands/UninstallModuleCommand.php b/app/Platform/Modules/Console/UninstallModuleCommand.php
similarity index 92%
rename from app/Console/Commands/UninstallModuleCommand.php
rename to app/Platform/Modules/Console/UninstallModuleCommand.php
index 679a87a2..c10ba24c 100644
--- a/app/Console/Commands/UninstallModuleCommand.php
+++ b/app/Platform/Modules/Console/UninstallModuleCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Platform\Modules\Console;
 
-use App\Services\Marketplace\MarketplaceUninstaller;
+use App\Platform\Modules\Marketplace\MarketplaceUninstaller;
 use Illuminate\Console\Command;
 
 class UninstallModuleCommand extends Command
diff --git a/app/Platform/Modules/Contracts/ModuleSettingsStore.php b/app/Platform/Modules/Contracts/ModuleSettingsStore.php
new file mode 100644
index 00000000..8bd8a615
--- /dev/null
+++ b/app/Platform/Modules/Contracts/ModuleSettingsStore.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Platform\Modules\Contracts;
+
+interface ModuleSettingsStore
+{
+    public function get(string $key, int|string|null $companyId): mixed;
+
+    /** @param array<string, string> $settings */
+    public function put(array $settings, int|string|null $companyId): void;
+
+    public function deleteForModule(string $slug): void;
+}
diff --git a/app/Events/ModuleDisabledEvent.php b/app/Platform/Modules/Events/ModuleDisabledEvent.php
similarity index 91%
rename from app/Events/ModuleDisabledEvent.php
rename to app/Platform/Modules/Events/ModuleDisabledEvent.php
index 793fa94c..768e2830 100644
--- a/app/Events/ModuleDisabledEvent.php
+++ b/app/Platform/Modules/Events/ModuleDisabledEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events;
+namespace App\Platform\Modules\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
diff --git a/app/Events/ModuleEnabledEvent.php b/app/Platform/Modules/Events/ModuleEnabledEvent.php
similarity index 91%
rename from app/Events/ModuleEnabledEvent.php
rename to app/Platform/Modules/Events/ModuleEnabledEvent.php
index 9210758b..a36cec5d 100644
--- a/app/Events/ModuleEnabledEvent.php
+++ b/app/Platform/Modules/Events/ModuleEnabledEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events;
+namespace App\Platform\Modules\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
diff --git a/app/Events/ModuleInstalledEvent.php b/app/Platform/Modules/Events/ModuleInstalledEvent.php
similarity index 91%
rename from app/Events/ModuleInstalledEvent.php
rename to app/Platform/Modules/Events/ModuleInstalledEvent.php
index 9d669c98..54ea7e78 100644
--- a/app/Events/ModuleInstalledEvent.php
+++ b/app/Platform/Modules/Events/ModuleInstalledEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events;
+namespace App\Platform\Modules\Events;
 
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
diff --git a/app/Events/ModuleUninstalledEvent.php b/app/Platform/Modules/Events/ModuleUninstalledEvent.php
similarity index 79%
rename from app/Events/ModuleUninstalledEvent.php
rename to app/Platform/Modules/Events/ModuleUninstalledEvent.php
index 3ab6df9c..49d27a3d 100644
--- a/app/Events/ModuleUninstalledEvent.php
+++ b/app/Platform/Modules/Events/ModuleUninstalledEvent.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Events;
+namespace App\Platform\Modules\Events;
 
-use App\Models\Module;
+use App\Platform\Modules\Models\Module;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
diff --git a/app/Http/Controllers/Admin/Modules/MarketplacePairingController.php b/app/Platform/Modules/Http/Controllers/Admin/MarketplacePairingController.php
similarity index 94%
rename from app/Http/Controllers/Admin/Modules/MarketplacePairingController.php
rename to app/Platform/Modules/Http/Controllers/Admin/MarketplacePairingController.php
index dd5d6632..0174123d 100644
--- a/app/Http/Controllers/Admin/Modules/MarketplacePairingController.php
+++ b/app/Platform/Modules/Http/Controllers/Admin/MarketplacePairingController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Modules;
+namespace App\Platform\Modules\Http\Controllers\Admin;
 
-use App\Http\Controllers\Controller;
-use App\Models\MarketplaceCredential;
-use App\Services\Marketplace\MarketplaceClient;
+use App\Platform\Http\Controller;
+use App\Platform\Modules\Marketplace\MarketplaceClient;
+use App\Platform\Modules\Models\MarketplaceCredential;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Crypt;
diff --git a/app/Http/Controllers/Admin/Modules/ModuleInstallationController.php b/app/Platform/Modules/Http/Controllers/Admin/ModuleInstallationController.php
similarity index 79%
rename from app/Http/Controllers/Admin/Modules/ModuleInstallationController.php
rename to app/Platform/Modules/Http/Controllers/Admin/ModuleInstallationController.php
index 614573dc..dd9a2ed1 100644
--- a/app/Http/Controllers/Admin/Modules/ModuleInstallationController.php
+++ b/app/Platform/Modules/Http/Controllers/Admin/ModuleInstallationController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Modules;
+namespace App\Platform\Modules\Http\Controllers\Admin;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\InstallMarketplaceModuleRequest;
-use App\Http\Requests\UninstallMarketplaceModuleRequest;
-use App\Services\Marketplace\MarketplaceInstaller;
-use App\Services\Marketplace\MarketplaceUninstaller;
+use App\Platform\Http\Controller;
+use App\Platform\Modules\Http\Requests\InstallMarketplaceModuleRequest;
+use App\Platform\Modules\Http\Requests\UninstallMarketplaceModuleRequest;
+use App\Platform\Modules\Marketplace\MarketplaceInstaller;
+use App\Platform\Modules\Marketplace\MarketplaceUninstaller;
 use Illuminate\Http\JsonResponse;
 
 class ModuleInstallationController extends Controller
diff --git a/app/Http/Controllers/Admin/Modules/ModulesController.php b/app/Platform/Modules/Http/Controllers/Admin/ModulesController.php
similarity index 88%
rename from app/Http/Controllers/Admin/Modules/ModulesController.php
rename to app/Platform/Modules/Http/Controllers/Admin/ModulesController.php
index 15c4c43a..895ea456 100644
--- a/app/Http/Controllers/Admin/Modules/ModulesController.php
+++ b/app/Platform/Modules/Http/Controllers/Admin/ModulesController.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Modules;
+namespace App\Platform\Modules\Http\Controllers\Admin;
 
-use App\Events\ModuleDisabledEvent;
-use App\Events\ModuleEnabledEvent;
-use App\Http\Controllers\Controller;
-use App\Http\Resources\ModuleResource;
-use App\Models\Module as ModelsModule;
-use App\Services\Marketplace\DatabaseActivator;
-use App\Services\Marketplace\MarketplaceClient;
+use App\Platform\Http\Controller;
+use App\Platform\Modules\Events\ModuleDisabledEvent;
+use App\Platform\Modules\Events\ModuleEnabledEvent;
+use App\Platform\Modules\Http\Resources\ModuleResource;
+use App\Platform\Modules\Marketplace\MarketplaceClient;
+use App\Platform\Modules\Models\Module as ModelsModule;
+use App\Platform\Modules\Runtime\DatabaseActivator;
 use Illuminate\Http\JsonResponse;
 use Nwidart\Modules\Facades\Module;
 
diff --git a/app/Http/Controllers/Modules/ScriptController.php b/app/Platform/Modules/Http/Controllers/Assets/ScriptController.php
similarity index 90%
rename from app/Http/Controllers/Modules/ScriptController.php
rename to app/Platform/Modules/Http/Controllers/Assets/ScriptController.php
index 8b694aa8..6df972cc 100644
--- a/app/Http/Controllers/Modules/ScriptController.php
+++ b/app/Platform/Modules/Http/Controllers/Assets/ScriptController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Modules;
+namespace App\Platform\Modules\Http\Controllers\Assets;
 
-use App\Http\Controllers\Controller;
-use App\Support\Module\ModuleAssetVersion;
+use App\Platform\Http\Controller;
+use App\Platform\Modules\Runtime\ModuleAssetVersion;
 use DateTime;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
diff --git a/app/Http/Controllers/Modules/StyleController.php b/app/Platform/Modules/Http/Controllers/Assets/StyleController.php
similarity index 90%
rename from app/Http/Controllers/Modules/StyleController.php
rename to app/Platform/Modules/Http/Controllers/Assets/StyleController.php
index e6de2571..b18e388d 100644
--- a/app/Http/Controllers/Modules/StyleController.php
+++ b/app/Platform/Modules/Http/Controllers/Assets/StyleController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Modules;
+namespace App\Platform\Modules\Http\Controllers\Assets;
 
-use App\Http\Controllers\Controller;
-use App\Support\Module\ModuleAssetVersion;
+use App\Platform\Http\Controller;
+use App\Platform\Modules\Runtime\ModuleAssetVersion;
 use DateTime;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
diff --git a/app/Http/Controllers/Company/Modules/CompanyModulesController.php b/app/Platform/Modules/Http/Controllers/Company/CompanyModulesController.php
similarity index 95%
rename from app/Http/Controllers/Company/Modules/CompanyModulesController.php
rename to app/Platform/Modules/Http/Controllers/Company/CompanyModulesController.php
index 1a689f41..30d934a9 100644
--- a/app/Http/Controllers/Company/Modules/CompanyModulesController.php
+++ b/app/Platform/Modules/Http/Controllers/Company/CompanyModulesController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Company\Modules;
+namespace App\Platform\Modules\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Models\Module;
+use App\Platform\Http\Controller;
+use App\Platform\Modules\Models\Module;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Str;
 use InvoiceShelf\Modules\Registry as ModuleRegistry;
diff --git a/app/Http/Controllers/Company/Modules/ModuleSettingsController.php b/app/Platform/Modules/Http/Controllers/Company/ModuleSettingsController.php
similarity index 94%
rename from app/Http/Controllers/Company/Modules/ModuleSettingsController.php
rename to app/Platform/Modules/Http/Controllers/Company/ModuleSettingsController.php
index 576f9ffa..01c71999 100644
--- a/app/Http/Controllers/Company/Modules/ModuleSettingsController.php
+++ b/app/Platform/Modules/Http/Controllers/Company/ModuleSettingsController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Company\Modules;
+namespace App\Platform\Modules\Http\Controllers\Company;
 
-use App\Http\Controllers\Controller;
-use App\Models\CompanySetting;
+use App\Platform\Http\Controller;
+use App\Platform\Modules\Contracts\ModuleSettingsStore;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use InvoiceShelf\Modules\Registry as ModuleRegistry;
@@ -23,6 +23,8 @@ use InvoiceShelf\Modules\Settings\Schema;
  */
 class ModuleSettingsController extends Controller
 {
+    public function __construct(private ModuleSettingsStore $settings) {}
+
     public function show(Request $request, string $slug): JsonResponse
     {
         $this->authorize('manage module settings');
@@ -35,7 +37,7 @@ class ModuleSettingsController extends Controller
 
         $values = collect($schema->fields())
             ->mapWithKeys(fn (array $field) => [
-                $field['key'] => CompanySetting::getSetting(
+                $field['key'] => $this->settings->get(
                     "module.{$slug}.{$field['key']}",
                     $request->header('company')
                 ) ?? $field['default'],
@@ -75,7 +77,7 @@ class ModuleSettingsController extends Controller
         }
 
         if ($settingsToWrite !== []) {
-            CompanySetting::setSettings($settingsToWrite, $companyId);
+            $this->settings->put($settingsToWrite, $companyId);
         }
 
         return response()->json(['success' => true]);
diff --git a/app/Http/Requests/InstallMarketplaceModuleRequest.php b/app/Platform/Modules/Http/Requests/InstallMarketplaceModuleRequest.php
similarity index 94%
rename from app/Http/Requests/InstallMarketplaceModuleRequest.php
rename to app/Platform/Modules/Http/Requests/InstallMarketplaceModuleRequest.php
index 7240c04d..8bc6b985 100644
--- a/app/Http/Requests/InstallMarketplaceModuleRequest.php
+++ b/app/Platform/Modules/Http/Requests/InstallMarketplaceModuleRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Platform\Modules\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/UninstallMarketplaceModuleRequest.php b/app/Platform/Modules/Http/Requests/UninstallMarketplaceModuleRequest.php
similarity index 93%
rename from app/Http/Requests/UninstallMarketplaceModuleRequest.php
rename to app/Platform/Modules/Http/Requests/UninstallMarketplaceModuleRequest.php
index e41548be..237949c2 100644
--- a/app/Http/Requests/UninstallMarketplaceModuleRequest.php
+++ b/app/Platform/Modules/Http/Requests/UninstallMarketplaceModuleRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Platform\Modules\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/app/Http/Requests/UploadModuleRequest.php b/app/Platform/Modules/Http/Requests/UploadModuleRequest.php
similarity index 93%
rename from app/Http/Requests/UploadModuleRequest.php
rename to app/Platform/Modules/Http/Requests/UploadModuleRequest.php
index af53cae0..197bb8ea 100644
--- a/app/Http/Requests/UploadModuleRequest.php
+++ b/app/Platform/Modules/Http/Requests/UploadModuleRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Platform\Modules\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Resources/ModuleCollection.php b/app/Platform/Modules/Http/Resources/ModuleCollection.php
similarity index 90%
rename from app/Http/Resources/ModuleCollection.php
rename to app/Platform/Modules/Http/Resources/ModuleCollection.php
index 1884a964..3d167c0e 100644
--- a/app/Http/Resources/ModuleCollection.php
+++ b/app/Platform/Modules/Http/Resources/ModuleCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Platform\Modules\Http\Resources;
 
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Request;
diff --git a/app/Http/Resources/ModuleResource.php b/app/Platform/Modules/Http/Resources/ModuleResource.php
similarity index 98%
rename from app/Http/Resources/ModuleResource.php
rename to app/Platform/Modules/Http/Resources/ModuleResource.php
index 1818daf7..a054c85b 100644
--- a/app/Http/Resources/ModuleResource.php
+++ b/app/Platform/Modules/Http/Resources/ModuleResource.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Platform\Modules\Http\Resources;
 
-use App\Models\Module as ModelsModule;
+use App\Platform\Modules\Models\Module as ModelsModule;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Platform/Modules/Infrastructure/EloquentModuleSettingsStore.php b/app/Platform/Modules/Infrastructure/EloquentModuleSettingsStore.php
new file mode 100644
index 00000000..5773a2bf
--- /dev/null
+++ b/app/Platform/Modules/Infrastructure/EloquentModuleSettingsStore.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Platform\Modules\Infrastructure;
+
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Platform\Modules\Contracts\ModuleSettingsStore;
+
+class EloquentModuleSettingsStore implements ModuleSettingsStore
+{
+    public function get(string $key, int|string|null $companyId): mixed
+    {
+        return CompanySetting::getSetting($key, $companyId);
+    }
+
+    public function put(array $settings, int|string|null $companyId): void
+    {
+        CompanySetting::setSettings($settings, $companyId);
+    }
+
+    public function deleteForModule(string $slug): void
+    {
+        CompanySetting::query()
+            ->where('option', 'like', "module.{$slug}.%")
+            ->delete();
+    }
+}
diff --git a/app/Services/Marketplace/CanonicalJson.php b/app/Platform/Modules/Marketplace/CanonicalJson.php
similarity index 94%
rename from app/Services/Marketplace/CanonicalJson.php
rename to app/Platform/Modules/Marketplace/CanonicalJson.php
index 9a3f95c4..d72f1d2f 100644
--- a/app/Services/Marketplace/CanonicalJson.php
+++ b/app/Platform/Modules/Marketplace/CanonicalJson.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Marketplace;
+namespace App\Platform\Modules\Marketplace;
 
 use JsonException;
 
diff --git a/app/Services/Marketplace/MarketplaceClient.php b/app/Platform/Modules/Marketplace/MarketplaceClient.php
similarity index 96%
rename from app/Services/Marketplace/MarketplaceClient.php
rename to app/Platform/Modules/Marketplace/MarketplaceClient.php
index a1fa5aa3..abe1c5e3 100644
--- a/app/Services/Marketplace/MarketplaceClient.php
+++ b/app/Platform/Modules/Marketplace/MarketplaceClient.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Services\Marketplace;
+namespace App\Platform\Modules\Marketplace;
 
-use App\Models\MarketplaceCredential;
-use App\Models\Setting;
+use App\Platform\Modules\Models\MarketplaceCredential;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Crypt;
diff --git a/app/Services/Marketplace/MarketplaceInstaller.php b/app/Platform/Modules/Marketplace/MarketplaceInstaller.php
similarity index 99%
rename from app/Services/Marketplace/MarketplaceInstaller.php
rename to app/Platform/Modules/Marketplace/MarketplaceInstaller.php
index 2446231e..054d66c2 100644
--- a/app/Services/Marketplace/MarketplaceInstaller.php
+++ b/app/Platform/Modules/Marketplace/MarketplaceInstaller.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace App\Services\Marketplace;
+namespace App\Platform\Modules\Marketplace;
 
-use App\Events\ModuleEnabledEvent;
-use App\Events\ModuleInstalledEvent;
-use App\Models\Module as InstalledModule;
-use App\Models\Setting;
+use App\Platform\Modules\Events\ModuleEnabledEvent;
+use App\Platform\Modules\Events\ModuleInstalledEvent;
+use App\Platform\Modules\Models\Module as InstalledModule;
+use App\Platform\Modules\Runtime\ModuleRuntimeAutoloader;
+use App\Platform\Operations\Models\Setting;
 use Composer\Semver\Semver;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
diff --git a/app/Services/Marketplace/MarketplaceOperationLease.php b/app/Platform/Modules/Marketplace/MarketplaceOperationLease.php
similarity index 93%
rename from app/Services/Marketplace/MarketplaceOperationLease.php
rename to app/Platform/Modules/Marketplace/MarketplaceOperationLease.php
index 980bdc21..d21422bb 100644
--- a/app/Services/Marketplace/MarketplaceOperationLease.php
+++ b/app/Platform/Modules/Marketplace/MarketplaceOperationLease.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Marketplace;
+namespace App\Platform\Modules\Marketplace;
 
-use App\Models\MarketplaceOperation;
+use App\Platform\Modules\Models\MarketplaceOperation;
 use Throwable;
 
 class MarketplaceOperationLease
diff --git a/app/Services/Marketplace/MarketplaceUninstaller.php b/app/Platform/Modules/Marketplace/MarketplaceUninstaller.php
similarity index 96%
rename from app/Services/Marketplace/MarketplaceUninstaller.php
rename to app/Platform/Modules/Marketplace/MarketplaceUninstaller.php
index e5aa6618..0499ab5a 100644
--- a/app/Services/Marketplace/MarketplaceUninstaller.php
+++ b/app/Platform/Modules/Marketplace/MarketplaceUninstaller.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Services\Marketplace;
+namespace App\Platform\Modules\Marketplace;
 
-use App\Events\ModuleUninstalledEvent;
-use App\Models\CompanySetting;
-use App\Models\Module as InstalledModule;
+use App\Platform\Modules\Contracts\ModuleSettingsStore;
+use App\Platform\Modules\Events\ModuleUninstalledEvent;
+use App\Platform\Modules\Models\Module as InstalledModule;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\ServiceProvider;
@@ -15,7 +15,10 @@ use Throwable;
 
 class MarketplaceUninstaller
 {
-    public function __construct(private MarketplaceOperationLease $operations) {}
+    public function __construct(
+        private MarketplaceOperationLease $operations,
+        private ModuleSettingsStore $settings,
+    ) {}
 
     /**
      * @return array{success: bool, operation_id?: int, error?: string}
@@ -68,7 +71,7 @@ class MarketplaceUninstaller
             if ($removeData) {
                 $this->runDataCleanup($cleanup);
                 $this->resetMigrations($module);
-                CompanySetting::query()->where('option', 'like', 'module.'.$manifest['slug'].'.%')->delete();
+                $this->settings->deleteForModule($manifest['slug']);
             }
 
             $backup = $this->backUpRuntime($module, (string) $operation->id);
diff --git a/app/Models/MarketplaceCredential.php b/app/Platform/Modules/Models/MarketplaceCredential.php
similarity index 78%
rename from app/Models/MarketplaceCredential.php
rename to app/Platform/Modules/Models/MarketplaceCredential.php
index a96c2548..dd24c8f9 100644
--- a/app/Models/MarketplaceCredential.php
+++ b/app/Platform/Modules/Models/MarketplaceCredential.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace App\Models;
+namespace App\Platform\Modules\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
 class MarketplaceCredential extends Model
 {
+    protected $table = 'marketplace_credentials';
+
     protected $guarded = ['id'];
 
     protected $hidden = ['credential'];
diff --git a/app/Models/MarketplaceOperation.php b/app/Platform/Modules/Models/MarketplaceOperation.php
similarity index 78%
rename from app/Models/MarketplaceOperation.php
rename to app/Platform/Modules/Models/MarketplaceOperation.php
index 6e622210..beff4ff6 100644
--- a/app/Models/MarketplaceOperation.php
+++ b/app/Platform/Modules/Models/MarketplaceOperation.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace App\Models;
+namespace App\Platform\Modules\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
 class MarketplaceOperation extends Model
 {
+    protected $table = 'marketplace_operations';
+
     protected $guarded = ['id'];
 
     protected function casts(): array
diff --git a/app/Models/Module.php b/app/Platform/Modules/Models/Module.php
similarity index 83%
rename from app/Models/Module.php
rename to app/Platform/Modules/Models/Module.php
index 957dd66b..bf639e15 100644
--- a/app/Models/Module.php
+++ b/app/Platform/Modules/Models/Module.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Platform\Modules\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -9,6 +9,8 @@ class Module extends Model
 {
     use HasFactory;
 
+    protected $table = 'modules';
+
     protected $guarded = ['id'];
 
     protected function casts(): array
diff --git a/app/Platform/Modules/ModuleServiceProvider.php b/app/Platform/Modules/ModuleServiceProvider.php
new file mode 100644
index 00000000..e7f0e64a
--- /dev/null
+++ b/app/Platform/Modules/ModuleServiceProvider.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Platform\Modules;
+
+use App\Platform\Modules\Console\InstallModuleCommand;
+use App\Platform\Modules\Console\UninstallModuleCommand;
+use App\Platform\Modules\Contracts\ModuleSettingsStore;
+use App\Platform\Modules\Infrastructure\EloquentModuleSettingsStore;
+use App\Platform\Modules\Policies\ModulePolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+
+class ModuleServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->bind(ModuleSettingsStore::class, EloquentModuleSettingsStore::class);
+    }
+
+    public function boot(): void
+    {
+        $this->loadRoutesFrom(__DIR__.'/routes/api.php');
+        $this->loadRoutesFrom(__DIR__.'/routes/web.php');
+
+        if ($this->app->runningInConsole()) {
+            $this->commands([
+                InstallModuleCommand::class,
+                UninstallModuleCommand::class,
+            ]);
+        }
+
+        Gate::define('manage modules', [ModulePolicy::class, 'manageModules']);
+        Gate::define('manage module settings', [ModulePolicy::class, 'manageSettings']);
+    }
+}
diff --git a/app/Platform/Modules/Policies/ModulePolicy.php b/app/Platform/Modules/Policies/ModulePolicy.php
new file mode 100644
index 00000000..91ddbcae
--- /dev/null
+++ b/app/Platform/Modules/Policies/ModulePolicy.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Platform\Modules\Policies;
+
+use App\Domains\Accounts\Models\User;
+use Illuminate\Auth\Access\HandlesAuthorization;
+
+class ModulePolicy
+{
+    use HandlesAuthorization;
+
+    public function manageModules(User $user): bool
+    {
+        return $user->isSuperAdmin();
+    }
+
+    public function manageSettings(User $user): bool
+    {
+        return $user->isSuperAdmin() || $user->isOwner();
+    }
+}
diff --git a/app/Services/Marketplace/DatabaseActivator.php b/app/Platform/Modules/Runtime/DatabaseActivator.php
similarity index 98%
rename from app/Services/Marketplace/DatabaseActivator.php
rename to app/Platform/Modules/Runtime/DatabaseActivator.php
index ae5c2c36..f6bb8558 100644
--- a/app/Services/Marketplace/DatabaseActivator.php
+++ b/app/Platform/Modules/Runtime/DatabaseActivator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Marketplace;
+namespace App\Platform\Modules\Runtime;
 
 use Illuminate\Container\Container;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Support/Module/ModuleAssetVersion.php b/app/Platform/Modules/Runtime/ModuleAssetVersion.php
similarity index 91%
rename from app/Support/Module/ModuleAssetVersion.php
rename to app/Platform/Modules/Runtime/ModuleAssetVersion.php
index 0bbfc449..2213b0be 100644
--- a/app/Support/Module/ModuleAssetVersion.php
+++ b/app/Platform/Modules/Runtime/ModuleAssetVersion.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Module;
+namespace App\Platform\Modules\Runtime;
 
 class ModuleAssetVersion
 {
diff --git a/app/Support/Module/ModuleInstaller.php b/app/Platform/Modules/Runtime/ModuleInstaller.php
similarity index 74%
rename from app/Support/Module/ModuleInstaller.php
rename to app/Platform/Modules/Runtime/ModuleInstaller.php
index 3a06b173..7c8529fe 100644
--- a/app/Support/Module/ModuleInstaller.php
+++ b/app/Platform/Modules/Runtime/ModuleInstaller.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Support\Module;
+namespace App\Platform\Modules\Runtime;
 
-use App\Events\ModuleEnabledEvent;
-use App\Events\ModuleInstalledEvent;
-use App\Models\Module as ModelsModule;
+use App\Platform\Modules\Events\ModuleEnabledEvent;
+use App\Platform\Modules\Events\ModuleInstalledEvent;
+use App\Platform\Modules\Models\Module as ModelsModule;
 use Artisan;
 use Nwidart\Modules\Facades\Module;
 
diff --git a/app/Services/Marketplace/ModuleRuntimeAutoloader.php b/app/Platform/Modules/Runtime/ModuleRuntimeAutoloader.php
similarity index 92%
rename from app/Services/Marketplace/ModuleRuntimeAutoloader.php
rename to app/Platform/Modules/Runtime/ModuleRuntimeAutoloader.php
index 77d3adfe..52d657b5 100644
--- a/app/Services/Marketplace/ModuleRuntimeAutoloader.php
+++ b/app/Platform/Modules/Runtime/ModuleRuntimeAutoloader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Marketplace;
+namespace App\Platform\Modules\Runtime;
 
 class ModuleRuntimeAutoloader
 {
@@ -15,7 +15,7 @@ class ModuleRuntimeAutoloader
      */
     public static function registerInstalledModules(?string $modulesPath = null): void
     {
-        $modulesPath ??= dirname(__DIR__, 3).'/Modules';
+        $modulesPath ??= dirname(__DIR__, 4).'/Modules';
 
         if (! is_dir($modulesPath)) {
             return;
@@ -34,7 +34,7 @@ class ModuleRuntimeAutoloader
 
     public static function register(string $name, ?string $modulesPath = null): void
     {
-        $modulesPath ??= dirname(__DIR__, 3).'/Modules';
+        $modulesPath ??= dirname(__DIR__, 4).'/Modules';
         $prefix = "Modules\\{$name}\\";
         $base = rtrim($modulesPath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$name.DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR;
         $registration = $prefix.$base;
diff --git a/app/Platform/Modules/routes/api.php b/app/Platform/Modules/routes/api.php
new file mode 100644
index 00000000..03fc133b
--- /dev/null
+++ b/app/Platform/Modules/routes/api.php
@@ -0,0 +1,29 @@
+<?php
+
+use App\Platform\Modules\Http\Controllers\Admin\MarketplacePairingController;
+use App\Platform\Modules\Http\Controllers\Admin\ModuleInstallationController;
+use App\Platform\Modules\Http\Controllers\Admin\ModulesController;
+use App\Platform\Modules\Http\Controllers\Company\CompanyModulesController;
+use App\Platform\Modules\Http\Controllers\Company\ModuleSettingsController;
+use Illuminate\Support\Facades\Route;
+
+Route::middleware(['api', 'auth:sanctum', 'company'])
+    ->prefix('api/v1')
+    ->group(function () {
+        Route::prefix('modules')->group(function () {
+            Route::get('/', [ModulesController::class, 'index']);
+            Route::get('/pairing', [MarketplacePairingController::class, 'status']);
+            Route::post('/pairing/start', [MarketplacePairingController::class, 'start']);
+            Route::post('/pairing/poll', [MarketplacePairingController::class, 'poll']);
+            Route::delete('/pairing', [MarketplacePairingController::class, 'disconnect']);
+            Route::get('/{module}', [ModulesController::class, 'show']);
+            Route::post('/{module}/enable', [ModulesController::class, 'enable']);
+            Route::post('/{module}/disable', [ModulesController::class, 'disable']);
+            Route::post('/{module}/uninstall', [ModuleInstallationController::class, 'uninstall']);
+            Route::post('/install', [ModuleInstallationController::class, 'install']);
+            Route::get('/{slug}/settings', [ModuleSettingsController::class, 'show']);
+            Route::put('/{slug}/settings', [ModuleSettingsController::class, 'update']);
+        });
+
+        Route::get('/company-modules', [CompanyModulesController::class, 'index']);
+    });
diff --git a/app/Platform/Modules/routes/web.php b/app/Platform/Modules/routes/web.php
new file mode 100644
index 00000000..d78c0d8a
--- /dev/null
+++ b/app/Platform/Modules/routes/web.php
@@ -0,0 +1,10 @@
+<?php
+
+use App\Platform\Modules\Http\Controllers\Assets\ScriptController;
+use App\Platform\Modules\Http\Controllers\Assets\StyleController;
+use Illuminate\Support\Facades\Route;
+
+Route::middleware('web')->group(function () {
+    Route::get('/modules/styles/{style}', StyleController::class);
+    Route::get('/modules/scripts/{script}', ScriptController::class);
+});
diff --git a/app/Platform/Operations/Application/RuntimeConfigurationService.php b/app/Platform/Operations/Application/RuntimeConfigurationService.php
new file mode 100644
index 00000000..09f78a42
--- /dev/null
+++ b/app/Platform/Operations/Application/RuntimeConfigurationService.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Platform\Operations\Application;
+
+use App\Platform\Mail\Contracts\MailConfigurator;
+use App\Platform\Operations\Installation\Application\InstallationState;
+use App\Platform\Pdf\Contracts\PdfConfigurator;
+use App\Platform\Storage\Contracts\StorageConfigurator;
+
+class RuntimeConfigurationService
+{
+    public function __construct(
+        private readonly MailConfigurator $mail,
+        private readonly PdfConfigurator $pdf,
+        private readonly StorageConfigurator $storage,
+    ) {}
+
+    public function apply(): void
+    {
+        if (! InstallationState::isDbCreated()) {
+            return;
+        }
+
+        foreach ([$this->mail, $this->pdf, $this->storage] as $configurator) {
+            try {
+                $configurator->applyGlobalConfig();
+            } catch (\Exception) {
+                // Installation and migration commands can boot while the schema
+                // is incomplete. File configuration remains the safe fallback.
+            }
+        }
+    }
+}
diff --git a/app/Console/Commands/ResetApp.php b/app/Platform/Operations/Console/ResetApp.php
similarity index 98%
rename from app/Console/Commands/ResetApp.php
rename to app/Platform/Operations/Console/ResetApp.php
index 2e9036ba..bd587da6 100644
--- a/app/Console/Commands/ResetApp.php
+++ b/app/Platform/Operations/Console/ResetApp.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Platform\Operations\Console;
 
 use Illuminate\Console\Command;
 use Illuminate\Console\ConfirmableTrait;
diff --git a/app/Console/Commands/UpdateCommand.php b/app/Platform/Operations/Console/UpdateCommand.php
similarity index 98%
rename from app/Console/Commands/UpdateCommand.php
rename to app/Platform/Operations/Console/UpdateCommand.php
index bbe0e6e7..7ba2872d 100644
--- a/app/Console/Commands/UpdateCommand.php
+++ b/app/Platform/Operations/Console/UpdateCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Platform\Operations\Console;
 
-use App\Support\Update\Updater;
+use App\Platform\Operations\Update\Updater;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 
diff --git a/app/Events/UpdateFinished.php b/app/Platform/Operations/Events/UpdateFinished.php
similarity index 88%
rename from app/Events/UpdateFinished.php
rename to app/Platform/Operations/Events/UpdateFinished.php
index 1b7a7ae9..a9d1c614 100644
--- a/app/Events/UpdateFinished.php
+++ b/app/Platform/Operations/Events/UpdateFinished.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Events;
+namespace App\Platform\Operations\Events;
 
 use Illuminate\Foundation\Events\Dispatchable;
 
diff --git a/app/Http/Controllers/Admin/AdminDashboardController.php b/app/Platform/Operations/Http/Admin/AdminDashboardController.php
similarity index 89%
rename from app/Http/Controllers/Admin/AdminDashboardController.php
rename to app/Platform/Operations/Http/Admin/AdminDashboardController.php
index 4e37a505..7ce32717 100644
--- a/app/Http/Controllers/Admin/AdminDashboardController.php
+++ b/app/Platform/Operations/Http/Admin/AdminDashboardController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Platform\Operations\Http\Admin;
 
-use App\Http\Controllers\Controller;
-use App\Models\Company;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
diff --git a/app/Http/Controllers/Admin/Settings/SettingsController.php b/app/Platform/Operations/Http/Admin/SettingsController.php
similarity index 72%
rename from app/Http/Controllers/Admin/Settings/SettingsController.php
rename to app/Platform/Operations/Http/Admin/SettingsController.php
index e399dbde..854e47f2 100644
--- a/app/Http/Controllers/Admin/Settings/SettingsController.php
+++ b/app/Platform/Operations/Http/Admin/SettingsController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Settings;
+namespace App\Platform\Operations\Http\Admin;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\GetSettingRequest;
-use App\Http\Requests\SettingRequest;
-use App\Models\Setting;
+use App\Platform\Http\Controller;
+use App\Platform\Operations\Http\Requests\GetSettingRequest;
+use App\Platform\Operations\Http\Requests\SettingRequest;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Http\JsonResponse;
 
 class SettingsController extends Controller
diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Platform/Operations/Http/Admin/UpdateController.php
similarity index 95%
rename from app/Http/Controllers/Admin/UpdateController.php
rename to app/Platform/Operations/Http/Admin/UpdateController.php
index 16b3a28b..cd67ac2f 100644
--- a/app/Http/Controllers/Admin/UpdateController.php
+++ b/app/Platform/Operations/Http/Admin/UpdateController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Platform\Operations\Http\Admin;
 
-use App\Http\Controllers\Controller;
-use App\Support\Update\Updater;
+use App\Platform\Http\Controller;
+use App\Platform\Operations\Update\Updater;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\File;
diff --git a/app/Http/Controllers/AppVersionController.php b/app/Platform/Operations/Http/AppVersionController.php
similarity index 87%
rename from app/Http/Controllers/AppVersionController.php
rename to app/Platform/Operations/Http/AppVersionController.php
index 02e4d511..cab20a74 100644
--- a/app/Http/Controllers/AppVersionController.php
+++ b/app/Platform/Operations/Http/AppVersionController.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Platform\Operations\Http;
 
-use App\Models\Setting;
+use App\Platform\Http\Controller;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\File;
diff --git a/app/Http/Controllers/Company/General/BootstrapController.php b/app/Platform/Operations/Http/Company/BootstrapController.php
similarity index 90%
rename from app/Http/Controllers/Company/General/BootstrapController.php
rename to app/Platform/Operations/Http/Company/BootstrapController.php
index d55d626b..8ea21284 100644
--- a/app/Http/Controllers/Company/General/BootstrapController.php
+++ b/app/Platform/Operations/Http/Company/BootstrapController.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace App\Http\Controllers\Company\General;
+namespace App\Platform\Operations\Http\Company;
 
-use App\Http\Controllers\Controller;
-use App\Http\Resources\CompanyInvitationResource;
-use App\Http\Resources\CompanyResource;
-use App\Http\Resources\UserResource;
-use App\Models\Company;
-use App\Models\CompanyInvitation;
-use App\Models\CompanySetting;
-use App\Models\Currency;
-use App\Models\Module;
-use App\Models\Setting;
-use App\Services\AiConfigurationService;
-use App\Traits\GeneratesMenuTrait;
+use App\Domains\Accounts\Http\Resources\CompanyInvitationResource;
+use App\Domains\Accounts\Http\Resources\CompanyResource;
+use App\Domains\Accounts\Http\Resources\UserResource;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanyInvitation;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Money\Models\Currency;
+use App\Platform\Ai\Application\AiConfigurationService;
+use App\Platform\Http\Controller;
+use App\Platform\Modules\Models\Module;
+use App\Platform\Operations\Http\Concerns\GeneratesMenu;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use InvoiceShelf\Modules\Registry as ModuleRegistry;
@@ -21,7 +21,7 @@ use Silber\Bouncer\BouncerFacade;
 
 class BootstrapController extends Controller
 {
-    use GeneratesMenuTrait;
+    use GeneratesMenu;
 
     /**
      * Handle the incoming request.
diff --git a/app/Http/Controllers/Company/General/ConfigController.php b/app/Platform/Operations/Http/Company/ConfigController.php
similarity index 94%
rename from app/Http/Controllers/Company/General/ConfigController.php
rename to app/Platform/Operations/Http/Company/ConfigController.php
index 5959784f..02fe83b5 100644
--- a/app/Http/Controllers/Company/General/ConfigController.php
+++ b/app/Platform/Operations/Http/Company/ConfigController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Company\General;
+namespace App\Platform\Operations\Http\Company;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use InvoiceShelf\Modules\Registry;
diff --git a/app/Http/Controllers/Company/General/FormatsController.php b/app/Platform/Operations/Http/Company/FormatsController.php
similarity index 89%
rename from app/Http/Controllers/Company/General/FormatsController.php
rename to app/Platform/Operations/Http/Company/FormatsController.php
index 9c8e9951..02563983 100644
--- a/app/Http/Controllers/Company/General/FormatsController.php
+++ b/app/Platform/Operations/Http/Company/FormatsController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Company\General;
+namespace App\Platform\Operations\Http\Company;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use App\Support\Formatting\DateFormatter;
 use App\Support\Formatting\TimeFormatter;
 use App\Support\Formatting\TimeZones;
diff --git a/app/Traits/GeneratesMenuTrait.php b/app/Platform/Operations/Http/Concerns/GeneratesMenu.php
similarity index 91%
rename from app/Traits/GeneratesMenuTrait.php
rename to app/Platform/Operations/Http/Concerns/GeneratesMenu.php
index e2eff819..ba106e73 100644
--- a/app/Traits/GeneratesMenuTrait.php
+++ b/app/Platform/Operations/Http/Concerns/GeneratesMenu.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Traits;
+namespace App\Platform\Operations\Http\Concerns;
 
-trait GeneratesMenuTrait
+trait GeneratesMenu
 {
     public function generateMenu($key, $user)
     {
diff --git a/app/Http/Middleware/CronJobMiddleware.php b/app/Platform/Operations/Http/Middleware/CronJobMiddleware.php
similarity index 91%
rename from app/Http/Middleware/CronJobMiddleware.php
rename to app/Platform/Operations/Http/Middleware/CronJobMiddleware.php
index fad8ae67..6ba0ffee 100644
--- a/app/Http/Middleware/CronJobMiddleware.php
+++ b/app/Platform/Operations/Http/Middleware/CronJobMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Platform\Operations\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
diff --git a/app/Http/Middleware/EnsureNotContainerized.php b/app/Platform/Operations/Http/Middleware/EnsureNotContainerized.php
similarity index 93%
rename from app/Http/Middleware/EnsureNotContainerized.php
rename to app/Platform/Operations/Http/Middleware/EnsureNotContainerized.php
index c3fe2260..a446e1b5 100644
--- a/app/Http/Middleware/EnsureNotContainerized.php
+++ b/app/Platform/Operations/Http/Middleware/EnsureNotContainerized.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Platform\Operations\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
diff --git a/app/Http/Requests/GetSettingRequest.php b/app/Platform/Operations/Http/Requests/GetSettingRequest.php
similarity index 91%
rename from app/Http/Requests/GetSettingRequest.php
rename to app/Platform/Operations/Http/Requests/GetSettingRequest.php
index a5441e71..f157de35 100644
--- a/app/Http/Requests/GetSettingRequest.php
+++ b/app/Platform/Operations/Http/Requests/GetSettingRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Platform\Operations\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/SettingRequest.php b/app/Platform/Operations/Http/Requests/SettingRequest.php
similarity index 90%
rename from app/Http/Requests/SettingRequest.php
rename to app/Platform/Operations/Http/Requests/SettingRequest.php
index f2fb859b..02cb268f 100644
--- a/app/Http/Requests/SettingRequest.php
+++ b/app/Platform/Operations/Http/Requests/SettingRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Platform\Operations\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Controllers/Webhook/CronJobController.php b/app/Platform/Operations/Http/Webhooks/CronJobController.php
similarity index 82%
rename from app/Http/Controllers/Webhook/CronJobController.php
rename to app/Platform/Operations/Http/Webhooks/CronJobController.php
index dd89dc59..45ee2f4c 100644
--- a/app/Http/Controllers/Webhook/CronJobController.php
+++ b/app/Platform/Operations/Http/Webhooks/CronJobController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Webhook;
+namespace App\Platform\Operations\Http\Webhooks;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Artisan;
diff --git a/app/Support/Setup/EnvironmentManager.php b/app/Platform/Operations/Installation/Application/EnvironmentManager.php
old mode 100755
new mode 100644
similarity index 97%
rename from app/Support/Setup/EnvironmentManager.php
rename to app/Platform/Operations/Installation/Application/EnvironmentManager.php
index 67b494d5..35dfbabd
--- a/app/Support/Setup/EnvironmentManager.php
+++ b/app/Platform/Operations/Installation/Application/EnvironmentManager.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Support\Setup;
+namespace App\Platform\Operations\Installation\Application;
 
-use App\Http\Requests\DatabaseEnvironmentRequest;
-use App\Http\Requests\DomainEnvironmentRequest;
+use App\Platform\Operations\Installation\Http\Requests\DatabaseEnvironmentRequest;
+use App\Platform\Operations\Installation\Http\Requests\DomainEnvironmentRequest;
 use Exception;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Support/Setup/FilePermissionChecker.php b/app/Platform/Operations/Installation/Application/FilePermissionChecker.php
similarity index 96%
rename from app/Support/Setup/FilePermissionChecker.php
rename to app/Platform/Operations/Installation/Application/FilePermissionChecker.php
index d8a8295b..68e5a444 100644
--- a/app/Support/Setup/FilePermissionChecker.php
+++ b/app/Platform/Operations/Installation/Application/FilePermissionChecker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Setup;
+namespace App\Platform\Operations\Installation\Application;
 
 class FilePermissionChecker
 {
diff --git a/app/Support/Setup/InstallUtils.php b/app/Platform/Operations/Installation/Application/InstallationState.php
similarity index 89%
rename from app/Support/Setup/InstallUtils.php
rename to app/Platform/Operations/Installation/Application/InstallationState.php
index e70cd84e..aa5fde7a 100644
--- a/app/Support/Setup/InstallUtils.php
+++ b/app/Platform/Operations/Installation/Application/InstallationState.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Support\Setup;
+namespace App\Platform\Operations\Installation\Application;
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\File;
 
-class InstallUtils
+class InstallationState
 {
     /**
      * Check if database is created
diff --git a/app/Support/Setup/RequirementsChecker.php b/app/Platform/Operations/Installation/Application/RequirementsChecker.php
old mode 100755
new mode 100644
similarity index 99%
rename from app/Support/Setup/RequirementsChecker.php
rename to app/Platform/Operations/Installation/Application/RequirementsChecker.php
index a415bfd7..b36f1a14
--- a/app/Support/Setup/RequirementsChecker.php
+++ b/app/Platform/Operations/Installation/Application/RequirementsChecker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Setup;
+namespace App\Platform\Operations\Installation\Application;
 
 use Illuminate\Support\Str;
 use PDO;
diff --git a/app/Support/Setup/InstallWizardAuth.php b/app/Platform/Operations/Installation/Authentication/InstallWizardAuth.php
similarity index 86%
rename from app/Support/Setup/InstallWizardAuth.php
rename to app/Platform/Operations/Installation/Authentication/InstallWizardAuth.php
index 0a60ba7a..8d3a05cc 100644
--- a/app/Support/Setup/InstallWizardAuth.php
+++ b/app/Platform/Operations/Installation/Authentication/InstallWizardAuth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Setup;
+namespace App\Platform\Operations\Installation\Authentication;
 
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Setup/AppDomainController.php b/app/Platform/Operations/Installation/Http/Controllers/AppDomainController.php
similarity index 67%
rename from app/Http/Controllers/Setup/AppDomainController.php
rename to app/Platform/Operations/Installation/Http/Controllers/AppDomainController.php
index e0eca00c..64847915 100644
--- a/app/Http/Controllers/Setup/AppDomainController.php
+++ b/app/Platform/Operations/Installation/Http/Controllers/AppDomainController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Setup;
+namespace App\Platform\Operations\Installation\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\DomainEnvironmentRequest;
-use App\Support\Setup\EnvironmentManager;
+use App\Platform\Http\Controller;
+use App\Platform\Operations\Installation\Application\EnvironmentManager;
+use App\Platform\Operations\Installation\Http\Requests\DomainEnvironmentRequest;
 use Illuminate\Support\Facades\Artisan;
 
 class AppDomainController extends Controller
diff --git a/app/Http/Controllers/Setup/DatabaseConfigurationController.php b/app/Platform/Operations/Installation/Http/Controllers/DatabaseConfigurationController.php
similarity index 89%
rename from app/Http/Controllers/Setup/DatabaseConfigurationController.php
rename to app/Platform/Operations/Installation/Http/Controllers/DatabaseConfigurationController.php
index 612078a3..57e75651 100644
--- a/app/Http/Controllers/Setup/DatabaseConfigurationController.php
+++ b/app/Platform/Operations/Installation/Http/Controllers/DatabaseConfigurationController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Setup;
+namespace App\Platform\Operations\Installation\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\DatabaseEnvironmentRequest;
-use App\Support\Setup\EnvironmentManager;
-use App\Support\Setup\InstallUtils;
+use App\Platform\Http\Controller;
+use App\Platform\Operations\Installation\Application\EnvironmentManager;
+use App\Platform\Operations\Installation\Application\InstallationState;
+use App\Platform\Operations\Installation\Http\Requests\DatabaseEnvironmentRequest;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
 
@@ -39,7 +39,7 @@ class DatabaseConfigurationController extends Controller
             Artisan::call('storage:link');
             Artisan::call('migrate --seed --force');
             // Set version.
-            InstallUtils::setCurrentVersion();
+            InstallationState::setCurrentVersion();
         }
 
         return response()->json($results);
diff --git a/app/Http/Controllers/Setup/FilePermissionsController.php b/app/Platform/Operations/Installation/Http/Controllers/FilePermissionsController.php
similarity index 79%
rename from app/Http/Controllers/Setup/FilePermissionsController.php
rename to app/Platform/Operations/Installation/Http/Controllers/FilePermissionsController.php
index 1db0787e..008458e6 100644
--- a/app/Http/Controllers/Setup/FilePermissionsController.php
+++ b/app/Platform/Operations/Installation/Http/Controllers/FilePermissionsController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Setup;
+namespace App\Platform\Operations\Installation\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Support\Setup\FilePermissionChecker;
+use App\Platform\Http\Controller;
+use App\Platform\Operations\Installation\Application\FilePermissionChecker;
 use Illuminate\Http\JsonResponse;
 
 class FilePermissionsController extends Controller
diff --git a/app/Http/Controllers/Setup/FinishController.php b/app/Platform/Operations/Installation/Http/Controllers/FinishController.php
similarity index 76%
rename from app/Http/Controllers/Setup/FinishController.php
rename to app/Platform/Operations/Installation/Http/Controllers/FinishController.php
index 0d21a2ad..ae8e8612 100644
--- a/app/Http/Controllers/Setup/FinishController.php
+++ b/app/Platform/Operations/Installation/Http/Controllers/FinishController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Setup;
+namespace App\Platform\Operations\Installation\Http\Controllers;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Setup/LanguagesController.php b/app/Platform/Operations/Installation/Http/Controllers/LanguagesController.php
old mode 100755
new mode 100644
similarity index 76%
rename from app/Http/Controllers/Setup/LanguagesController.php
rename to app/Platform/Operations/Installation/Http/Controllers/LanguagesController.php
index 7733b97e..74a38962
--- a/app/Http/Controllers/Setup/LanguagesController.php
+++ b/app/Platform/Operations/Installation/Http/Controllers/LanguagesController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Setup;
+namespace App\Platform\Operations\Installation\Http\Controllers;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 
 class LanguagesController extends Controller
diff --git a/app/Http/Controllers/Setup/LoginController.php b/app/Platform/Operations/Installation/Http/Controllers/LoginController.php
similarity index 85%
rename from app/Http/Controllers/Setup/LoginController.php
rename to app/Platform/Operations/Installation/Http/Controllers/LoginController.php
index 6935a56d..c0906a7e 100644
--- a/app/Http/Controllers/Setup/LoginController.php
+++ b/app/Platform/Operations/Installation/Http/Controllers/LoginController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Setup;
+namespace App\Platform\Operations\Installation\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Support\Setup\InstallWizardAuth;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Http\Controller;
+use App\Platform\Operations\Installation\Authentication\InstallWizardAuth;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Http/Controllers/Setup/OnboardingWizardController.php b/app/Platform/Operations/Installation/Http/Controllers/OnboardingWizardController.php
similarity index 83%
rename from app/Http/Controllers/Setup/OnboardingWizardController.php
rename to app/Platform/Operations/Installation/Http/Controllers/OnboardingWizardController.php
index 54ce4926..1182cf89 100644
--- a/app/Http/Controllers/Setup/OnboardingWizardController.php
+++ b/app/Platform/Operations/Installation/Http/Controllers/OnboardingWizardController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Setup;
+namespace App\Platform\Operations\Installation\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Models\Setting;
-use App\Support\Setup\InstallUtils;
+use App\Platform\Http\Controller;
+use App\Platform\Operations\Installation\Application\InstallationState;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -17,7 +17,7 @@ class OnboardingWizardController extends Controller
      */
     public function getStep(Request $request)
     {
-        if (! InstallUtils::isDbCreated()) {
+        if (! InstallationState::isDbCreated()) {
             return response()->json([
                 'profile_complete' => 0,
                 'profile_language' => 'en',
diff --git a/app/Http/Controllers/Setup/RequirementsController.php b/app/Platform/Operations/Installation/Http/Controllers/RequirementsController.php
old mode 100755
new mode 100644
similarity index 82%
rename from app/Http/Controllers/Setup/RequirementsController.php
rename to app/Platform/Operations/Installation/Http/Controllers/RequirementsController.php
index 6f96d581..ba9ede34
--- a/app/Http/Controllers/Setup/RequirementsController.php
+++ b/app/Platform/Operations/Installation/Http/Controllers/RequirementsController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Setup;
+namespace App\Platform\Operations\Installation\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use App\Support\Setup\RequirementsChecker;
+use App\Platform\Http\Controller;
+use App\Platform\Operations\Installation\Application\RequirementsChecker;
 use Illuminate\Http\JsonResponse;
 
 class RequirementsController extends Controller
diff --git a/app/Http/Controllers/Setup/SessionLoginController.php b/app/Platform/Operations/Installation/Http/Controllers/SessionLoginController.php
similarity index 88%
rename from app/Http/Controllers/Setup/SessionLoginController.php
rename to app/Platform/Operations/Installation/Http/Controllers/SessionLoginController.php
index 3e02a596..5aa061d8 100644
--- a/app/Http/Controllers/Setup/SessionLoginController.php
+++ b/app/Platform/Operations/Installation/Http/Controllers/SessionLoginController.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Http\Controllers\Setup;
+namespace App\Platform\Operations\Installation\Http\Controllers;
 
-use App\Http\Controllers\Controller;
+use App\Platform\Http\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Http/Middleware/InstallationMiddleware.php b/app/Platform/Operations/Installation/Http/Middleware/EnsureInstalled.php
similarity index 59%
rename from app/Http/Middleware/InstallationMiddleware.php
rename to app/Platform/Operations/Installation/Http/Middleware/EnsureInstalled.php
index 8abd3e58..b6747f32 100644
--- a/app/Http/Middleware/InstallationMiddleware.php
+++ b/app/Platform/Operations/Installation/Http/Middleware/EnsureInstalled.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Platform\Operations\Installation\Http\Middleware;
 
-use App\Models\Setting;
-use App\Support\Setup\InstallUtils;
+use App\Platform\Operations\Installation\Application\InstallationState;
+use App\Platform\Operations\Models\Setting;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-class InstallationMiddleware
+class EnsureInstalled
 {
     /**
      * Handle an incoming request.
@@ -18,7 +18,7 @@ class InstallationMiddleware
     public function handle(Request $request, Closure $next): Response
     {
         try {
-            if (! InstallUtils::isDbCreated() || Setting::getSetting('profile_complete') !== 'COMPLETED') {
+            if (! InstallationState::isDbCreated() || Setting::getSetting('profile_complete') !== 'COMPLETED') {
                 return redirect('/installation');
             }
         } catch (\Exception $e) {
diff --git a/app/Http/Middleware/RedirectIfInstalled.php b/app/Platform/Operations/Installation/Http/Middleware/RedirectIfInstalled.php
similarity index 73%
rename from app/Http/Middleware/RedirectIfInstalled.php
rename to app/Platform/Operations/Installation/Http/Middleware/RedirectIfInstalled.php
index 6b973f94..509c20da 100644
--- a/app/Http/Middleware/RedirectIfInstalled.php
+++ b/app/Platform/Operations/Installation/Http/Middleware/RedirectIfInstalled.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Platform\Operations\Installation\Http\Middleware;
 
-use App\Models\Setting;
-use App\Support\Setup\InstallUtils;
+use App\Platform\Operations\Installation\Application\InstallationState;
+use App\Platform\Operations\Models\Setting;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -17,7 +17,7 @@ class RedirectIfInstalled
      */
     public function handle(Request $request, Closure $next): Response
     {
-        if (InstallUtils::isDbCreated()) {
+        if (InstallationState::isDbCreated()) {
             try {
                 if (Setting::getSetting('profile_complete') === 'COMPLETED') {
                     return redirect('login');
diff --git a/app/Http/Middleware/UseInstallWizardTokenAuth.php b/app/Platform/Operations/Installation/Http/Middleware/UseInstallWizardTokenAuth.php
similarity index 72%
rename from app/Http/Middleware/UseInstallWizardTokenAuth.php
rename to app/Platform/Operations/Installation/Http/Middleware/UseInstallWizardTokenAuth.php
index 8d07e83d..477d264d 100644
--- a/app/Http/Middleware/UseInstallWizardTokenAuth.php
+++ b/app/Platform/Operations/Installation/Http/Middleware/UseInstallWizardTokenAuth.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Platform\Operations\Installation\Http\Middleware;
 
-use App\Models\Setting;
-use App\Support\Setup\InstallUtils;
-use App\Support\Setup\InstallWizardAuth;
+use App\Platform\Operations\Installation\Application\InstallationState;
+use App\Platform\Operations\Installation\Authentication\InstallWizardAuth;
+use App\Platform\Operations\Models\Setting;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -28,7 +28,7 @@ class UseInstallWizardTokenAuth
 
     private function installationIsIncomplete(): bool
     {
-        if (! InstallUtils::isDbCreated()) {
+        if (! InstallationState::isDbCreated()) {
             return true;
         }
 
diff --git a/app/Http/Requests/DatabaseEnvironmentRequest.php b/app/Platform/Operations/Installation/Http/Requests/DatabaseEnvironmentRequest.php
similarity index 97%
rename from app/Http/Requests/DatabaseEnvironmentRequest.php
rename to app/Platform/Operations/Installation/Http/Requests/DatabaseEnvironmentRequest.php
index 0850fa13..84bbb7d8 100644
--- a/app/Http/Requests/DatabaseEnvironmentRequest.php
+++ b/app/Platform/Operations/Installation/Http/Requests/DatabaseEnvironmentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Platform\Operations\Installation\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Http/Requests/DomainEnvironmentRequest.php b/app/Platform/Operations/Installation/Http/Requests/DomainEnvironmentRequest.php
similarity index 88%
rename from app/Http/Requests/DomainEnvironmentRequest.php
rename to app/Platform/Operations/Installation/Http/Requests/DomainEnvironmentRequest.php
index 3d91795b..cc892b03 100644
--- a/app/Http/Requests/DomainEnvironmentRequest.php
+++ b/app/Platform/Operations/Installation/Http/Requests/DomainEnvironmentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Platform\Operations\Installation\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
diff --git a/app/Platform/Operations/Installation/routes/api.php b/app/Platform/Operations/Installation/routes/api.php
new file mode 100644
index 00000000..5b5f2a58
--- /dev/null
+++ b/app/Platform/Operations/Installation/routes/api.php
@@ -0,0 +1,23 @@
+<?php
+
+use App\Platform\Operations\Installation\Http\Controllers\AppDomainController;
+use App\Platform\Operations\Installation\Http\Controllers\DatabaseConfigurationController;
+use App\Platform\Operations\Installation\Http\Controllers\FilePermissionsController;
+use App\Platform\Operations\Installation\Http\Controllers\FinishController;
+use App\Platform\Operations\Installation\Http\Controllers\LanguagesController;
+use App\Platform\Operations\Installation\Http\Controllers\LoginController;
+use App\Platform\Operations\Installation\Http\Controllers\OnboardingWizardController;
+use App\Platform\Operations\Installation\Http\Controllers\RequirementsController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/wizard-step', [OnboardingWizardController::class, 'getStep']);
+Route::post('/wizard-step', [OnboardingWizardController::class, 'updateStep']);
+Route::post('/wizard-language', [OnboardingWizardController::class, 'saveLanguage']);
+Route::get('/languages', [LanguagesController::class, 'languages']);
+Route::get('/requirements', [RequirementsController::class, 'requirements']);
+Route::get('/permissions', [FilePermissionsController::class, 'permissions']);
+Route::post('/database/config', [DatabaseConfigurationController::class, 'saveDatabaseEnvironment']);
+Route::get('/database/config', [DatabaseConfigurationController::class, 'getDatabaseEnvironment']);
+Route::put('/set-domain', AppDomainController::class);
+Route::post('/login', LoginController::class);
+Route::post('/finish', FinishController::class);
diff --git a/app/Platform/Operations/Installation/routes/web.php b/app/Platform/Operations/Installation/routes/web.php
new file mode 100644
index 00000000..d7a73ec8
--- /dev/null
+++ b/app/Platform/Operations/Installation/routes/web.php
@@ -0,0 +1,19 @@
+<?php
+
+use App\Platform\Operations\Installation\Http\Controllers\SessionLoginController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/installation', function () {
+    return view('app');
+})->name('install')
+    ->middleware(['redirect-if-installed']);
+
+// The Vue Router renders the wizard steps. This catch-all keeps deep links
+// and hard refreshes inside the installation SPA from returning a 404.
+Route::get('/installation/{vue?}', function () {
+    return view('app');
+})->where('vue', '.*')
+    ->middleware(['redirect-if-installed']);
+
+Route::post('/installation/session-login', SessionLoginController::class)
+    ->middleware(['redirect-if-installed', 'auth:sanctum']);
diff --git a/app/Models/Setting.php b/app/Platform/Operations/Models/Setting.php
similarity index 95%
rename from app/Models/Setting.php
rename to app/Platform/Operations/Models/Setting.php
index f5581428..22377952 100644
--- a/app/Models/Setting.php
+++ b/app/Platform/Operations/Models/Setting.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Platform\Operations\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -8,6 +8,8 @@ use Illuminate\Support\Collection;
 
 class Setting extends Model
 {
+    protected $table = 'settings';
+
     use HasFactory;
 
     protected $fillable = ['option', 'value'];
diff --git a/app/Platform/Operations/OperationsServiceProvider.php b/app/Platform/Operations/OperationsServiceProvider.php
new file mode 100644
index 00000000..172aec2a
--- /dev/null
+++ b/app/Platform/Operations/OperationsServiceProvider.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Platform\Operations;
+
+use App\Platform\Operations\Application\RuntimeConfigurationService;
+use App\Platform\Operations\Console\ResetApp;
+use App\Platform\Operations\Console\UpdateCommand;
+use App\Platform\Operations\Installation\Authentication\InstallWizardAuth;
+use App\Platform\Operations\Policies\OperationsAccessPolicy;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+use Laravel\Sanctum\Sanctum;
+
+class OperationsServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->singleton(RuntimeConfigurationService::class);
+    }
+
+    public function boot(RuntimeConfigurationService $runtimeConfiguration): void
+    {
+        $this->configureInstallWizardTokenAuth();
+
+        Gate::define('manage settings', [OperationsAccessPolicy::class, 'manage']);
+        Gate::define('manage update app', [OperationsAccessPolicy::class, 'manage']);
+
+        $this->commands([
+            ResetApp::class,
+            UpdateCommand::class,
+        ]);
+
+        $runtimeConfiguration->apply();
+    }
+
+    private function configureInstallWizardTokenAuth(): void
+    {
+        Sanctum::authenticateAccessTokensUsing(function ($accessToken, bool $isValid): bool {
+            if (! $isValid) {
+                return false;
+            }
+
+            $request = request();
+
+            if (! $request instanceof Request || ! $request->attributes->get('install_wizard', false)) {
+                return $isValid;
+            }
+
+            return $accessToken->can(InstallWizardAuth::TOKEN_ABILITY);
+        });
+    }
+}
diff --git a/app/Platform/Operations/Policies/OperationsAccessPolicy.php b/app/Platform/Operations/Policies/OperationsAccessPolicy.php
new file mode 100644
index 00000000..1723d630
--- /dev/null
+++ b/app/Platform/Operations/Policies/OperationsAccessPolicy.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Platform\Operations\Policies;
+
+use App\Domains\Accounts\Models\User;
+
+class OperationsAccessPolicy
+{
+    public function manage(User $user): bool
+    {
+        return $user->isSuperAdmin();
+    }
+}
diff --git a/app/Traits/SiteApi.php b/app/Platform/Operations/Update/CallsReleaseServer.php
similarity index 88%
rename from app/Traits/SiteApi.php
rename to app/Platform/Operations/Update/CallsReleaseServer.php
index 4807d7a4..887bfb76 100644
--- a/app/Traits/SiteApi.php
+++ b/app/Platform/Operations/Update/CallsReleaseServer.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Traits;
+namespace App\Platform\Operations\Update;
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 
 // Implementation taken from Akaunting - https://github.com/akaunting/akaunting
-trait SiteApi
+trait CallsReleaseServer
 {
     protected static function getRemote($url, $data = [], $token = null)
     {
diff --git a/app/Support/Update/Updater.php b/app/Platform/Operations/Update/Updater.php
similarity index 97%
rename from app/Support/Update/Updater.php
rename to app/Platform/Operations/Update/Updater.php
index 219df083..71082187 100644
--- a/app/Support/Update/Updater.php
+++ b/app/Platform/Operations/Update/Updater.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace App\Support\Update;
+namespace App\Platform\Operations\Update;
 
-use App\Events\UpdateFinished;
-use App\Models\Setting;
-use App\Traits\SiteApi;
+use App\Platform\Operations\Events\UpdateFinished;
+use App\Platform\Operations\Models\Setting;
 use Artisan;
 use File;
 use GuzzleHttp\Exception\RequestException;
@@ -13,7 +12,7 @@ use ZipArchive;
 // Implementation taken from Akaunting - https://github.com/akaunting/akaunting
 class Updater
 {
-    use SiteApi;
+    use CallsReleaseServer;
 
     public static function checkForUpdate($installed_version, $updater_channel = 'stable')
     {
diff --git a/app/Support/helpers.php b/app/Platform/Operations/helpers.php
similarity index 92%
rename from app/Support/helpers.php
rename to app/Platform/Operations/helpers.php
index 77faec36..c3b4a107 100644
--- a/app/Support/helpers.php
+++ b/app/Platform/Operations/helpers.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Models\CompanySetting;
-use App\Models\Currency;
-use App\Models\CustomField;
-use App\Models\Setting;
-use App\Support\Setup\InstallUtils;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Money\Models\Currency;
+use App\Platform\Operations\Installation\Application\InstallationState;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Support\Str;
 
 /**
@@ -14,7 +14,7 @@ use Illuminate\Support\Str;
  */
 function get_company_setting($key, $company_id)
 {
-    if (! InstallUtils::isDbCreated()) {
+    if (! InstallationState::isDbCreated()) {
         return null;
     }
 
@@ -29,7 +29,7 @@ function get_company_setting($key, $company_id)
  */
 function get_app_setting($key)
 {
-    if (! InstallUtils::isDbCreated()) {
+    if (! InstallationState::isDbCreated()) {
         return null;
     }
 
@@ -43,7 +43,7 @@ function get_app_setting($key)
  */
 function get_page_title($company_id)
 {
-    if (! InstallUtils::isDbCreated()) {
+    if (! InstallationState::isDbCreated()) {
         return null;
     }
 
diff --git a/app/Platform/Operations/routes/admin.php b/app/Platform/Operations/routes/admin.php
new file mode 100644
index 00000000..f4a220bd
--- /dev/null
+++ b/app/Platform/Operations/routes/admin.php
@@ -0,0 +1,6 @@
+<?php
+
+use App\Platform\Operations\Http\Admin\AdminDashboardController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('dashboard', [AdminDashboardController::class, 'index']);
diff --git a/app/Platform/Operations/routes/company.php b/app/Platform/Operations/routes/company.php
new file mode 100644
index 00000000..613c9916
--- /dev/null
+++ b/app/Platform/Operations/routes/company.php
@@ -0,0 +1,13 @@
+<?php
+
+use App\Platform\Operations\Http\Company\BootstrapController;
+use App\Platform\Operations\Http\Company\ConfigController;
+use App\Platform\Operations\Http\Company\FormatsController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/bootstrap', BootstrapController::class);
+Route::get('/config', ConfigController::class);
+Route::get('/timezones', [FormatsController::class, 'timezones']);
+Route::get('/date/formats', [FormatsController::class, 'dateFormats']);
+Route::get('/time/formats', [FormatsController::class, 'timeFormats']);
+Route::get('/current-company', [BootstrapController::class, 'currentCompany']);
diff --git a/app/Platform/Operations/routes/settings.php b/app/Platform/Operations/routes/settings.php
new file mode 100644
index 00000000..51104b99
--- /dev/null
+++ b/app/Platform/Operations/routes/settings.php
@@ -0,0 +1,7 @@
+<?php
+
+use App\Platform\Operations\Http\Admin\SettingsController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/settings', [SettingsController::class, 'show']);
+Route::post('/settings', [SettingsController::class, 'update']);
diff --git a/app/Platform/Operations/routes/updater.php b/app/Platform/Operations/routes/updater.php
new file mode 100644
index 00000000..9a126134
--- /dev/null
+++ b/app/Platform/Operations/routes/updater.php
@@ -0,0 +1,15 @@
+<?php
+
+use App\Platform\Operations\Http\Admin\UpdateController;
+use Illuminate\Support\Facades\Route;
+
+Route::middleware('not-containerized')->group(function () {
+    Route::get('/check/update', [UpdateController::class, 'checkVersion']);
+    Route::post('/update/download', [UpdateController::class, 'download']);
+    Route::post('/update/unzip', [UpdateController::class, 'unzip']);
+    Route::post('/update/copy', [UpdateController::class, 'copy']);
+    Route::post('/update/delete', [UpdateController::class, 'delete']);
+    Route::post('/update/clean', [UpdateController::class, 'clean']);
+    Route::post('/update/migrate', [UpdateController::class, 'migrate']);
+    Route::post('/update/finish', [UpdateController::class, 'finish']);
+});
diff --git a/app/Platform/Operations/routes/version.php b/app/Platform/Operations/routes/version.php
new file mode 100644
index 00000000..bb31a2f5
--- /dev/null
+++ b/app/Platform/Operations/routes/version.php
@@ -0,0 +1,6 @@
+<?php
+
+use App\Platform\Operations\Http\AppVersionController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/app/version', AppVersionController::class);
diff --git a/app/Platform/Operations/routes/webhooks.php b/app/Platform/Operations/routes/webhooks.php
new file mode 100644
index 00000000..13705947
--- /dev/null
+++ b/app/Platform/Operations/routes/webhooks.php
@@ -0,0 +1,6 @@
+<?php
+
+use App\Platform\Operations\Http\Webhooks\CronJobController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/cron', CronJobController::class)->middleware('cron-job');
diff --git a/app/Services/FontService.php b/app/Platform/Pdf/Application/FontService.php
similarity index 99%
rename from app/Services/FontService.php
rename to app/Platform/Pdf/Application/FontService.php
index 475c16b5..6f60782f 100644
--- a/app/Services/FontService.php
+++ b/app/Platform/Pdf/Application/FontService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Platform\Pdf\Application;
 
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
diff --git a/app/Platform/Pdf/Application/PdfConfigurationService.php b/app/Platform/Pdf/Application/PdfConfigurationService.php
new file mode 100644
index 00000000..6343d8ca
--- /dev/null
+++ b/app/Platform/Pdf/Application/PdfConfigurationService.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace App\Platform\Pdf\Application;
+
+use App\Platform\Operations\Models\Setting;
+use App\Platform\Pdf\Contracts\PdfConfigurator;
+use Illuminate\Support\Facades\Config;
+
+class PdfConfigurationService implements PdfConfigurator
+{
+    /** @var list<string> */
+    private const PAGE_SETTINGS = [
+        'pdf_paper_width',
+        'pdf_paper_height',
+        'pdf_orientation',
+        'pdf_margin_top',
+        'pdf_margin_right',
+        'pdf_margin_bottom',
+        'pdf_margin_left',
+    ];
+
+    /** @var list<string> */
+    private const PAGE_BOOLEANS = [
+        'pdf_page_numbers',
+    ];
+
+    /**
+     * Apply the persisted instance-wide PDF settings to Laravel's runtime config.
+     */
+    public function applyGlobalConfig(): void
+    {
+        $pageSettings = collect(self::PAGE_SETTINGS)
+            ->mapWithKeys(fn (string $setting): array => [$setting => self::configKeyFor($setting)])
+            ->all();
+
+        $pdfSettings = Setting::getSettings(array_merge(
+            ['pdf_driver', 'gotenberg_host', 'gotenberg_pdfa'],
+            self::PAGE_BOOLEANS,
+            array_keys($pageSettings),
+        ));
+
+        if (! empty($pdfSettings['pdf_driver'])) {
+            Config::set('pdf.driver', $pdfSettings['pdf_driver']);
+
+            if ($pdfSettings['pdf_driver'] === 'gotenberg') {
+                if (! empty($pdfSettings['gotenberg_host'])) {
+                    Config::set('pdf.connections.gotenberg.host', $pdfSettings['gotenberg_host']);
+                }
+
+                // An explicitly stored blank means an ordinary PDF and must
+                // override an environment-level PDF/A default.
+                if (isset($pdfSettings['gotenberg_pdfa'])) {
+                    Config::set('pdf.connections.gotenberg.pdfa', $pdfSettings['gotenberg_pdfa'] ?: null);
+                }
+            }
+        }
+
+        foreach ($pageSettings as $setting => $configKey) {
+            if (isset($pdfSettings[$setting]) && trim((string) $pdfSettings[$setting]) !== '') {
+                Config::set($configKey, $pdfSettings[$setting]);
+            }
+        }
+
+        if (isset($pdfSettings['pdf_page_numbers'])) {
+            Config::set(
+                'pdf.page.page_numbers',
+                filter_var($pdfSettings['pdf_page_numbers'], FILTER_VALIDATE_BOOLEAN)
+            );
+        }
+    }
+
+    /**
+     * @return array<string, bool|string|null>
+     */
+    public function environment(): array
+    {
+        $pdfSettings = Setting::getSettings(array_merge(
+            ['pdf_driver', 'gotenberg_host', 'gotenberg_pdfa'],
+            self::PAGE_SETTINGS,
+            self::PAGE_BOOLEANS,
+        ));
+
+        $environment = [
+            'pdf_driver' => $pdfSettings['pdf_driver'] ?? config('pdf.driver'),
+            'gotenberg_host' => $pdfSettings['gotenberg_host'] ?? config('pdf.connections.gotenberg.host'),
+            'gotenberg_pdfa' => $pdfSettings['gotenberg_pdfa'] ?? config('pdf.connections.gotenberg.pdfa') ?? '',
+        ];
+
+        foreach (self::PAGE_SETTINGS as $setting) {
+            $environment[$setting] = $pdfSettings[$setting] ?? config(self::configKeyFor($setting));
+        }
+
+        foreach (self::PAGE_BOOLEANS as $setting) {
+            $environment[$setting] = filter_var(
+                $pdfSettings[$setting] ?? config(self::configKeyFor($setting)),
+                FILTER_VALIDATE_BOOLEAN
+            );
+        }
+
+        return $environment;
+    }
+
+    /**
+     * @param  array<string, mixed>  $input
+     */
+    public function store(array $input): void
+    {
+        $driver = $input['pdf_driver'];
+        $settings = ['pdf_driver' => $driver];
+
+        foreach (self::PAGE_SETTINGS as $setting) {
+            $settings[$setting] = $input[$setting] ?? null;
+        }
+
+        // Page numbers are a Gotenberg-only control. When the dompdf form omits
+        // it, retain the operator's existing choice.
+        foreach (self::PAGE_BOOLEANS as $setting) {
+            if (array_key_exists($setting, $input)) {
+                $settings[$setting] = filter_var($input[$setting], FILTER_VALIDATE_BOOLEAN) ? '1' : '0';
+            }
+        }
+
+        if ($driver === 'gotenberg') {
+            $settings['gotenberg_host'] = $input['gotenberg_host'];
+            $settings['gotenberg_pdfa'] = $input['gotenberg_pdfa'] ?? '';
+        }
+
+        Setting::setSettings($settings);
+    }
+
+    private static function configKeyFor(string $setting): string
+    {
+        return 'pdf.page.'.substr($setting, strlen('pdf_'));
+    }
+}
diff --git a/app/Traits/GeneratesPdfTrait.php b/app/Platform/Pdf/Concerns/GeneratesPdf.php
similarity index 95%
rename from app/Traits/GeneratesPdfTrait.php
rename to app/Platform/Pdf/Concerns/GeneratesPdf.php
index f6ce684d..f488d5e9 100644
--- a/app/Traits/GeneratesPdfTrait.php
+++ b/app/Platform/Pdf/Concerns/GeneratesPdf.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Traits;
+namespace App\Platform\Pdf\Concerns;
 
-use App\Models\Address;
-use App\Models\CompanySetting;
-use App\Models\FileDisk;
-use App\Models\Setting;
-use App\Services\FontService;
-use App\Support\Pdf\PdfHtmlSanitizer;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Contacts\Models\Address;
+use App\Platform\Operations\Models\Setting;
+use App\Platform\Pdf\Application\FontService;
+use App\Platform\Pdf\Rendering\PdfHtmlSanitizer;
+use App\Platform\Storage\Models\FileDisk;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\App;
 
-trait GeneratesPdfTrait
+trait GeneratesPdf
 {
     public function getGeneratedPDFOrStream($collection_name)
     {
diff --git a/app/Console/Commands/ComparePdfDriversCommand.php b/app/Platform/Pdf/Console/ComparePdfDriversCommand.php
similarity index 95%
rename from app/Console/Commands/ComparePdfDriversCommand.php
rename to app/Platform/Pdf/Console/ComparePdfDriversCommand.php
index a24b1165..f8764301 100644
--- a/app/Console/Commands/ComparePdfDriversCommand.php
+++ b/app/Platform/Pdf/Console/ComparePdfDriversCommand.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Platform\Pdf\Console;
 
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Services\Document\EstimateService;
-use App\Services\Document\InvoiceService;
-use App\Services\Document\PaymentService;
+use App\Domains\Receivables\Contracts\PaymentPdfDataProvider;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Application\EstimateService;
+use App\Domains\Sales\Application\InvoiceService;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
@@ -146,7 +146,7 @@ class ComparePdfDriversCommand extends Command
         if ($payment = Payment::first()) {
             $documents[] = ['payment', fn (string $driver) => $this->withDriver(
                 $driver,
-                fn () => app(PaymentService::class)->getPdfData($payment)->output()
+                fn () => app(PaymentPdfDataProvider::class)->getPdfData($payment)->output()
             )];
         }
 
diff --git a/app/Console/Commands/CreateTemplateCommand.php b/app/Platform/Pdf/Console/CreateTemplateCommand.php
similarity index 98%
rename from app/Console/Commands/CreateTemplateCommand.php
rename to app/Platform/Pdf/Console/CreateTemplateCommand.php
index b1b1b4d3..0a49f347 100644
--- a/app/Console/Commands/CreateTemplateCommand.php
+++ b/app/Platform/Pdf/Console/CreateTemplateCommand.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Platform\Pdf\Console;
 
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
diff --git a/app/Platform/Pdf/Contracts/PdfConfigurator.php b/app/Platform/Pdf/Contracts/PdfConfigurator.php
new file mode 100644
index 00000000..4189ea0d
--- /dev/null
+++ b/app/Platform/Pdf/Contracts/PdfConfigurator.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Platform\Pdf\Contracts;
+
+interface PdfConfigurator
+{
+    public function applyGlobalConfig(): void;
+}
diff --git a/app/Platform/Pdf/Facades/Pdf.php b/app/Platform/Pdf/Facades/Pdf.php
new file mode 100644
index 00000000..12166ec4
--- /dev/null
+++ b/app/Platform/Pdf/Facades/Pdf.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Platform\Pdf\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * @method static \App\Platform\Pdf\Rendering\ResponseStream loadView(string $template, array $metadata = [], ?\App\Platform\Pdf\Rendering\PdfPageSetup $page = null)
+ */
+class Pdf extends Facade
+{
+    protected static function getFacadeAccessor()
+    {
+        return 'pdf.driver';
+    }
+}
diff --git a/app/Http/Controllers/Admin/FontController.php b/app/Platform/Pdf/Http/Admin/FontController.php
similarity index 91%
rename from app/Http/Controllers/Admin/FontController.php
rename to app/Platform/Pdf/Http/Admin/FontController.php
index 1791649b..f7e12d11 100644
--- a/app/Http/Controllers/Admin/FontController.php
+++ b/app/Platform/Pdf/Http/Admin/FontController.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Platform\Pdf\Http\Admin;
 
-use App\Http\Controllers\Controller;
-use App\Services\FontService;
+use App\Platform\Http\Controller;
+use App\Platform\Pdf\Application\FontService;
 use Illuminate\Http\JsonResponse;
 
 class FontController extends Controller
diff --git a/app/Platform/Pdf/Http/Admin/PdfConfigurationController.php b/app/Platform/Pdf/Http/Admin/PdfConfigurationController.php
new file mode 100644
index 00000000..87475a20
--- /dev/null
+++ b/app/Platform/Pdf/Http/Admin/PdfConfigurationController.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Platform\Pdf\Http\Admin;
+
+use App\Platform\Http\Controller;
+use App\Platform\Pdf\Application\PdfConfigurationService;
+use App\Platform\Pdf\Http\Requests\PdfConfigurationRequest;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\JsonResponse;
+
+class PdfConfigurationController extends Controller
+{
+    public function __construct(private readonly PdfConfigurationService $configuration) {}
+
+    /**
+     * Returns the available drivers
+     *
+     * @throws AuthorizationException
+     */
+    public function getDrivers(): JsonResponse
+    {
+        $this->authorize('manage pdf config');
+
+        $drivers = [
+            'dompdf',
+            'gotenberg',
+        ];
+
+        return response()->json($drivers);
+    }
+
+    /**
+     * Return the PDF settings
+     *
+     * @throws AuthorizationException
+     */
+    public function getEnvironment(): JsonResponse
+    {
+        $this->authorize('manage pdf config');
+
+        return response()->json($this->configuration->environment());
+    }
+
+    /**
+     * Saves the settings
+     *
+     * @throws AuthorizationException
+     */
+    public function saveEnvironment(PdfConfigurationRequest $request): JsonResponse
+    {
+        $this->authorize('manage pdf config');
+
+        $this->configuration->store($request->validated());
+
+        return response()->json([
+            'success' => 'pdf_variables_save_successfully',
+        ]);
+    }
+}
diff --git a/app/Http/Middleware/PdfMiddleware.php b/app/Platform/Pdf/Http/Middleware/PdfMiddleware.php
similarity index 93%
rename from app/Http/Middleware/PdfMiddleware.php
rename to app/Platform/Pdf/Http/Middleware/PdfMiddleware.php
index c912c566..e93df6c8 100644
--- a/app/Http/Middleware/PdfMiddleware.php
+++ b/app/Platform/Pdf/Http/Middleware/PdfMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Platform\Pdf\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\RedirectResponse;
diff --git a/app/Http/Requests/PDFConfigurationRequest.php b/app/Platform/Pdf/Http/Requests/PdfConfigurationRequest.php
similarity index 93%
rename from app/Http/Requests/PDFConfigurationRequest.php
rename to app/Platform/Pdf/Http/Requests/PdfConfigurationRequest.php
index 98dd4926..dc936b6c 100644
--- a/app/Http/Requests/PDFConfigurationRequest.php
+++ b/app/Platform/Pdf/Http/Requests/PdfConfigurationRequest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Platform\Pdf\Http\Requests;
 
-use App\Rules\CssLength;
+use App\Platform\Pdf\Rendering\GotenbergHostPolicy;
+use App\Platform\Pdf\Rules\CssLength;
 use App\Rules\PublicHttpUrl;
-use App\Support\Pdf\GotenbergHostPolicy;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
-class PDFConfigurationRequest extends FormRequest
+class PdfConfigurationRequest extends FormRequest
 {
     /** Formats the Gotenberg image can actually produce, verified against gotenberg:8. */
     public const PDFA_FORMATS = ['PDF/A-1b', 'PDF/A-2b', 'PDF/A-3b'];
diff --git a/app/Platform/Pdf/PdfServiceProvider.php b/app/Platform/Pdf/PdfServiceProvider.php
new file mode 100644
index 00000000..f386d488
--- /dev/null
+++ b/app/Platform/Pdf/PdfServiceProvider.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Platform\Pdf;
+
+use App\Platform\Pdf\Application\PdfConfigurationService;
+use App\Platform\Pdf\Console\ComparePdfDriversCommand;
+use App\Platform\Pdf\Console\CreateTemplateCommand;
+use App\Platform\Pdf\Contracts\PdfConfigurator;
+use App\Platform\Pdf\Policies\PdfAccessPolicy;
+use App\Platform\Pdf\Rendering\PdfService;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\ServiceProvider;
+
+class PdfServiceProvider extends ServiceProvider
+{
+    public function register(): void
+    {
+        $this->app->bind('pdf.driver', PdfService::class);
+        $this->app->singleton(PdfConfigurationService::class);
+        $this->app->bind(
+            PdfConfigurator::class,
+            fn (Application $app): PdfConfigurationService => $app->make(PdfConfigurationService::class),
+        );
+    }
+
+    public function boot(): void
+    {
+        Gate::define('manage pdf config', [PdfAccessPolicy::class, 'manageConfiguration']);
+        View::addNamespace('pdf_templates', storage_path('app/templates/pdf'));
+
+        $this->commands([
+            ComparePdfDriversCommand::class,
+            CreateTemplateCommand::class,
+        ]);
+    }
+}
diff --git a/app/Platform/Pdf/Policies/PdfAccessPolicy.php b/app/Platform/Pdf/Policies/PdfAccessPolicy.php
new file mode 100644
index 00000000..de4fff0d
--- /dev/null
+++ b/app/Platform/Pdf/Policies/PdfAccessPolicy.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Platform\Pdf\Policies;
+
+use App\Domains\Accounts\Models\User;
+
+class PdfAccessPolicy
+{
+    public function manageConfiguration(User $user): bool
+    {
+        return $user->isSuperAdmin();
+    }
+}
diff --git a/app/Support/Pdf/DompdfDriver.php b/app/Platform/Pdf/Rendering/DompdfDriver.php
similarity index 98%
rename from app/Support/Pdf/DompdfDriver.php
rename to app/Platform/Pdf/Rendering/DompdfDriver.php
index 3c58ca99..69921581 100644
--- a/app/Support/Pdf/DompdfDriver.php
+++ b/app/Platform/Pdf/Rendering/DompdfDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 use Barryvdh\DomPDF\PDF;
 use Illuminate\Support\Facades\App;
diff --git a/app/Support/Pdf/DompdfResponse.php b/app/Platform/Pdf/Rendering/DompdfResponse.php
similarity index 96%
rename from app/Support/Pdf/DompdfResponse.php
rename to app/Platform/Pdf/Rendering/DompdfResponse.php
index 5f75ed55..ed616f38 100644
--- a/app/Support/Pdf/DompdfResponse.php
+++ b/app/Platform/Pdf/Rendering/DompdfResponse.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 use Barryvdh\DomPDF\PDF;
 use Illuminate\Http\Response;
diff --git a/app/Support/Pdf/GotenbergHostPolicy.php b/app/Platform/Pdf/Rendering/GotenbergHostPolicy.php
similarity index 98%
rename from app/Support/Pdf/GotenbergHostPolicy.php
rename to app/Platform/Pdf/Rendering/GotenbergHostPolicy.php
index aa30d281..e879b32e 100644
--- a/app/Support/Pdf/GotenbergHostPolicy.php
+++ b/app/Platform/Pdf/Rendering/GotenbergHostPolicy.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 use App\Support\Net\PrivateNetworkGuard;
 
diff --git a/app/Support/Pdf/GotenbergPdfDriver.php b/app/Platform/Pdf/Rendering/GotenbergPdfDriver.php
similarity index 98%
rename from app/Support/Pdf/GotenbergPdfDriver.php
rename to app/Platform/Pdf/Rendering/GotenbergPdfDriver.php
index 53f5edd1..f14a3c12 100644
--- a/app/Support/Pdf/GotenbergPdfDriver.php
+++ b/app/Platform/Pdf/Rendering/GotenbergPdfDriver.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
-use App\Services\FontService;
+use App\Platform\Pdf\Application\FontService;
 use App\Support\Net\BlockedUrlException;
 use App\Support\Net\PrivateNetworkGuard;
 use Gotenberg\Gotenberg;
diff --git a/app/Support/Pdf/GotenbergPdfResponse.php b/app/Platform/Pdf/Rendering/GotenbergPdfResponse.php
similarity index 97%
rename from app/Support/Pdf/GotenbergPdfResponse.php
rename to app/Platform/Pdf/Rendering/GotenbergPdfResponse.php
index 2f178fd3..c876a000 100644
--- a/app/Support/Pdf/GotenbergPdfResponse.php
+++ b/app/Platform/Pdf/Rendering/GotenbergPdfResponse.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 use Illuminate\Http\Response;
 use Psr\Http\Message\ResponseInterface;
diff --git a/app/Support/Pdf/ImageUtils.php b/app/Platform/Pdf/Rendering/ImageUtils.php
similarity index 89%
rename from app/Support/Pdf/ImageUtils.php
rename to app/Platform/Pdf/Rendering/ImageUtils.php
index 8f138d83..432f7f4c 100644
--- a/app/Support/Pdf/ImageUtils.php
+++ b/app/Platform/Pdf/Rendering/ImageUtils.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 use Illuminate\Support\Facades\File;
 
diff --git a/app/Support/Pdf/PdfDriver.php b/app/Platform/Pdf/Rendering/PdfDriver.php
similarity index 95%
rename from app/Support/Pdf/PdfDriver.php
rename to app/Platform/Pdf/Rendering/PdfDriver.php
index 3d5230cb..1287dd84 100644
--- a/app/Support/Pdf/PdfDriver.php
+++ b/app/Platform/Pdf/Rendering/PdfDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 interface PdfDriver
 {
diff --git a/app/Support/Pdf/PdfDriverFactory.php b/app/Platform/Pdf/Rendering/PdfDriverFactory.php
similarity index 89%
rename from app/Support/Pdf/PdfDriverFactory.php
rename to app/Platform/Pdf/Rendering/PdfDriverFactory.php
index 0b0657df..b075aba1 100644
--- a/app/Support/Pdf/PdfDriverFactory.php
+++ b/app/Platform/Pdf/Rendering/PdfDriverFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 class PdfDriverFactory
 {
diff --git a/app/Support/Pdf/PdfHtmlSanitizer.php b/app/Platform/Pdf/Rendering/PdfHtmlSanitizer.php
similarity index 98%
rename from app/Support/Pdf/PdfHtmlSanitizer.php
rename to app/Platform/Pdf/Rendering/PdfHtmlSanitizer.php
index 13788161..fcf554a0 100644
--- a/app/Support/Pdf/PdfHtmlSanitizer.php
+++ b/app/Platform/Pdf/Rendering/PdfHtmlSanitizer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 use DOMDocument;
 use DOMElement;
diff --git a/app/Support/Pdf/PdfMetadata.php b/app/Platform/Pdf/Rendering/PdfMetadata.php
similarity index 90%
rename from app/Support/Pdf/PdfMetadata.php
rename to app/Platform/Pdf/Rendering/PdfMetadata.php
index a2aaae1c..beeb887b 100644
--- a/app/Support/Pdf/PdfMetadata.php
+++ b/app/Platform/Pdf/Rendering/PdfMetadata.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
-
-use App\Models\Company;
+namespace App\Platform\Pdf\Rendering;
 
 /**
  * Document properties written into the PDF itself.
@@ -19,7 +17,7 @@ final class PdfMetadata
     /**
      * @return array<string, string>
      */
-    public static function forDocument(string $subject, ?string $number, ?Company $company): array
+    public static function forDocument(string $subject, ?string $number, ?object $company): array
     {
         $title = trim($subject.' '.($number ?? ''));
 
diff --git a/app/Support/Pdf/PdfPageSetup.php b/app/Platform/Pdf/Rendering/PdfPageSetup.php
similarity index 99%
rename from app/Support/Pdf/PdfPageSetup.php
rename to app/Platform/Pdf/Rendering/PdfPageSetup.php
index 1cc15ec4..42112044 100644
--- a/app/Support/Pdf/PdfPageSetup.php
+++ b/app/Platform/Pdf/Rendering/PdfPageSetup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 /**
  * The page geometry both drivers render to, resolved once and translated per driver.
diff --git a/app/Support/Pdf/PdfService.php b/app/Platform/Pdf/Rendering/PdfService.php
similarity index 88%
rename from app/Support/Pdf/PdfService.php
rename to app/Platform/Pdf/Rendering/PdfService.php
index da36f275..46f3f911 100644
--- a/app/Support/Pdf/PdfService.php
+++ b/app/Platform/Pdf/Rendering/PdfService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 class PdfService
 {
diff --git a/app/Support/Pdf/PdfTemplateUtils.php b/app/Platform/Pdf/Rendering/PdfTemplateUtils.php
similarity index 99%
rename from app/Support/Pdf/PdfTemplateUtils.php
rename to app/Platform/Pdf/Rendering/PdfTemplateUtils.php
index dda0182d..f01eedad 100644
--- a/app/Support/Pdf/PdfTemplateUtils.php
+++ b/app/Platform/Pdf/Rendering/PdfTemplateUtils.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Log;
diff --git a/app/Support/Pdf/ResponseStream.php b/app/Platform/Pdf/Rendering/ResponseStream.php
similarity index 80%
rename from app/Support/Pdf/ResponseStream.php
rename to app/Platform/Pdf/Rendering/ResponseStream.php
index 3506a175..96a65f4e 100644
--- a/app/Support/Pdf/ResponseStream.php
+++ b/app/Platform/Pdf/Rendering/ResponseStream.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support\Pdf;
+namespace App\Platform\Pdf\Rendering;
 
 use Illuminate\Http\Response;
 
@@ -8,7 +8,7 @@ use Illuminate\Http\Response;
  * The rendered-document contract every PDF driver returns.
  *
  * The defaults matter: callers reach for the bare `stream()` / `download()`
- * (see the report controllers and GeneratesPdfTrait), so a driver that only
+ * (see the report controllers and GeneratesPdf), so a driver that only
  * accepts an explicit filename would break them.
  */
 interface ResponseStream
diff --git a/app/Rules/CssLength.php b/app/Platform/Pdf/Rules/CssLength.php
similarity index 96%
rename from app/Rules/CssLength.php
rename to app/Platform/Pdf/Rules/CssLength.php
index ef41beef..8420afac 100644
--- a/app/Rules/CssLength.php
+++ b/app/Platform/Pdf/Rules/CssLength.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Rules;
+namespace App\Platform\Pdf\Rules;
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
diff --git a/app/Rules/PdfTemplateExists.php b/app/Platform/Pdf/Rules/PdfTemplateExists.php
similarity index 93%
rename from app/Rules/PdfTemplateExists.php
rename to app/Platform/Pdf/Rules/PdfTemplateExists.php
index 97398251..8f586d2a 100644
--- a/app/Rules/PdfTemplateExists.php
+++ b/app/Platform/Pdf/Rules/PdfTemplateExists.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Rules;
+namespace App\Platform\Pdf\Rules;
 
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
 
diff --git a/app/Platform/Pdf/routes/admin.php b/app/Platform/Pdf/routes/admin.php
new file mode 100644
index 00000000..af89eaf1
--- /dev/null
+++ b/app/Platform/Pdf/routes/admin.php
@@ -0,0 +1,12 @@
+<?php
+
+use App\Platform\Pdf\Http\Admin\FontController;
+use App\Platform\Pdf\Http\Admin\PdfConfigurationController;
+use Illuminate\Support\Facades\Route;
+
+Route::get('/fonts/status', [FontController::class, 'status']);
+Route::post('/fonts/{package}/install', [FontController::class, 'install']);
+
+Route::get('/pdf/drivers', [PdfConfigurationController::class, 'getDrivers']);
+Route::get('/pdf/config', [PdfConfigurationController::class, 'getEnvironment']);
+Route::post('/pdf/config', [PdfConfigurationController::class, 'saveEnvironment']);
diff --git a/app/Platform/Persistence/ModelIdentityMap.php b/app/Platform/Persistence/ModelIdentityMap.php
new file mode 100644
index 00000000..fc316e4a
--- /dev/null
+++ b/app/Platform/Persistence/ModelIdentityMap.php
@@ -0,0 +1,147 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Platform\Persistence;
+
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanyInvitation;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\ImpersonationLog;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Accounts\Models\UserSetting;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Catalog\Models\Unit;
+use App\Domains\Contacts\Models\Address;
+use App\Domains\Contacts\Models\Country;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Metadata\Models\CustomFieldValue;
+use App\Domains\Metadata\Models\Note;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Money\Models\ExchangeRateLog;
+use App\Domains\Money\Models\ExchangeRateProvider;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Purchases\Models\ExpenseCategory;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Receivables\Models\PaymentMethod;
+use App\Domains\Receivables\Models\Transaction;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\EstimateItem;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Sales\Models\RecurringInvoice;
+use App\Domains\Taxation\Models\Tax;
+use App\Domains\Taxation\Models\TaxType;
+use App\Platform\Ai\Models\AiConversation;
+use App\Platform\Ai\Models\AiMessage;
+use App\Platform\Mail\Models\EmailLog;
+use App\Platform\Modules\Models\MarketplaceCredential;
+use App\Platform\Modules\Models\MarketplaceOperation;
+use App\Platform\Modules\Models\Module;
+use App\Platform\Operations\Models\Setting;
+use App\Platform\Storage\Models\FileDisk;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\Relation;
+use InvalidArgumentException;
+use Silber\Bouncer\Database\Ability;
+use Silber\Bouncer\Database\Role;
+
+/**
+ * Stable database identities for Eloquent models.
+ *
+ * Model namespaces are an implementation detail and will change as contexts
+ * move into app/Domains and app/Platform. These aliases are persisted instead,
+ * so future namespace refactors cannot invalidate polymorphic records.
+ */
+final class ModelIdentityMap
+{
+    public const ESTIMATE_ALIAS = 'estimate';
+
+    public const INVOICE_ALIAS = 'invoice';
+
+    public const PAYMENT_ALIAS = 'payment';
+
+    /**
+     * @return array<string, class-string<Model>>
+     */
+    public static function aliases(): array
+    {
+        return [
+            'address' => Address::class,
+            'ai_conversation' => AiConversation::class,
+            'ai_message' => AiMessage::class,
+            'company' => Company::class,
+            'company_invitation' => CompanyInvitation::class,
+            'company_setting' => CompanySetting::class,
+            'country' => Country::class,
+            'currency' => Currency::class,
+            'custom_field' => CustomField::class,
+            'custom_field_value' => CustomFieldValue::class,
+            'customer' => Customer::class,
+            'email_log' => EmailLog::class,
+            self::ESTIMATE_ALIAS => Estimate::class,
+            'estimate_item' => EstimateItem::class,
+            'exchange_rate_log' => ExchangeRateLog::class,
+            'exchange_rate_provider' => ExchangeRateProvider::class,
+            'expense' => Expense::class,
+            'expense_category' => ExpenseCategory::class,
+            'file_disk' => FileDisk::class,
+            'impersonation_log' => ImpersonationLog::class,
+            self::INVOICE_ALIAS => Invoice::class,
+            'invoice_item' => InvoiceItem::class,
+            'item' => Item::class,
+            'marketplace_credential' => MarketplaceCredential::class,
+            'marketplace_operation' => MarketplaceOperation::class,
+            'module' => Module::class,
+            'note' => Note::class,
+            self::PAYMENT_ALIAS => Payment::class,
+            'payment_allocation' => PaymentAllocation::class,
+            'payment_method' => PaymentMethod::class,
+            'recurring_invoice' => RecurringInvoice::class,
+            'setting' => Setting::class,
+            'tax' => Tax::class,
+            'tax_type' => TaxType::class,
+            'transaction' => Transaction::class,
+            'unit' => Unit::class,
+            'user' => User::class,
+            'user_setting' => UserSetting::class,
+            'bouncer_ability' => Ability::class,
+            'bouncer_role' => Role::class,
+        ];
+    }
+
+    public static function enforce(): void
+    {
+        Relation::enforceMorphMap(self::aliases());
+    }
+
+    /**
+     * @param  class-string<Model>  $model
+     */
+    public static function aliasFor(string $model): string
+    {
+        $alias = array_search($model, self::aliases(), true);
+
+        if (! is_string($alias)) {
+            throw new InvalidArgumentException("Model [{$model}] has no stable database identity.");
+        }
+
+        return $alias;
+    }
+
+    /**
+     * Preserve the model discriminator exposed by the existing v1 API.
+     */
+    public static function publicType(string $databaseType): string
+    {
+        $model = self::aliases()[$databaseType] ?? null;
+
+        if ($model === null || str_starts_with($databaseType, 'bouncer_')) {
+            return $databaseType;
+        }
+
+        return 'App\\Models\\'.class_basename($model);
+    }
+}
diff --git a/app/Services/Storage/BackupConfigurationFactory.php b/app/Platform/Storage/Application/BackupConfigurationFactory.php
similarity index 86%
rename from app/Services/Storage/BackupConfigurationFactory.php
rename to app/Platform/Storage/Application/BackupConfigurationFactory.php
index e21cc41c..7eb0e020 100644
--- a/app/Services/Storage/BackupConfigurationFactory.php
+++ b/app/Platform/Storage/Application/BackupConfigurationFactory.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Services\Storage;
+namespace App\Platform\Storage\Application;
 
-use App\Models\FileDisk;
+use App\Platform\Storage\Models\FileDisk;
 use Exception;
 use Spatie\Backup\Config\Config;
 
diff --git a/app/Services/Storage/BackupService.php b/app/Platform/Storage/Application/BackupService.php
similarity index 90%
rename from app/Services/Storage/BackupService.php
rename to app/Platform/Storage/Application/BackupService.php
index fca15d97..4a197589 100644
--- a/app/Services/Storage/BackupService.php
+++ b/app/Platform/Storage/Application/BackupService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Services\Storage;
+namespace App\Platform\Storage\Application;
 
-use App\Models\FileDisk;
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
+use App\Platform\Storage\Models\FileDisk;
 use Spatie\Backup\BackupDestination\BackupDestination;
 
 class BackupService
diff --git a/app/Services/Storage/FileDiskService.php b/app/Platform/Storage/Application/FileDiskService.php
similarity index 91%
rename from app/Services/Storage/FileDiskService.php
rename to app/Platform/Storage/Application/FileDiskService.php
index 8fb237e4..668c8cd7 100644
--- a/app/Services/Storage/FileDiskService.php
+++ b/app/Platform/Storage/Application/FileDiskService.php
@@ -1,13 +1,27 @@
 <?php
 
-namespace App\Services\Storage;
+namespace App\Platform\Storage\Application;
 
-use App\Models\FileDisk;
+use App\Platform\Storage\Contracts\StorageConfigurator;
+use App\Platform\Storage\Models\FileDisk;
 use App\Support\Net\PrivateNetworkGuard;
 use Illuminate\Http\Request;
 
-class FileDiskService
+class FileDiskService implements StorageConfigurator
 {
+    public function applyGlobalConfig(): void
+    {
+        $fileDisk = FileDisk::whereSetAsDefault(true)->first();
+
+        if (! $fileDisk) {
+            return;
+        }
+
+        $diskName = $this->registerDisk($fileDisk);
+
+        config(['media-library.disk_name' => $diskName]);
+    }
+
     public function create(Request $request): FileDisk
     {
         if ($request->set_as_default) {
diff --git a/app/Console/Commands/MigrateMediaToPrivateDisk.php b/app/Platform/Storage/Console/MigrateMediaToPrivateDisk.php
similarity index 95%
rename from app/Console/Commands/MigrateMediaToPrivateDisk.php
rename to app/Platform/Storage/Console/MigrateMediaToPrivateDisk.php
index 573a48aa..6dbe4667 100644
--- a/app/Console/Commands/MigrateMediaToPrivateDisk.php
+++ b/app/Platform/Storage/Console/MigrateMediaToPrivateDisk.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Platform\Storage\Console;
 
-use App\Models\FileDisk;
-use App\Models\Setting;
-use App\Services\Storage\FileDiskService;
+use App\Platform\Operations\Models\Setting;
+use App\Platform\Storage\Application\FileDiskService;
+use App\Platform\Storage\Models\FileDisk;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
diff --git a/app/Platform/Storage/Contracts/StorageConfigurator.php b/app/Platform/Storage/Contracts/StorageConfigurator.php
new file mode 100644
index 00000000..99d5316d
--- /dev/null
+++ b/app/Platform/Storage/Contracts/StorageConfigurator.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Platform\Storage\Contracts;
+
+interface StorageConfigurator
+{
+    public function applyGlobalConfig(): void;
+}
diff --git a/app/Http/Controllers/Admin/BackupsController.php b/app/Platform/Storage/Http/BackupsController.php
similarity index 94%
rename from app/Http/Controllers/Admin/BackupsController.php
rename to app/Platform/Storage/Http/BackupsController.php
index b1bb9c51..2a294783 100644
--- a/app/Http/Controllers/Admin/BackupsController.php
+++ b/app/Platform/Storage/Http/BackupsController.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Platform\Storage\Http;
 
-use App\Http\Controllers\Controller;
-use App\Jobs\CreateBackupJob;
-use App\Rules\Backup\PathToZip;
-use App\Services\Storage\BackupService;
+use App\Platform\Http\Controller;
+use App\Platform\Storage\Application\BackupService;
+use App\Platform\Storage\Jobs\CreateBackupJob;
+use App\Platform\Storage\Rules\PathToZip;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
diff --git a/app/Http/Controllers/Admin/Settings/DiskController.php b/app/Platform/Storage/Http/DiskController.php
similarity index 95%
rename from app/Http/Controllers/Admin/Settings/DiskController.php
rename to app/Platform/Storage/Http/DiskController.php
index 96f1de45..2fe44d63 100644
--- a/app/Http/Controllers/Admin/Settings/DiskController.php
+++ b/app/Platform/Storage/Http/DiskController.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Settings;
+namespace App\Platform\Storage\Http;
 
-use App\Http\Controllers\Controller;
-use App\Http\Requests\DiskEnvironmentRequest;
-use App\Http\Resources\FileDiskResource;
-use App\Models\FileDisk;
-use App\Models\Setting;
-use App\Services\Storage\FileDiskService;
+use App\Platform\Http\Controller;
+use App\Platform\Operations\Models\Setting;
+use App\Platform\Storage\Application\FileDiskService;
+use App\Platform\Storage\Http\Requests\DiskEnvironmentRequest;
+use App\Platform\Storage\Http\Resources\FileDiskResource;
+use App\Platform\Storage\Models\FileDisk;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Middleware/ConfigMiddleware.php b/app/Platform/Storage/Http/Middleware/ConfigMiddleware.php
similarity index 69%
rename from app/Http/Middleware/ConfigMiddleware.php
rename to app/Platform/Storage/Http/Middleware/ConfigMiddleware.php
index e95d7fec..5ab68dd3 100644
--- a/app/Http/Middleware/ConfigMiddleware.php
+++ b/app/Platform/Storage/Http/Middleware/ConfigMiddleware.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Middleware;
+namespace App\Platform\Storage\Http\Middleware;
 
-use App\Models\FileDisk;
-use App\Support\Setup\InstallUtils;
+use App\Platform\Operations\Installation\Application\InstallationState;
+use App\Platform\Storage\Models\FileDisk;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -17,7 +17,7 @@ class ConfigMiddleware
      */
     public function handle(Request $request, Closure $next): Response
     {
-        if (InstallUtils::isDbCreated()) {
+        if (InstallationState::isDbCreated()) {
             // Only handle dynamic file disk switching when file_disk_id is provided
             if ($request->has('file_disk_id')) {
                 $file_disk = FileDisk::find($request->file_disk_id);
@@ -26,7 +26,7 @@ class ConfigMiddleware
                     $file_disk->setConfig();
                 }
             }
-            // Default file disk is now handled by AppConfigProvider during boot
+            // The default file disk is applied during application bootstrap.
         }
 
         return $next($request);
diff --git a/app/Http/Requests/DiskEnvironmentRequest.php b/app/Platform/Storage/Http/Requests/DiskEnvironmentRequest.php
similarity index 98%
rename from app/Http/Requests/DiskEnvironmentRequest.php
rename to app/Platform/Storage/Http/Requests/DiskEnvironmentRequest.php
index e2ec555b..f6a916b3 100644
--- a/app/Http/Requests/DiskEnvironmentRequest.php
+++ b/app/Platform/Storage/Http/Requests/DiskEnvironmentRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Platform\Storage\Http\Requests;
 
 use App\Rules\PublicHttpUrl;
 use Illuminate\Foundation\Http\FormRequest;
diff --git a/app/Http/Resources/FileDiskCollection.php b/app/Platform/Storage/Http/Resources/FileDiskCollection.php
similarity index 88%
rename from app/Http/Resources/FileDiskCollection.php
rename to app/Platform/Storage/Http/Resources/FileDiskCollection.php
index 464fd2be..c99a861d 100644
--- a/app/Http/Resources/FileDiskCollection.php
+++ b/app/Platform/Storage/Http/Resources/FileDiskCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Platform\Storage\Http\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\ResourceCollection;
diff --git a/app/Http/Resources/FileDiskResource.php b/app/Platform/Storage/Http/Resources/FileDiskResource.php
similarity index 92%
rename from app/Http/Resources/FileDiskResource.php
rename to app/Platform/Storage/Http/Resources/FileDiskResource.php
index 1c8c7466..148e38bc 100644
--- a/app/Http/Resources/FileDiskResource.php
+++ b/app/Platform/Storage/Http/Resources/FileDiskResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Resources;
+namespace App\Platform\Storage\Http\Resources;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
diff --git a/app/Jobs/CreateBackupJob.php b/app/Platform/Storage/Jobs/CreateBackupJob.php
similarity index 92%
rename from app/Jobs/CreateBackupJob.php
rename to app/Platform/Storage/Jobs/CreateBackupJob.php
index ec958487..a2871939 100644
--- a/app/Jobs/CreateBackupJob.php
+++ b/app/Platform/Storage/Jobs/CreateBackupJob.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Platform\Storage\Jobs;
 
-use App\Services\Storage\BackupConfigurationFactory;
+use App\Platform\Storage\Application\BackupConfigurationFactory;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Models/FileDisk.php b/app/Platform/Storage/Models/FileDisk.php
similarity index 97%
rename from app/Models/FileDisk.php
rename to app/Platform/Storage/Models/FileDisk.php
index 8d26caae..0b449884 100644
--- a/app/Models/FileDisk.php
+++ b/app/Platform/Storage/Models/FileDisk.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Models;
+namespace App\Platform\Storage\Models;
 
-use App\Services\Storage\FileDiskService;
+use App\Platform\Storage\Application\FileDiskService;
 use App\Support\SafeOrderBy;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -11,6 +11,8 @@ use Illuminate\Support\Collection;
 
 class FileDisk extends Model
 {
+    protected $table = 'file_disks';
+
     use HasFactory;
 
     public const DISK_TYPE_SYSTEM = 'SYSTEM';
diff --git a/app/Platform/Storage/Policies/StorageAccessPolicy.php b/app/Platform/Storage/Policies/StorageAccessPolicy.php
new file mode 100644
index 00000000..981a5ddc
--- /dev/null
+++ b/app/Platform/Storage/Policies/StorageAccessPolicy.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Platform\Storage\Policies;
+
+use App\Domains\Accounts\Models\User;
+
+class StorageAccessPolicy
+{
+    public function manage(User $user): bool
+    {
+        return $user->isSuperAdmin();
+    }
+}
diff --git a/app/Rules/Backup/BackupDisk.php b/app/Platform/Storage/Rules/BackupDisk.php
similarity index 94%
rename from app/Rules/Backup/BackupDisk.php
rename to app/Platform/Storage/Rules/BackupDisk.php
index 739452fa..3d95c480 100644
--- a/app/Rules/Backup/BackupDisk.php
+++ b/app/Platform/Storage/Rules/BackupDisk.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Rules\Backup;
+namespace App\Platform\Storage\Rules;
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
diff --git a/app/Rules/Backup/FilesystemDisks.php b/app/Platform/Storage/Rules/FilesystemDisks.php
similarity index 94%
rename from app/Rules/Backup/FilesystemDisks.php
rename to app/Platform/Storage/Rules/FilesystemDisks.php
index c3a33023..7e3c6577 100644
--- a/app/Rules/Backup/FilesystemDisks.php
+++ b/app/Platform/Storage/Rules/FilesystemDisks.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Rules\Backup;
+namespace App\Platform\Storage\Rules;
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
diff --git a/app/Rules/Backup/PathToZip.php b/app/Platform/Storage/Rules/PathToZip.php
similarity index 93%
rename from app/Rules/Backup/PathToZip.php
rename to app/Platform/Storage/Rules/PathToZip.php
index 5d75f341..f57b1850 100644
--- a/app/Rules/Backup/PathToZip.php
+++ b/app/Platform/Storage/Rules/PathToZip.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Rules\Backup;
+namespace App\Platform\Storage\Rules;
 
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
diff --git a/app/Platform/Storage/StorageServiceProvider.php b/app/Platform/Storage/StorageServiceProvider.php
new file mode 100644
index 00000000..d53f5e39
--- /dev/null
+++ b/app/Platform/Storage/StorageServiceProvider.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Platform\Storage;
+
+use App\Platform\Storage\Application\FileDiskService;
+use App\Platform\Storage\Console\MigrateMediaToPrivateDisk;
+use App\Platform\Storage\Contracts\StorageConfigurator;
+use App\Platform\Storage\Policies\StorageAccessPolicy;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Filesystem\FilesystemAdapter;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\ServiceProvider;
+use League\Flysystem\Filesystem;
+use Spatie\Dropbox\Client as DropboxClient;
+use Spatie\FlysystemDropbox\DropboxAdapter;
+
+class StorageServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     */
+    public function register(): void
+    {
+        $this->app->singleton(FileDiskService::class);
+        $this->app->bind(
+            StorageConfigurator::class,
+            fn (Application $app): FileDiskService => $app->make(FileDiskService::class),
+        );
+    }
+
+    /**
+     * Bootstrap services.
+     */
+    public function boot(): void
+    {
+        Gate::define('manage backups', [StorageAccessPolicy::class, 'manage']);
+        Gate::define('manage file disk', [StorageAccessPolicy::class, 'manage']);
+
+        $this->commands([
+            MigrateMediaToPrivateDisk::class,
+        ]);
+
+        Storage::extend('dropbox', function ($app, $config) {
+            $client = new DropboxClient(
+                $config['token']
+            );
+
+            $root = trim($config['root'] ?? '', '/');
+            $adapter = new DropboxAdapter($client, $root);
+            $flysystem = new Filesystem($adapter);
+
+            return new FilesystemAdapter($flysystem, $adapter, $config);
+        });
+    }
+}
diff --git a/app/Platform/Storage/routes/company.php b/app/Platform/Storage/routes/company.php
new file mode 100644
index 00000000..31498bfb
--- /dev/null
+++ b/app/Platform/Storage/routes/company.php
@@ -0,0 +1,14 @@
+<?php
+
+use App\Platform\Storage\Http\BackupsController;
+use App\Platform\Storage\Http\DiskController;
+use Illuminate\Support\Facades\Route;
+
+Route::apiResource('backups', BackupsController::class);
+Route::apiResource('/disks', DiskController::class);
+
+Route::get('download-backup', [BackupsController::class, 'download']);
+
+Route::get('/disk/drivers', [DiskController::class, 'getDiskDrivers']);
+Route::get('/disk/purposes', [DiskController::class, 'getDiskPurposes']);
+Route::put('/disk/purposes', [DiskController::class, 'updateDiskPurposes']);
diff --git a/app/Policies/ModulesPolicy.php b/app/Policies/ModulesPolicy.php
deleted file mode 100644
index 2aa9f8a0..00000000
--- a/app/Policies/ModulesPolicy.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use App\Models\User;
-use Illuminate\Auth\Access\HandlesAuthorization;
-
-class ModulesPolicy
-{
-    use HandlesAuthorization;
-
-    public function manageModules(User $user)
-    {
-        return $user->isSuperAdmin();
-    }
-}
diff --git a/app/Policies/SettingsPolicy.php b/app/Policies/SettingsPolicy.php
deleted file mode 100644
index 6dce39e7..00000000
--- a/app/Policies/SettingsPolicy.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use App\Models\Company;
-use App\Models\User;
-use Illuminate\Auth\Access\HandlesAuthorization;
-
-class SettingsPolicy
-{
-    use HandlesAuthorization;
-
-    public function manageCompany(User $user, Company $company)
-    {
-        if ($user->id == $company->owner_id) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function manageBackups(User $user)
-    {
-        if ($user->isSuperAdmin()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function manageFileDisk(User $user)
-    {
-        if ($user->isSuperAdmin()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function manageEmailConfig(User $user)
-    {
-        if ($user->isSuperAdmin()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function manageAiConfig(User $user)
-    {
-        if ($user->isSuperAdmin()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Any authenticated user with an active company context can use AI features,
-     * subject to the per-company kill-switch in AiConfigurationService.
-     */
-    public function useAi(User $user)
-    {
-        return $user !== null;
-    }
-
-    public function managePDFConfig(User $user)
-    {
-        if ($user->isSuperAdmin()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    public function manageSettings(User $user)
-    {
-        if ($user->isSuperAdmin()) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/app/Providers/AiServiceProvider.php b/app/Providers/AiServiceProvider.php
deleted file mode 100644
index 57180a52..00000000
--- a/app/Providers/AiServiceProvider.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use App\Services\Ai\AiToolRegistry;
-use App\Services\Ai\Tools\GetCompanyStatsTool;
-use App\Services\Ai\Tools\GetCustomerTool;
-use App\Services\Ai\Tools\GetInvoiceTool;
-use App\Services\Ai\Tools\ListExpenseCategoriesTool;
-use App\Services\Ai\Tools\ListOverdueInvoicesTool;
-use App\Services\Ai\Tools\ListRecentPaymentsTool;
-use App\Services\Ai\Tools\RankExpenseCategoriesTool;
-use App\Services\Ai\Tools\RankTopCustomersTool;
-use App\Services\Ai\Tools\RankTopItemsTool;
-use App\Services\Ai\Tools\SearchCustomersTool;
-use App\Services\Ai\Tools\SearchInvoicesTool;
-use App\Services\Ai\Tools\SearchItemsTool;
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Support\ServiceProvider;
-
-/**
- * Binds the AI tool registry as a singleton and registers every built-in
- * read-only tool the chat assistant can call.
- *
- * Modules that ship additional tools should extend the registry from their
- * own ServiceProvider::boot() by resolving AiToolRegistry from the container
- * and calling register() on it.
- */
-class AiServiceProvider extends ServiceProvider
-{
-    public function register(): void
-    {
-        $this->app->singleton(AiToolRegistry::class, function (Application $app): AiToolRegistry {
-            $registry = new AiToolRegistry;
-
-            // Built-in read-only tools (order is presentation-only; the LLM picks).
-            $registry->register(new SearchInvoicesTool);
-            $registry->register(new GetInvoiceTool);
-            $registry->register(new ListOverdueInvoicesTool);
-            $registry->register(new SearchCustomersTool);
-            $registry->register(new GetCustomerTool);
-            $registry->register(new ListRecentPaymentsTool);
-            $registry->register(new SearchItemsTool);
-            $registry->register(new ListExpenseCategoriesTool);
-            $registry->register(new GetCompanyStatsTool);
-
-            // Ranking tools — group-by aggregates the individual-record
-            // tools above can't express.
-            $registry->register(new RankTopCustomersTool);
-            $registry->register(new RankTopItemsTool);
-            $registry->register(new RankExpenseCategoriesTool);
-
-            return $registry;
-        });
-    }
-}
diff --git a/app/Providers/AppConfigProvider.php b/app/Providers/AppConfigProvider.php
deleted file mode 100644
index a04576c9..00000000
--- a/app/Providers/AppConfigProvider.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use App\Models\FileDisk;
-use App\Models\Setting;
-use App\Services\Mail\MailConfigurationService;
-use App\Services\Storage\FileDiskService;
-use App\Support\Setup\InstallUtils;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\ServiceProvider;
-
-class AppConfigProvider extends ServiceProvider
-{
-    /**
-     * Bootstrap services.
-     */
-    public function boot(): void
-    {
-        // Check if database is available
-        if (! InstallUtils::isDbCreated()) {
-            return;
-        }
-
-        $this->configureMailFromDatabase();
-        $this->configurePDFFromDatabase();
-        $this->configureFileSystemFromDatabase();
-    }
-
-    /**
-     * Configure mail settings from database
-     */
-    protected function configureMailFromDatabase(): void
-    {
-        try {
-            app(MailConfigurationService::class)->applyGlobalConfig();
-        } catch (\Exception $e) {
-            // Silently fail if database is not available (during installation, migrations, etc.)
-            // This prevents the application from breaking during setup
-        }
-    }
-
-    /**
-     * Configure PDF settings from database
-     */
-    protected function configurePDFFromDatabase(): void
-    {
-        try {
-            $pageSettings = [
-                'pdf_paper_width' => 'pdf.page.paper_width',
-                'pdf_paper_height' => 'pdf.page.paper_height',
-                'pdf_orientation' => 'pdf.page.orientation',
-                'pdf_margin_top' => 'pdf.page.margin_top',
-                'pdf_margin_right' => 'pdf.page.margin_right',
-                'pdf_margin_bottom' => 'pdf.page.margin_bottom',
-                'pdf_margin_left' => 'pdf.page.margin_left',
-            ];
-
-            $pdfSettings = Setting::getSettings(array_merge(
-                ['pdf_driver', 'gotenberg_host', 'gotenberg_pdfa', 'pdf_page_numbers'],
-                array_keys($pageSettings),
-            ));
-
-            if (! empty($pdfSettings['pdf_driver'])) {
-                Config::set('pdf.driver', $pdfSettings['pdf_driver']);
-
-                if ($pdfSettings['pdf_driver'] === 'gotenberg') {
-                    if (! empty($pdfSettings['gotenberg_host'])) {
-                        Config::set('pdf.connections.gotenberg.host', $pdfSettings['gotenberg_host']);
-                    }
-
-                    // Empty is a real choice here -- it means an ordinary PDF --
-                    // so an explicitly stored blank must override an env default.
-                    if (isset($pdfSettings['gotenberg_pdfa'])) {
-                        Config::set('pdf.connections.gotenberg.pdfa', $pdfSettings['gotenberg_pdfa'] ?: null);
-                    }
-                }
-            }
-
-            // Page geometry is applied regardless of driver. Note the isset guard
-            // rather than !empty: a saved margin of "0mm" is a deliberate choice,
-            // and !empty() would discard it and silently fall back to the default.
-            foreach ($pageSettings as $setting => $configKey) {
-                if (isset($pdfSettings[$setting]) && trim((string) $pdfSettings[$setting]) !== '') {
-                    Config::set($configKey, $pdfSettings[$setting]);
-                }
-            }
-
-            // Stored as a string, so cast rather than passing '0' through as a
-            // truthy value.
-            if (isset($pdfSettings['pdf_page_numbers'])) {
-                Config::set(
-                    'pdf.page.page_numbers',
-                    filter_var($pdfSettings['pdf_page_numbers'], FILTER_VALIDATE_BOOLEAN)
-                );
-            }
-        } catch (\Exception $e) {
-            // Silently fail if database is not available (during installation, migrations, etc.)
-            // This prevents the application from breaking during setup
-        }
-    }
-
-    /**
-     * Configure file system settings from database
-     */
-    protected function configureFileSystemFromDatabase(): void
-    {
-        try {
-            $fileDisk = FileDisk::whereSetAsDefault(true)->first();
-
-            if (! $fileDisk) {
-                return;
-            }
-
-            $diskName = app(FileDiskService::class)->registerDisk($fileDisk);
-
-            // Point Spatie Media Library at the resolved disk
-            config(['media-library.disk_name' => $diskName]);
-        } catch (\Exception $e) {
-            // Silently fail if database is not available (during installation, migrations, etc.)
-        }
-    }
-}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 1fe77d44..d5c99f5d 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,39 +2,15 @@
 
 namespace App\Providers;
 
-use App\Models\AiConversation;
-use App\Models\User;
-use App\Policies\AiConversationPolicy;
-use App\Policies\CompanyPolicy;
-use App\Policies\CreditNotePolicy;
-use App\Policies\CustomerPolicy;
-use App\Policies\DashboardPolicy;
-use App\Policies\EstimatePolicy;
-use App\Policies\ExpensePolicy;
-use App\Policies\InvoicePolicy;
-use App\Policies\ItemPolicy;
-use App\Policies\ModulesPolicy;
-use App\Policies\NotePolicy;
-use App\Policies\OwnerPolicy;
-use App\Policies\PaymentPolicy;
-use App\Policies\RecurringInvoicePolicy;
-use App\Policies\ReportPolicy;
-use App\Policies\RolePolicy;
-use App\Policies\SettingsPolicy;
-use App\Policies\UserPolicy;
+use App\Platform\Operations\Installation\Application\InstallationState;
+use App\Platform\Persistence\ModelIdentityMap;
 use App\Support\Bouncer\BouncerDefaultScope;
-use App\Support\Setup\InstallUtils;
-use App\Support\Setup\InstallWizardAuth;
-use Gate;
-use Illuminate\Http\Request;
+use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\Broadcast;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\ServiceProvider;
-use Laravel\Sanctum\Sanctum;
 use Silber\Bouncer\Database\Models as BouncerModels;
-use Silber\Bouncer\Database\Role;
-use View;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -61,19 +37,15 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
-        $this->configureInstallWizardTokenAuth();
+        ModelIdentityMap::enforce();
+        Factory::guessFactoryNamesUsing(
+            fn (string $modelName): string => 'Database\\Factories\\'.class_basename($modelName).'Factory'
+        );
 
-        if (InstallUtils::isDbCreated()) {
+        if (InstallationState::isDbCreated()) {
             $this->addMenus();
         }
 
-        Gate::policy(Role::class, RolePolicy::class);
-        Gate::policy(AiConversation::class, AiConversationPolicy::class);
-        Gate::define('manage module settings', fn (User $user): bool => $user->isSuperAdmin() || $user->isOwner());
-
-        View::addNamespace('pdf_templates', storage_path('app/templates/pdf'));
-
-        $this->bootAuth();
         $this->bootBroadcast();
 
         // In demo mode, prevent all outgoing emails and notifications
@@ -135,66 +107,8 @@ class AppServiceProvider extends ServiceProvider
             ->data('priority', $data['priority'] ?? 100);
     }
 
-    public function bootAuth()
-    {
-
-        Gate::define('create company', [CompanyPolicy::class, 'create']);
-        Gate::define('transfer company ownership', [CompanyPolicy::class, 'transferOwnership']);
-        Gate::define('delete company', [CompanyPolicy::class, 'delete']);
-
-        Gate::define('manage modules', [ModulesPolicy::class, 'manageModules']);
-
-        Gate::define('manage settings', [SettingsPolicy::class, 'manageSettings']);
-        Gate::define('manage company', [SettingsPolicy::class, 'manageCompany']);
-        Gate::define('manage backups', [SettingsPolicy::class, 'manageBackups']);
-        Gate::define('manage file disk', [SettingsPolicy::class, 'manageFileDisk']);
-        Gate::define('manage email config', [SettingsPolicy::class, 'manageEmailConfig']);
-        Gate::define('manage ai config', [SettingsPolicy::class, 'manageAiConfig']);
-        Gate::define('use ai', [SettingsPolicy::class, 'useAi']);
-        Gate::define('manage pdf config', [SettingsPolicy::class, 'managePDFConfig']);
-        Gate::define('manage notes', [NotePolicy::class, 'manageNotes']);
-        Gate::define('view notes', [NotePolicy::class, 'viewNotes']);
-
-        Gate::define('send invoice', [InvoicePolicy::class, 'send']);
-        Gate::define('create credit note', [CreditNotePolicy::class, 'create']);
-        Gate::define('send estimate', [EstimatePolicy::class, 'send']);
-        Gate::define('send payment', [PaymentPolicy::class, 'send']);
-
-        Gate::define('delete multiple items', [ItemPolicy::class, 'deleteMultiple']);
-        Gate::define('delete multiple customers', [CustomerPolicy::class, 'deleteMultiple']);
-        Gate::define('delete multiple users', [UserPolicy::class, 'deleteMultiple']);
-        Gate::define('delete multiple invoices', [InvoicePolicy::class, 'deleteMultiple']);
-        Gate::define('delete multiple estimates', [EstimatePolicy::class, 'deleteMultiple']);
-        Gate::define('delete multiple expenses', [ExpensePolicy::class, 'deleteMultiple']);
-        Gate::define('delete multiple payments', [PaymentPolicy::class, 'deleteMultiple']);
-        Gate::define('delete multiple recurring invoices', [RecurringInvoicePolicy::class, 'deleteMultiple']);
-
-        Gate::define('view dashboard', [DashboardPolicy::class, 'view']);
-
-        Gate::define('view report', [ReportPolicy::class, 'viewReport']);
-
-        Gate::define('owner only', [OwnerPolicy::class, 'managedByOwner']);
-    }
-
     public function bootBroadcast()
     {
         Broadcast::routes(['middleware' => 'api.auth']);
     }
-
-    private function configureInstallWizardTokenAuth(): void
-    {
-        Sanctum::authenticateAccessTokensUsing(function ($accessToken, bool $isValid): bool {
-            if (! $isValid) {
-                return false;
-            }
-
-            $request = request();
-
-            if (! $request instanceof Request || ! $request->attributes->get('install_wizard', false)) {
-                return $isValid;
-            }
-
-            return $accessToken->can(InstallWizardAuth::TOKEN_ABILITY);
-        });
-    }
 }
diff --git a/app/Providers/DropboxServiceProvider.php b/app/Providers/DropboxServiceProvider.php
deleted file mode 100644
index 0e0b48c5..00000000
--- a/app/Providers/DropboxServiceProvider.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use Illuminate\Filesystem\FilesystemAdapter;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\ServiceProvider;
-use League\Flysystem\Filesystem;
-use Spatie\Dropbox\Client as DropboxClient;
-use Spatie\FlysystemDropbox\DropboxAdapter;
-
-class DropboxServiceProvider extends ServiceProvider
-{
-    /**
-     * Register services.
-     */
-    public function register(): void
-    {
-        //
-    }
-
-    /**
-     * Bootstrap services.
-     */
-    public function boot(): void
-    {
-        Storage::extend('dropbox', function ($app, $config) {
-            $client = new DropboxClient(
-                $config['token']
-            );
-
-            $root = trim($config['root'] ?? '', '/');
-            $adapter = new DropboxAdapter($client, $root);
-            $flysystem = new Filesystem($adapter);
-
-            return new FilesystemAdapter($flysystem, $adapter, $config);
-        });
-    }
-}
diff --git a/app/Providers/PdfServiceProvider.php b/app/Providers/PdfServiceProvider.php
deleted file mode 100644
index 05d075ea..00000000
--- a/app/Providers/PdfServiceProvider.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Providers;
-
-use App\Support\Pdf\PdfService;
-use Illuminate\Support\ServiceProvider;
-
-class PdfServiceProvider extends ServiceProvider
-{
-    public $bindings = [
-        'pdf.driver' => PdfService::class,
-    ];
-}
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 9e3d4a9a..04a4f5eb 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -54,14 +54,5 @@ class RouteServiceProvider extends ServiceProvider
             return Limit::perMinute(60);
         });
 
-        // AI endpoints — per user per company, fairly generous for chat use
-        // but low enough to contain runaway clients / loops.
-        RateLimiter::for('ai', function (Request $request) {
-            $user = $request->user();
-            $companyId = $request->header('company') ?? 'noop';
-            $key = $user ? "{$user->id}:{$companyId}" : $request->ip();
-
-            return Limit::perMinute(30)->by($key);
-        });
     }
 }
diff --git a/app/Rules/CreditNoteDeletedTogether.php b/app/Rules/CreditNoteDeletedTogether.php
index 84d0c998..ac226a5c 100644
--- a/app/Rules/CreditNoteDeletedTogether.php
+++ b/app/Rules/CreditNoteDeletedTogether.php
@@ -2,7 +2,7 @@
 
 namespace App\Rules;
 
-use App\Models\Invoice;
+use App\Domains\Sales\Models\Invoice;
 use Closure;
 use Illuminate\Contracts\Validation\ValidationRule;
 
diff --git a/app/Services/Company/MemberService.php b/app/Services/Company/MemberService.php
deleted file mode 100644
index 1089194a..00000000
--- a/app/Services/Company/MemberService.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace App\Services\Company;
-
-use App\Http\Requests\MemberRequest;
-use App\Models\User;
-use Silber\Bouncer\BouncerFacade;
-
-class MemberService
-{
-    public function create(MemberRequest $request): User
-    {
-        $user = User::create($request->getUserPayload());
-
-        $user->setSettings([
-            'language' => 'default',
-        ]);
-
-        $companies = collect($request->companies);
-        $user->companies()->sync($companies->pluck('id'));
-
-        foreach ($companies as $company) {
-            BouncerFacade::scope()->to($company['id']);
-
-            BouncerFacade::sync($user)->roles([$company['role']]);
-        }
-
-        return $user;
-    }
-
-    public function update(User $user, MemberRequest $request): User
-    {
-        $user->update($request->getUserPayload());
-
-        $companies = collect($request->companies);
-        $user->companies()->sync($companies->pluck('id'));
-
-        foreach ($companies as $company) {
-            BouncerFacade::scope()->to($company['id']);
-
-            BouncerFacade::sync($user)->roles([$company['role']]);
-        }
-
-        return $user;
-    }
-
-    public function delete(array $ids): bool
-    {
-        foreach ($ids as $id) {
-            $user = User::find($id);
-
-            if ($user->invoices()->exists()) {
-                $user->invoices()->update(['creator_id' => null]);
-            }
-
-            if ($user->estimates()->exists()) {
-                $user->estimates()->update(['creator_id' => null]);
-            }
-
-            if ($user->customers()->exists()) {
-                $user->customers()->update(['creator_id' => null]);
-            }
-
-            if ($user->recurringInvoices()->exists()) {
-                $user->recurringInvoices()->update(['creator_id' => null]);
-            }
-
-            if ($user->expenses()->exists()) {
-                $user->expenses()->update(['creator_id' => null]);
-            }
-
-            if ($user->payments()->exists()) {
-                $user->payments()->update(['creator_id' => null]);
-            }
-
-            if ($user->items()->exists()) {
-                $user->items()->update(['creator_id' => null]);
-            }
-
-            if ($user->settings()->exists()) {
-                $user->settings()->delete();
-            }
-
-            $user->delete();
-        }
-
-        return true;
-    }
-}
diff --git a/app/Services/CustomFieldService.php b/app/Services/CustomFieldService.php
deleted file mode 100644
index 5a6cab83..00000000
--- a/app/Services/CustomFieldService.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\Models\CustomField;
-use Illuminate\Http\Request;
-
-class CustomFieldService
-{
-    public function create(Request $request): CustomField
-    {
-        $data = $request->validated();
-        $data[getCustomFieldValueKey($request->type)] = $request->default_answer;
-        $data['company_id'] = $request->header('company');
-        $data['slug'] = clean_slug($request->model_type, $request->name);
-
-        return CustomField::create($data);
-    }
-
-    public function update(CustomField $customField, Request $request): CustomField
-    {
-        $data = $request->validated();
-        $data[getCustomFieldValueKey($request->type)] = $request->default_answer;
-        $customField->update($data);
-
-        return $customField;
-    }
-}
diff --git a/app/Services/CustomerService.php b/app/Services/CustomerService.php
deleted file mode 100644
index c36366d6..00000000
--- a/app/Services/CustomerService.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\Models\CompanySetting;
-use App\Models\Customer;
-use App\Models\Expense;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
-use Carbon\Carbon;
-use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
-use Illuminate\Validation\ValidationException;
-
-class CustomerService
-{
-    public function create(Request $request): Customer
-    {
-        $customer = Customer::create($request->getCustomerPayload());
-
-        if ($request->shipping) {
-            if ($request->hasAddress($request->shipping)) {
-                $customer->addresses()->create($request->getShippingAddress());
-            }
-        }
-
-        if ($request->billing) {
-            if ($request->hasAddress($request->billing)) {
-                $customer->addresses()->create($request->getBillingAddress());
-            }
-        }
-
-        $customFields = $request->customFields;
-
-        if ($customFields) {
-            $customer->addCustomFields($customFields);
-        }
-
-        return Customer::with('billingAddress', 'shippingAddress', 'fields')->find($customer->id);
-    }
-
-    /**
-     * @throws ValidationException
-     */
-    public function update(Request $request, Customer $customer): Customer
-    {
-        $condition = $customer->estimates()->exists() || $customer->invoices()->exists() || $customer->payments()->exists() || $customer->recurringInvoices()->exists();
-
-        if (($customer->currency_id !== $request->currency_id) && $condition) {
-            throw ValidationException::withMessages([
-                'currency_id' => ['you_cannot_edit_currency'],
-            ]);
-        }
-
-        $customer->update($request->getCustomerPayload());
-
-        $customer->addresses()->delete();
-
-        if ($request->shipping) {
-            if ($request->hasAddress($request->shipping)) {
-                $customer->addresses()->create($request->getShippingAddress());
-            }
-        }
-
-        if ($request->billing) {
-            if ($request->hasAddress($request->billing)) {
-                $customer->addresses()->create($request->getBillingAddress());
-            }
-        }
-
-        $customFields = $request->customFields;
-
-        if ($customFields) {
-            $customer->updateCustomFields($customFields);
-        }
-
-        return Customer::with('billingAddress', 'shippingAddress', 'fields')->find($customer->id);
-    }
-
-    public function delete(Collection $ids): bool
-    {
-        foreach ($ids as $id) {
-            $customer = Customer::find($id);
-
-            if ($customer->estimates()->exists()) {
-                $customer->estimates()->delete();
-            }
-
-            // There are no database foreign keys for payment allocations. Clear
-            // them before the bulk payment delete, then remove invoices so an
-            // allocation cannot outlive either side of the relationship.
-            if ($customer->payments()->exists()) {
-                PaymentAllocation::query()
-                    ->whereIn('payment_id', $customer->payments()->select('id'))
-                    ->delete();
-                $customer->payments()->delete();
-            }
-
-            if ($customer->invoices()->exists()) {
-                $customer->invoices->map(function ($invoice) {
-                    if ($invoice->transactions()->exists()) {
-                        $invoice->transactions()->delete();
-                    }
-                    $invoice->delete();
-                });
-            }
-
-            if ($customer->addresses()->exists()) {
-                $customer->addresses()->delete();
-            }
-
-            if ($customer->expenses()->exists()) {
-                $customer->expenses->each->delete();
-            }
-
-            if ($customer->recurringInvoices()->exists()) {
-                foreach ($customer->recurringInvoices as $recurringInvoice) {
-                    if ($recurringInvoice->items()->exists()) {
-                        $recurringInvoice->items()->delete();
-                    }
-
-                    $recurringInvoice->delete();
-                }
-            }
-
-            $customer->delete();
-        }
-
-        return true;
-    }
-
-    public function getStats(Customer $customer, int $companyId, bool $previousYear = false): array
-    {
-        $i = 0;
-        $months = [];
-        $invoiceTotals = [];
-        $expenseTotals = [];
-        $receiptTotals = [];
-        $netProfits = [];
-        $monthCounter = 0;
-        $fiscalYear = CompanySetting::getSetting('fiscal_year', $companyId);
-        $startDate = Carbon::now();
-        $start = Carbon::now();
-        $end = Carbon::now();
-        $terms = explode('-', $fiscalYear);
-        $companyStartMonth = intval($terms[0]);
-
-        if ($companyStartMonth <= $start->month) {
-            $startDate->month($companyStartMonth)->startOfMonth();
-            $start->month($companyStartMonth)->startOfMonth();
-            $end->month($companyStartMonth)->endOfMonth();
-        } else {
-            $startDate->subYear()->month($companyStartMonth)->startOfMonth();
-            $start->subYear()->month($companyStartMonth)->startOfMonth();
-            $end->subYear()->month($companyStartMonth)->endOfMonth();
-        }
-
-        if ($previousYear) {
-            $startDate->subYear()->startOfMonth();
-            $start->subYear()->startOfMonth();
-            $end->subYear()->endOfMonth();
-        }
-
-        while ($monthCounter < 12) {
-            array_push(
-                $invoiceTotals,
-                Invoice::whereBetween(
-                    'invoice_date',
-                    [$start->format('Y-m-d'), $end->format('Y-m-d')]
-                )
-                    ->whereCompany()
-                    ->whereCustomer($customer->id)
-                    ->sum('base_total') ?? 0
-            );
-            array_push(
-                $expenseTotals,
-                Expense::whereBetween(
-                    'expense_date',
-                    [$start->format('Y-m-d'), $end->format('Y-m-d')]
-                )
-                    ->whereCompany()
-                    ->whereUser($customer->id)
-                    ->sum('base_amount') ?? 0
-            );
-            array_push(
-                $receiptTotals,
-                Payment::whereBetween(
-                    'payment_date',
-                    [$start->format('Y-m-d'), $end->format('Y-m-d')]
-                )
-                    ->whereCompany()
-                    ->whereCustomer($customer->id)
-                    ->sum('base_amount') ?? 0
-            );
-            array_push(
-                $netProfits,
-                ($receiptTotals[$i] - $expenseTotals[$i])
-            );
-            $i++;
-            array_push($months, $start->translatedFormat('M'));
-            $monthCounter++;
-            $end->startOfMonth();
-            $start->addMonth()->startOfMonth();
-            $end->addMonth()->endOfMonth();
-        }
-
-        $start->subMonth()->endOfMonth();
-
-        $salesTotal = Invoice::whereBetween(
-            'invoice_date',
-            [$startDate->format('Y-m-d'), $start->format('Y-m-d')]
-        )
-            ->whereCompany()
-            ->whereCustomer($customer->id)
-            ->sum('base_total');
-        $totalReceipts = Payment::whereBetween(
-            'payment_date',
-            [$startDate->format('Y-m-d'), $start->format('Y-m-d')]
-        )
-            ->whereCompany()
-            ->whereCustomer($customer->id)
-            ->sum('base_amount');
-        $totalExpenses = Expense::whereBetween(
-            'expense_date',
-            [$startDate->format('Y-m-d'), $start->format('Y-m-d')]
-        )
-            ->whereCompany()
-            ->whereUser($customer->id)
-            ->sum('base_amount');
-        $netProfit = (int) $totalReceipts - (int) $totalExpenses;
-
-        return [
-            'months' => $months,
-            'invoiceTotals' => $invoiceTotals,
-            'expenseTotals' => $expenseTotals,
-            'receiptTotals' => $receiptTotals,
-            'netProfit' => $netProfit,
-            'netProfits' => $netProfits,
-            'salesTotal' => $salesTotal,
-            'totalReceipts' => $totalReceipts,
-            'totalExpenses' => $totalExpenses,
-        ];
-    }
-}
diff --git a/app/Services/Document/ExpenseService.php b/app/Services/Document/ExpenseService.php
deleted file mode 100644
index bb77f967..00000000
--- a/app/Services/Document/ExpenseService.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-namespace App\Services\Document;
-
-use App\Models\CompanySetting;
-use App\Models\ExchangeRateLog;
-use App\Models\Expense;
-use App\Models\TaxType;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-
-class ExpenseService
-{
-    public function create(Request $request): Expense
-    {
-        $expense = DB::transaction(function () use ($request): Expense {
-            $expense = Expense::create($request->getExpensePayload());
-
-            if ($request->has('taxes')) {
-                $this->syncTaxes($expense, $request->input('taxes'));
-            }
-
-            return $expense;
-        });
-
-        $companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
-
-        if ((string) $expense['currency_id'] !== $companyCurrency) {
-            ExchangeRateLog::addExchangeRateLog($expense);
-        }
-
-        if ($request->hasFile('attachment_receipt')) {
-            $expense->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts');
-        }
-
-        if ($request->customFields) {
-            $expense->addCustomFields(json_decode($request->customFields));
-        }
-
-        return $expense->load('taxes.taxType');
-    }
-
-    public function update(Expense $expense, Request $request): Expense
-    {
-        $data = $request->getExpensePayload();
-
-        DB::transaction(function () use ($expense, $data, $request): void {
-            $expense->update($data);
-
-            if ($request->has('taxes')) {
-                $this->syncTaxes($expense, $request->input('taxes'));
-            }
-        });
-
-        $companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
-
-        if ((string) $data['currency_id'] !== $companyCurrency) {
-            ExchangeRateLog::addExchangeRateLog($expense);
-        }
-
-        if (isset($request->is_attachment_receipt_removed) && (bool) $request->is_attachment_receipt_removed) {
-            $expense->clearMediaCollection('receipts');
-        }
-        if ($request->hasFile('attachment_receipt')) {
-            $expense->clearMediaCollection('receipts');
-            $expense->addMediaFromRequest('attachment_receipt')->toMediaCollection('receipts');
-        }
-
-        if ($request->customFields) {
-            $expense->updateCustomFields(json_decode($request->customFields));
-        }
-
-        return $expense->fresh('taxes.taxType');
-    }
-
-    /**
-     * Replace an expense's receipt tax snapshots with the submitted tax amounts.
-     */
-    private function syncTaxes(Expense $expense, array $taxes): void
-    {
-        $expense->taxes()->delete();
-
-        if ($taxes === []) {
-            return;
-        }
-
-        $taxTypes = TaxType::query()
-            ->where('company_id', $expense->company_id)
-            ->where('type', TaxType::TYPE_GENERAL)
-            ->whereTransactionType(TaxType::TRANSACTION_TYPE_PURCHASES)
-            ->whereIn('id', collect($taxes)->pluck('tax_type_id'))
-            ->get()
-            ->keyBy('id');
-
-        foreach ($taxes as $tax) {
-            $taxType = $taxTypes->get($tax['tax_type_id']);
-
-            $expense->taxes()->create([
-                'tax_type_id' => $taxType->id,
-                'company_id' => $expense->company_id,
-                'currency_id' => $expense->currency_id,
-                'exchange_rate' => $expense->exchange_rate,
-                'amount' => (int) $tax['amount'],
-                'base_amount' => (int) round($tax['amount'] * $expense->exchange_rate),
-                'name' => $taxType->name,
-                'percent' => $taxType->percent,
-                'fixed_amount' => $taxType->fixed_amount,
-                'calculation_type' => $taxType->calculation_type,
-                'compound_tax' => $taxType->compound_tax,
-            ]);
-        }
-    }
-}
diff --git a/app/Services/Document/PaymentService.php b/app/Services/Document/PaymentService.php
deleted file mode 100644
index 6feff4e8..00000000
--- a/app/Services/Document/PaymentService.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-
-namespace App\Services\Document;
-
-use App\Facades\Hashids;
-use App\Facades\Pdf;
-use App\Mail\SendPaymentMail;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\ExchangeRateLog;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Services\Mail\CompanyMailConfigService;
-use App\Support\Pdf\PdfMetadata;
-use App\Support\Pdf\PdfTemplateUtils;
-use Carbon\Carbon;
-use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Validation\ValidationException;
-
-class PaymentService
-{
-    public function __construct(
-        private readonly PaymentAllocationService $paymentAllocationService,
-    ) {}
-
-    public function create(Request $request): Payment
-    {
-        $data = $request->getPaymentPayload();
-        $allocations = $request->validated('allocations') ?? [];
-
-        $payment = DB::transaction(function () use ($data, $allocations, $request): Payment {
-            $payment = Payment::create($data);
-            $payment->unique_hash = Hashids::connection(Payment::class)->encode($payment->id);
-
-            $serial = (new SerialNumberService)
-                ->setModel($payment)
-                ->setCompany($payment->company_id)
-                ->setCustomer($payment->customer_id)
-                ->setNextNumbers();
-
-            $payment->sequence_number = $serial->nextSequenceNumber;
-            $payment->customer_sequence_number = $serial->nextCustomerSequenceNumber;
-            $payment->save();
-
-            $this->paymentAllocationService->replace($payment, $allocations);
-
-            $companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
-
-            if ((string) $payment->currency_id !== $companyCurrency) {
-                ExchangeRateLog::addExchangeRateLog($payment);
-            }
-
-            if ($request->customFields) {
-                $payment->addCustomFields($request->customFields);
-            }
-
-            return $payment;
-        });
-
-        return $this->loadPayment($payment);
-    }
-
-    public function update(Payment $payment, Request $request): Payment
-    {
-        $data = $request->getPaymentPayload();
-        $replaceAllocations = $request->exists('allocations');
-        $requestedAllocations = $request->validated('allocations') ?? [];
-
-        $payment = DB::transaction(function () use ($payment, $data, $replaceAllocations, $requestedAllocations, $request): Payment {
-            $lockedPayment = Payment::query()->whereKey($payment->id)->lockForUpdate()->firstOrFail();
-            $allocations = $replaceAllocations
-                ? $requestedAllocations
-                : $lockedPayment->allocations()
-                    ->get(['invoice_id', 'amount'])
-                    ->map(fn ($allocation) => [
-                        'invoice_id' => (int) $allocation->invoice_id,
-                        'amount' => (int) $allocation->amount,
-                    ])
-                    ->all();
-            $customerChanged = (int) $lockedPayment->customer_id !== (int) $data['customer_id'];
-
-            if ($customerChanged && $allocations !== []) {
-                throw ValidationException::withMessages([
-                    'customer_id' => ['payment_customer_change_requires_unallocated_credit'],
-                ]);
-            }
-
-            $serial = (new SerialNumberService)
-                ->setModel($lockedPayment)
-                ->setCompany($lockedPayment->company_id)
-                ->setCustomer($data['customer_id'])
-                ->setModelObject($lockedPayment->id)
-                ->setNextNumbers();
-
-            $data['customer_sequence_number'] = $serial->nextCustomerSequenceNumber;
-            $lockedPayment->update($data);
-            $this->paymentAllocationService->replace($lockedPayment, $allocations);
-
-            $companyCurrency = CompanySetting::getSetting('currency', $request->header('company'));
-
-            if ((string) $lockedPayment->currency_id !== $companyCurrency) {
-                ExchangeRateLog::addExchangeRateLog($lockedPayment);
-            }
-
-            if ($request->customFields) {
-                $lockedPayment->updateCustomFields($request->customFields);
-            }
-
-            return $lockedPayment;
-        });
-
-        return $this->loadPayment($payment);
-    }
-
-    public function delete(Collection $ids): bool
-    {
-        DB::transaction(function () use ($ids): void {
-            foreach ($ids->sort() as $id) {
-                $payment = Payment::query()->whereKey($id)->lockForUpdate()->first();
-
-                if (! $payment) {
-                    continue;
-                }
-
-                $this->paymentAllocationService->replace($payment, []);
-                $payment->delete();
-            }
-        });
-
-        return true;
-    }
-
-    public function sendPaymentData(Payment $payment, array $data): array
-    {
-        $data['payment'] = $payment->toArray();
-        $data['user'] = $payment->customer->toArray();
-        $data['company'] = Company::find($payment->company_id);
-        $data['body'] = $payment->getEmailBody($data['body']);
-        $data['attach']['data'] = ($payment->getEmailAttachmentSetting()) ? $this->getPdfData($payment) : null;
-
-        return $data;
-    }
-
-    public function send(Payment $payment, array $data): array
-    {
-        $data = $this->sendPaymentData($payment, $data);
-
-        CompanyMailConfigService::apply($payment->company_id);
-
-        $mail = \Mail::to($data['to']);
-        if (! empty($data['cc'])) {
-            $mail->cc($data['cc']);
-        }
-        if (! empty($data['bcc'])) {
-            $mail->bcc($data['bcc']);
-        }
-        $mail->send(new SendPaymentMail($data));
-
-        return [
-            'success' => true,
-        ];
-    }
-
-    public function getPdfData(Payment $payment)
-    {
-        $payment->loadMissing('allocations.invoice.currency');
-
-        $company = Company::find($payment->company_id);
-        $locale = CompanySetting::getSetting('language', $company->id);
-
-        \App::setLocale($locale);
-
-        $logo = $company->logo_path;
-
-        view()->share([
-            'payment' => $payment,
-            'company_address' => $payment->getCompanyAddress(),
-            'billing_address' => $payment->getCustomerBillingAddress(),
-            'notes' => $payment->getNotes(),
-            'logo' => $logo ?? null,
-        ]);
-
-        $templatePath = PdfTemplateUtils::resolveView('payment', 'payment');
-
-        if (request()->has('preview')) {
-            return view($templatePath);
-        }
-
-        return Pdf::loadView($templatePath, PdfMetadata::forDocument(
-            __('pdf_payment_label'),
-            $payment->payment_number,
-            $company,
-        ));
-    }
-
-    public function generateFromTransaction($transaction): Payment
-    {
-        $invoice = Invoice::find($transaction->invoice_id);
-
-        $serial = (new SerialNumberService)
-            ->setModel(new Payment)
-            ->setCompany($invoice->company_id)
-            ->setCustomer($invoice->customer_id)
-            ->setNextNumbers();
-
-        $data['payment_number'] = $serial->getNextNumber();
-        $data['payment_date'] = Carbon::now();
-        $data['amount'] = $invoice->due_amount;
-        $data['payment_method_id'] = request()->payment_method_id;
-        $data['customer_id'] = $invoice->customer_id;
-        $data['exchange_rate'] = $invoice->exchange_rate;
-        $data['base_amount'] = (int) round($data['amount'] * $data['exchange_rate']);
-        $data['currency_id'] = $invoice->currency_id;
-        $data['company_id'] = $invoice->company_id;
-        $data['transaction_id'] = $transaction->id;
-
-        return DB::transaction(function () use ($data, $serial, $invoice): Payment {
-            $payment = Payment::create($data);
-            $payment->unique_hash = Hashids::connection(Payment::class)->encode($payment->id);
-            $payment->sequence_number = $serial->nextSequenceNumber;
-            $payment->customer_sequence_number = $serial->nextCustomerSequenceNumber;
-            $payment->save();
-
-            $this->paymentAllocationService->replace($payment, [[
-                'invoice_id' => $invoice->id,
-                'amount' => (int) $data['amount'],
-            ]]);
-
-            return $payment;
-        });
-    }
-
-    private function loadPayment(Payment $payment): Payment
-    {
-        return Payment::with([
-            'customer',
-            'allocations.invoice',
-            'paymentMethod',
-            'fields',
-        ])->findOrFail($payment->id);
-    }
-}
diff --git a/app/Services/ExchangeRateProviderService.php b/app/Services/ExchangeRateProviderService.php
deleted file mode 100644
index f8c847dc..00000000
--- a/app/Services/ExchangeRateProviderService.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\Http\Requests\ExchangeRateProviderRequest;
-use App\Models\CompanySetting;
-use App\Models\ExchangeRateLog;
-use App\Models\ExchangeRateProvider;
-use App\Support\ExchangeRate\ExchangeRateDriverFactory;
-use App\Support\ExchangeRate\ExchangeRateException;
-
-class ExchangeRateProviderService
-{
-    public function create(ExchangeRateProviderRequest $request): ExchangeRateProvider
-    {
-        return ExchangeRateProvider::create($request->getExchangeRateProviderPayload());
-    }
-
-    public function update(ExchangeRateProvider $provider, ExchangeRateProviderRequest $request): ExchangeRateProvider
-    {
-        $provider->update($request->getExchangeRateProviderPayload());
-
-        return $provider;
-    }
-
-    public function checkActiveCurrencies($request)
-    {
-        $currencies = $request->currencies;
-
-        if (empty($currencies)) {
-            return collect();
-        }
-
-        $query = ExchangeRateProvider::where('active', true);
-
-        foreach ($currencies as $currency) {
-            $query->orWhere(function ($q) use ($currency) {
-                $q->where('active', true)
-                    ->whereJsonContains('currencies', $currency);
-            });
-        }
-
-        return $query->get();
-    }
-
-    public function checkUpdateActiveCurrencies(ExchangeRateProvider $provider, $request)
-    {
-        $currencies = $request->currencies;
-
-        if (empty($currencies)) {
-            return collect();
-        }
-
-        $query = ExchangeRateProvider::where('id', '<>', $provider->id)
-            ->where('active', true);
-
-        $query->where(function ($q) use ($currencies) {
-            foreach ($currencies as $currency) {
-                $q->orWhereJsonContains('currencies', $currency);
-            }
-        });
-
-        return $query->get();
-    }
-
-    public function checkProviderStatus($request)
-    {
-        try {
-            $driver = ExchangeRateDriverFactory::make(
-                $request['driver'],
-                $request['key'],
-                $request['driver_config'] ?? []
-            );
-
-            $rates = $driver->validateConnection();
-
-            return response()->json([
-                'exchangeRate' => $rates,
-            ], 200);
-        } catch (ExchangeRateException $e) {
-            return respondJson($e->errorKey, $e->getMessage());
-        }
-    }
-
-    public function getExchangeRate(string $driver, string $apiKey, array $driverConfig, string $baseCurrency, string $targetCurrency)
-    {
-        try {
-            $driverInstance = ExchangeRateDriverFactory::make($driver, $apiKey, $driverConfig);
-
-            return response()->json([
-                'exchangeRate' => $driverInstance->getExchangeRate($baseCurrency, $targetCurrency),
-            ], 200);
-        } catch (ExchangeRateException $e) {
-            return respondJson($e->errorKey, $e->getMessage());
-        }
-    }
-
-    public function getSupportedCurrencies(string $driver, string $apiKey, array $driverConfig = [])
-    {
-        try {
-            $driverInstance = ExchangeRateDriverFactory::make($driver, $apiKey, $driverConfig);
-
-            return response()->json([
-                'supportedCurrencies' => $driverInstance->getSupportedCurrencies(),
-            ]);
-        } catch (ExchangeRateException $e) {
-            return respondJson($e->errorKey, $e->getMessage());
-        }
-    }
-
-    public function addExchangeRateLog($model): ExchangeRateLog
-    {
-        return ExchangeRateLog::create([
-            'exchange_rate' => $model->exchange_rate,
-            'company_id' => $model->company_id,
-            'base_currency_id' => $model->currency_id,
-            'currency_id' => CompanySetting::getSetting('currency', $model->company_id),
-        ]);
-    }
-}
diff --git a/app/Services/ItemService.php b/app/Services/ItemService.php
deleted file mode 100644
index de338f3a..00000000
--- a/app/Services/ItemService.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace App\Services;
-
-use App\Models\CompanySetting;
-use App\Models\Item;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class ItemService
-{
-    public function create(Request $request): Item
-    {
-        $data = $request->validated();
-        $data['company_id'] = $request->header('company');
-        $data['creator_id'] = Auth::id();
-        $data['currency_id'] = CompanySetting::getSetting('currency', $request->header('company'));
-        $item = Item::create($data);
-
-        if ($request->has('taxes')) {
-            foreach ($request->taxes as $tax) {
-                $item->tax_per_item = true;
-                $item->save();
-                $tax['company_id'] = $request->header('company');
-                $item->taxes()->create($tax);
-            }
-        }
-
-        return Item::with('taxes')->find($item->id);
-    }
-
-    public function update(Item $item, Request $request): Item
-    {
-        $item->update($request->validated());
-
-        $item->taxes()->delete();
-
-        if ($request->has('taxes')) {
-            foreach ($request->taxes as $tax) {
-                $item->tax_per_item = true;
-                $item->save();
-                $tax['company_id'] = $request->header('company');
-                $item->taxes()->create($tax);
-            }
-        }
-
-        return Item::with('taxes')->find($item->id);
-    }
-}
diff --git a/app/Services/Mail/CompanyMailConfigService.php b/app/Services/Mail/CompanyMailConfigService.php
deleted file mode 100644
index 4adb61ad..00000000
--- a/app/Services/Mail/CompanyMailConfigService.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Services\Mail;
-
-class CompanyMailConfigService
-{
-    public static function apply(int $companyId): void
-    {
-        app(MailConfigurationService::class)->applyCompanyConfig($companyId);
-    }
-}
diff --git a/app/Support/Hashids/HashidConnection.php b/app/Support/Hashids/HashidConnection.php
new file mode 100644
index 00000000..fa5347c9
--- /dev/null
+++ b/app/Support/Hashids/HashidConnection.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Support\Hashids;
+
+enum HashidConnection: string
+{
+    case Company = 'company';
+    case EmailLog = 'email_log';
+    case Estimate = 'estimate';
+    case Invoice = 'invoice';
+    case Payment = 'payment';
+    case Transaction = 'transaction';
+}
diff --git a/app/Support/Media/CustomPathGenerator.php b/app/Support/Media/CustomPathGenerator.php
index b9b3394f..afb7b9bc 100644
--- a/app/Support/Media/CustomPathGenerator.php
+++ b/app/Support/Media/CustomPathGenerator.php
@@ -2,9 +2,7 @@
 
 namespace App\Support\Media;
 
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Models\Payment;
+use App\Platform\Persistence\ModelIdentityMap;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Spatie\MediaLibrary\Support\PathGenerator\PathGenerator;
 
@@ -32,11 +30,11 @@ class CustomPathGenerator implements PathGenerator
     {
         $folderName = null;
 
-        if ($media->model_type == Invoice::class) {
+        if ($media->model_type === ModelIdentityMap::INVOICE_ALIAS) {
             $folderName = 'Invoices';
-        } elseif ($media->model_type == Estimate::class) {
+        } elseif ($media->model_type === ModelIdentityMap::ESTIMATE_ALIAS) {
             $folderName = 'Estimates';
-        } elseif ($media->model_type == Payment::class) {
+        } elseif ($media->model_type === ModelIdentityMap::PAYMENT_ALIAS) {
             $folderName = 'Payments';
         } else {
             $folderName = $media->getKey();
diff --git a/app/Traits/HasCustomFieldsTrait.php b/app/Traits/HasCustomFieldsTrait.php
deleted file mode 100644
index 1018edb8..00000000
--- a/app/Traits/HasCustomFieldsTrait.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Traits;
-
-use App\Models\CustomField;
-use App\Models\CustomFieldValue;
-use Illuminate\Database\Eloquent\Relations\MorphMany;
-
-trait HasCustomFieldsTrait
-{
-    public function fields(): MorphMany
-    {
-        return $this->morphMany(CustomFieldValue::class, 'custom_field_valuable');
-    }
-
-    protected static function booted()
-    {
-        static::deleting(function ($data) {
-            if ($data->fields()->exists()) {
-                $data->fields()->delete();
-            }
-        });
-    }
-
-    public function addCustomFields($customFields)
-    {
-        foreach ($customFields as $field) {
-            if (! is_array($field)) {
-                $field = (array) $field;
-            }
-            $customField = CustomField::find($field['id']);
-
-            $customFieldValue = [
-                'type' => $customField->type,
-                'custom_field_id' => $customField->id,
-                'company_id' => $customField->company_id,
-                getCustomFieldValueKey($customField->type) => $field['value'],
-            ];
-
-            $this->fields()->create($customFieldValue);
-        }
-    }
-
-    public function updateCustomFields($customFields)
-    {
-        foreach ($customFields as $field) {
-            if (! is_array($field)) {
-                $field = (array) $field;
-            }
-
-            $customField = CustomField::find($field['id']);
-            $customFieldValue = $this->fields()->firstOrCreate([
-                'custom_field_id' => $customField->id,
-                'type' => $customField->type,
-                'company_id' => $this->company_id,
-            ]);
-
-            $type = getCustomFieldValueKey($customField->type);
-            $customFieldValue->$type = $field['value'];
-            $customFieldValue->save();
-        }
-    }
-
-    public function getCustomFieldBySlug($slug)
-    {
-        return $this->fields()
-            ->with('customField')
-            ->whereHas('customField', function ($query) use ($slug) {
-                $query->where('slug', $slug);
-            })->first();
-    }
-
-    public function getCustomFieldValueBySlug($slug)
-    {
-        $value = $this->getCustomFieldBySlug($slug);
-
-        if ($value) {
-            return $value->defaultAnswer;
-        }
-
-        return null;
-    }
-}
diff --git a/bootstrap/app.php b/bootstrap/app.php
index 5fa3255a..61d4a90a 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -1,27 +1,27 @@
 <?php
 
-use App\Http\Middleware\Authenticate;
-use App\Http\Middleware\CompanyMiddleware;
-use App\Http\Middleware\ConfigMiddleware;
-use App\Http\Middleware\CronJobMiddleware;
-use App\Http\Middleware\CustomerGuest;
-use App\Http\Middleware\CustomerPortalMiddleware;
-use App\Http\Middleware\CustomerRedirectIfAuthenticated;
+use App\Domains\Accounts\Http\Middleware\Authenticate;
+use App\Domains\Accounts\Http\Middleware\CompanyMiddleware;
+use App\Domains\Accounts\Http\Middleware\RedirectIfAuthenticated;
+use App\Domains\Accounts\Http\Middleware\RedirectIfUnauthorized;
+use App\Domains\Accounts\Http\Middleware\ScopeBouncer;
+use App\Domains\Accounts\Http\Middleware\SuperAdminMiddleware;
+use App\Domains\Contacts\Http\Middleware\CustomerGuest;
+use App\Domains\Contacts\Http\Middleware\CustomerPortalMiddleware;
+use App\Domains\Contacts\Http\Middleware\CustomerRedirectIfAuthenticated;
 use App\Http\Middleware\EncryptCookies;
-use App\Http\Middleware\EnsureNotContainerized;
-use App\Http\Middleware\InstallationMiddleware;
-use App\Http\Middleware\PdfMiddleware;
 use App\Http\Middleware\PreventRequestForgery;
-use App\Http\Middleware\RedirectIfAuthenticated;
-use App\Http\Middleware\RedirectIfInstalled;
-use App\Http\Middleware\RedirectIfUnauthorized;
-use App\Http\Middleware\ScopeBouncer;
-use App\Http\Middleware\SuperAdminMiddleware;
 use App\Http\Middleware\TrimStrings;
 use App\Http\Middleware\TrustProxies;
-use App\Http\Middleware\UseInstallWizardTokenAuth;
+use App\Platform\Modules\Runtime\ModuleRuntimeAutoloader;
+use App\Platform\Operations\Http\Middleware\CronJobMiddleware;
+use App\Platform\Operations\Http\Middleware\EnsureNotContainerized;
+use App\Platform\Operations\Installation\Http\Middleware\EnsureInstalled;
+use App\Platform\Operations\Installation\Http\Middleware\RedirectIfInstalled;
+use App\Platform\Operations\Installation\Http\Middleware\UseInstallWizardTokenAuth;
+use App\Platform\Pdf\Http\Middleware\PdfMiddleware;
+use App\Platform\Storage\Http\Middleware\ConfigMiddleware;
 use App\Providers\AppServiceProvider;
-use App\Services\Marketplace\ModuleRuntimeAutoloader;
 use Illuminate\Auth\Middleware\Authorize;
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Configuration\Exceptions;
@@ -88,7 +88,7 @@ return Application::configure(basePath: dirname(__DIR__))
             'customer-guest' => CustomerGuest::class,
             'customer-portal' => CustomerPortalMiddleware::class,
             'guest' => RedirectIfAuthenticated::class,
-            'install' => InstallationMiddleware::class,
+            'install' => EnsureInstalled::class,
             'not-containerized' => EnsureNotContainerized::class,
             'pdf-auth' => PdfMiddleware::class,
             'redirect-if-installed' => RedirectIfInstalled::class,
diff --git a/bootstrap/providers.php b/bootstrap/providers.php
index ce468456..20cd47b1 100644
--- a/bootstrap/providers.php
+++ b/bootstrap/providers.php
@@ -1,11 +1,22 @@
 <?php
 
-use App\Providers\AiServiceProvider;
-use App\Providers\AppConfigProvider;
+use App\Domains\Accounts\AccountsServiceProvider;
+use App\Domains\Catalog\CatalogServiceProvider;
+use App\Domains\Contacts\ContactsServiceProvider;
+use App\Domains\Metadata\MetadataServiceProvider;
+use App\Domains\Money\MoneyServiceProvider;
+use App\Domains\Purchases\PurchasesServiceProvider;
+use App\Domains\Receivables\ReceivablesServiceProvider;
+use App\Domains\Reporting\ReportingServiceProvider;
+use App\Domains\Sales\SalesServiceProvider;
+use App\Domains\Taxation\TaxationServiceProvider;
+use App\Platform\Ai\AiServiceProvider;
+use App\Platform\Mail\MailServiceProvider;
+use App\Platform\Modules\ModuleServiceProvider;
+use App\Platform\Operations\OperationsServiceProvider;
+use App\Platform\Pdf\PdfServiceProvider;
+use App\Platform\Storage\StorageServiceProvider;
 use App\Providers\AppServiceProvider;
-use App\Providers\DriverRegistryProvider;
-use App\Providers\DropboxServiceProvider;
-use App\Providers\PdfServiceProvider;
 use App\Providers\RouteServiceProvider;
 use App\Providers\ScrambleServiceProvider;
 use App\Providers\ViewServiceProvider;
@@ -15,11 +26,22 @@ return [
     HashidsServiceProvider::class,
     AppServiceProvider::class,
     RouteServiceProvider::class,
-    DropboxServiceProvider::class,
+    StorageServiceProvider::class,
     ViewServiceProvider::class,
     PdfServiceProvider::class,
-    DriverRegistryProvider::class,
+    AccountsServiceProvider::class,
+    CatalogServiceProvider::class,
+    ContactsServiceProvider::class,
+    MetadataServiceProvider::class,
+    MoneyServiceProvider::class,
+    PurchasesServiceProvider::class,
+    ReceivablesServiceProvider::class,
+    SalesServiceProvider::class,
+    TaxationServiceProvider::class,
+    ReportingServiceProvider::class,
     AiServiceProvider::class,
-    AppConfigProvider::class,
+    MailServiceProvider::class,
+    OperationsServiceProvider::class,
+    ModuleServiceProvider::class,
     ScrambleServiceProvider::class,
 ];
diff --git a/composer.json b/composer.json
index a8d3c928..561f827b 100644
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,7 @@
             "Database\\Seeders\\": "database/seeders/"
         },
         "files": [
-            "app/Support/helpers.php"
+            "app/Platform/Operations/helpers.php"
         ]
     },
     "autoload-dev": {
diff --git a/config/abilities.php b/config/abilities.php
index bf5c647e..bde82ff4 100644
--- a/config/abilities.php
+++ b/config/abilities.php
@@ -1,16 +1,16 @@
 <?php
 
-use App\Models\Customer;
-use App\Models\CustomField;
-use App\Models\Estimate;
-use App\Models\ExchangeRateProvider;
-use App\Models\Expense;
-use App\Models\Invoice;
-use App\Models\Item;
-use App\Models\Note;
-use App\Models\Payment;
-use App\Models\RecurringInvoice;
-use App\Models\TaxType;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Metadata\Models\Note;
+use App\Domains\Money\Models\ExchangeRateProvider;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\RecurringInvoice;
+use App\Domains\Taxation\Models\TaxType;
 
 return [
 
diff --git a/config/auth.php b/config/auth.php
index 071a43f8..49e3d1b2 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Customer;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
 
 return [
 
diff --git a/config/hashids.php b/config/hashids.php
index 0e661a28..28f45e70 100644
--- a/config/hashids.php
+++ b/config/hashids.php
@@ -6,12 +6,7 @@
  * Wired by App\Support\Hashids\HashidsServiceProvider using the hashids/hashids package.
  */
 
-use App\Models\Company;
-use App\Models\EmailLog;
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\Transaction;
+use App\Support\Hashids\HashidConnection;
 
 return [
 
@@ -40,33 +35,33 @@ return [
     */
 
     'connections' => [
-        Invoice::class => [
-            'salt' => Invoice::class.config('app.key'),
+        HashidConnection::Invoice->value => [
+            'salt' => 'App\\Models\\Invoice'.config('app.key'),
             'length' => 20,
             'alphabet' => 'XKAR7m8jD2bqP9OSVeNGiYL465T10zhfWuc3',
         ],
-        Estimate::class => [
-            'salt' => Estimate::class.config('app.key'),
+        HashidConnection::Estimate->value => [
+            'salt' => 'App\\Models\\Estimate'.config('app.key'),
             'length' => 20,
             'alphabet' => 'yJW2P79M8rCHsVq5zbn1fXl6IUt3dAekGo40',
         ],
-        Payment::class => [
-            'salt' => Payment::class.config('app.key'),
+        HashidConnection::Payment->value => [
+            'salt' => 'App\\Models\\Payment'.config('app.key'),
             'length' => 20,
             'alphabet' => 'aqW3eR2Icf0jp65Gl7UVS1dhyb8Mn9XKTZ4O',
         ],
-        Company::class => [
-            'salt' => Company::class.config('app.key'),
+        HashidConnection::Company->value => [
+            'salt' => 'App\\Models\\Company'.config('app.key'),
             'length' => 20,
             'alphabet' => 's0D7xOFYEqn2uKJm3Pr9g8Cz46A1iHLBTVW5',
         ],
-        EmailLog::class => [
-            'salt' => EmailLog::class.config('app.key'),
+        HashidConnection::EmailLog->value => [
+            'salt' => 'App\\Models\\EmailLog'.config('app.key'),
             'length' => 20,
             'alphabet' => 'BA5tJUVNPe93fCq6DHlY2x4ZO1Kg7i8wSm0R',
         ],
-        Transaction::class => [
-            'salt' => Transaction::class.config('app.key'),
+        HashidConnection::Transaction->value => [
+            'salt' => 'App\\Models\\Transaction'.config('app.key'),
             'length' => 20,
             'alphabet' => 'ADyWE86Cg7jF23vS0bonXrZ5KLH9puIQ4M1T',
         ],
diff --git a/config/invoiceshelf.php b/config/invoiceshelf.php
index 7f0dbfcc..449cedc7 100644
--- a/config/invoiceshelf.php
+++ b/config/invoiceshelf.php
@@ -1,15 +1,15 @@
 <?php
 
-use App\Models\Customer;
-use App\Models\CustomField;
-use App\Models\Estimate;
-use App\Models\ExchangeRateProvider;
-use App\Models\Expense;
-use App\Models\Invoice;
-use App\Models\Item;
-use App\Models\Note;
-use App\Models\Payment;
-use App\Models\TaxType;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Metadata\Models\Note;
+use App\Domains\Money\Models\ExchangeRateProvider;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Taxation\Models\TaxType;
 
 return [
     /*
@@ -44,10 +44,10 @@ return [
     /*
     * Marketplace and updater base URL.
     *
-    * The marketplace client (App\Services\Marketplace\MarketplaceClient) and
-    * updater (App\Support\Update\Updater) both use this value as their HTTP
-    * base URI (the updater via App\Traits\SiteApi::getRemote()). Override via
-    * INVOICESHELF_BASE_URL in .env to point a self-hosted instance or local
+    * The marketplace client (App\Platform\Modules\Marketplace\MarketplaceClient) and
+    * updater (App\Platform\Operations\Update\Updater) both use this value as
+    * their HTTP base URI (the updater via CallsReleaseServer::getRemote()).
+    * Override via INVOICESHELF_BASE_URL in .env to point a self-hosted instance or local
     * dev environment at a non-production marketplace (e.g. a local checkout
     * of the invoiceshelf/website repo).
     */
@@ -600,7 +600,7 @@ return [
     /*
     * Exchange rate drivers and Currency Converter server options used to live here as
     * static arrays. Both have moved into the module Registry — built-in drivers are
-    * registered by App\Providers\DriverRegistryProvider, and custom drivers can be
+    * registered by App\Domains\Money\MoneyServiceProvider, and custom drivers can be
     * registered by modules via Registry::registerExchangeRateDriver(). The driver
     * list is served to the frontend by ConfigController via the same
     * /api/v1/config?key=exchange_rate_drivers endpoint.
diff --git a/config/modules.php b/config/modules.php
index 44e727d1..1364cbf6 100644
--- a/config/modules.php
+++ b/config/modules.php
@@ -1,7 +1,6 @@
 <?php
 
-use App\Console\Commands\UninstallModuleCommand;
-use App\Services\Marketplace\DatabaseActivator;
+use App\Platform\Modules\Runtime\DatabaseActivator;
 use Nwidart\Modules\Activators\FileActivator;
 use Nwidart\Modules\Commands\Actions\ModuleDeleteCommand;
 use Nwidart\Modules\Providers\ConsoleServiceProvider;
@@ -172,9 +171,7 @@ return [
     */
     'commands' => ConsoleServiceProvider::defaultCommands()
         ->reject(fn (string $command): bool => $command === ModuleDeleteCommand::class)
-        ->merge([
-            UninstallModuleCommand::class,
-        ])->toArray(),
+        ->toArray(),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/services.php b/config/services.php
index c64c38b3..bbc20f05 100644
--- a/config/services.php
+++ b/config/services.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 
 return [
 
diff --git a/database/factories/AddressFactory.php b/database/factories/AddressFactory.php
index 9ebdc1c5..f0f14f7a 100644
--- a/database/factories/AddressFactory.php
+++ b/database/factories/AddressFactory.php
@@ -2,9 +2,9 @@
 
 namespace Database\Factories;
 
-use App\Models\Address;
-use App\Models\Customer;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Address;
+use App\Domains\Contacts\Models\Customer;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class AddressFactory extends Factory
diff --git a/database/factories/CompanyFactory.php b/database/factories/CompanyFactory.php
index 22eed9c2..d970ccef 100644
--- a/database/factories/CompanyFactory.php
+++ b/database/factories/CompanyFactory.php
@@ -2,8 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\Company;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class CompanyFactory extends Factory
diff --git a/database/factories/CompanySettingFactory.php b/database/factories/CompanySettingFactory.php
index dcd290f0..c70e7d0e 100644
--- a/database/factories/CompanySettingFactory.php
+++ b/database/factories/CompanySettingFactory.php
@@ -2,8 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\CompanySetting;
-use App\Models\User;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class CompanySettingFactory extends Factory
diff --git a/database/factories/CustomFieldFactory.php b/database/factories/CustomFieldFactory.php
index 42103af2..815df55c 100644
--- a/database/factories/CustomFieldFactory.php
+++ b/database/factories/CustomFieldFactory.php
@@ -2,8 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\CustomField;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Metadata\Models\CustomField;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class CustomFieldFactory extends Factory
diff --git a/database/factories/CustomFieldValueFactory.php b/database/factories/CustomFieldValueFactory.php
index 022a39d3..76216eec 100644
--- a/database/factories/CustomFieldValueFactory.php
+++ b/database/factories/CustomFieldValueFactory.php
@@ -2,9 +2,9 @@
 
 namespace Database\Factories;
 
-use App\Models\CustomField;
-use App\Models\CustomFieldValue;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Metadata\Models\CustomFieldValue;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class CustomFieldValueFactory extends Factory
diff --git a/database/factories/CustomerFactory.php b/database/factories/CustomerFactory.php
index 14448ba3..a9959e98 100644
--- a/database/factories/CustomerFactory.php
+++ b/database/factories/CustomerFactory.php
@@ -2,9 +2,9 @@
 
 namespace Database\Factories;
 
-use App\Models\Currency;
-use App\Models\Customer;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Money\Models\Currency;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\Hash;
 
diff --git a/database/factories/EmailLogFactory.php b/database/factories/EmailLogFactory.php
index 73457224..f51a814c 100644
--- a/database/factories/EmailLogFactory.php
+++ b/database/factories/EmailLogFactory.php
@@ -2,10 +2,10 @@
 
 namespace Database\Factories;
 
-use App\Models\EmailLog;
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Models\Payment;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Mail\Models\EmailLog;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class EmailLogFactory extends Factory
@@ -22,15 +22,15 @@ class EmailLogFactory extends Factory
      */
     public function definition(): array
     {
+        $mailable = $this->faker->randomElement([Invoice::class, Estimate::class, Payment::class]);
+
         return [
             'from' => $this->faker->unique()->safeEmail(),
             'to' => $this->faker->unique()->safeEmail(),
             'subject' => $this->faker->sentence(),
             'body' => $this->faker->text(),
-            'mailable_type' => $this->faker->randomElement([Invoice::class, Estimate::class, Payment::class]),
-            'mailable_id' => function (array $log) {
-                return $log['mailable_type']::factory();
-            },
+            'mailable_type' => (new $mailable)->getMorphClass(),
+            'mailable_id' => $mailable::factory(),
         ];
     }
 }
diff --git a/database/factories/EstimateFactory.php b/database/factories/EstimateFactory.php
index 851c966c..b154c9de 100644
--- a/database/factories/EstimateFactory.php
+++ b/database/factories/EstimateFactory.php
@@ -2,11 +2,11 @@
 
 namespace Database\Factories;
 
-use App\Models\Currency;
-use App\Models\Customer;
-use App\Models\Estimate;
-use App\Models\User;
-use App\Services\Document\SerialNumberService;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Sales\Application\SerialNumberService;
+use App\Domains\Sales\Models\Estimate;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class EstimateFactory extends Factory
diff --git a/database/factories/EstimateItemFactory.php b/database/factories/EstimateItemFactory.php
index 402a328e..53e6cc71 100644
--- a/database/factories/EstimateItemFactory.php
+++ b/database/factories/EstimateItemFactory.php
@@ -2,10 +2,10 @@
 
 namespace Database\Factories;
 
-use App\Models\Estimate;
-use App\Models\EstimateItem;
-use App\Models\Item;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\EstimateItem;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class EstimateItemFactory extends Factory
diff --git a/database/factories/ExchangeRateLogFactory.php b/database/factories/ExchangeRateLogFactory.php
index ccbd87e2..feb33b28 100644
--- a/database/factories/ExchangeRateLogFactory.php
+++ b/database/factories/ExchangeRateLogFactory.php
@@ -2,9 +2,9 @@
 
 namespace Database\Factories;
 
-use App\Models\Currency;
-use App\Models\ExchangeRateLog;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Money\Models\ExchangeRateLog;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ExchangeRateLogFactory extends Factory
diff --git a/database/factories/ExchangeRateProviderFactory.php b/database/factories/ExchangeRateProviderFactory.php
index 3ee19fc8..457786d4 100644
--- a/database/factories/ExchangeRateProviderFactory.php
+++ b/database/factories/ExchangeRateProviderFactory.php
@@ -2,7 +2,7 @@
 
 namespace Database\Factories;
 
-use App\Models\ExchangeRateProvider;
+use App\Domains\Money\Models\ExchangeRateProvider;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ExchangeRateProviderFactory extends Factory
diff --git a/database/factories/ExpenseCategoryFactory.php b/database/factories/ExpenseCategoryFactory.php
index 64dde573..760e1522 100644
--- a/database/factories/ExpenseCategoryFactory.php
+++ b/database/factories/ExpenseCategoryFactory.php
@@ -2,8 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\ExpenseCategory;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Purchases\Models\ExpenseCategory;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ExpenseCategoryFactory extends Factory
diff --git a/database/factories/ExpenseFactory.php b/database/factories/ExpenseFactory.php
index d4c4765d..2ec8be9c 100644
--- a/database/factories/ExpenseFactory.php
+++ b/database/factories/ExpenseFactory.php
@@ -2,11 +2,11 @@
 
 namespace Database\Factories;
 
-use App\Models\Currency;
-use App\Models\Customer;
-use App\Models\Expense;
-use App\Models\ExpenseCategory;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Purchases\Models\ExpenseCategory;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ExpenseFactory extends Factory
diff --git a/database/factories/FileDiskFactory.php b/database/factories/FileDiskFactory.php
index 3bd97bea..10757ec6 100644
--- a/database/factories/FileDiskFactory.php
+++ b/database/factories/FileDiskFactory.php
@@ -2,7 +2,7 @@
 
 namespace Database\Factories;
 
-use App\Models\FileDisk;
+use App\Platform\Storage\Models\FileDisk;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class FileDiskFactory extends Factory
diff --git a/database/factories/InvoiceFactory.php b/database/factories/InvoiceFactory.php
index 02e9ccbd..5c5f2733 100644
--- a/database/factories/InvoiceFactory.php
+++ b/database/factories/InvoiceFactory.php
@@ -2,12 +2,12 @@
 
 namespace Database\Factories;
 
-use App\Models\Currency;
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\RecurringInvoice;
-use App\Models\User;
-use App\Services\Document\SerialNumberService;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Sales\Application\SerialNumberService;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\RecurringInvoice;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class InvoiceFactory extends Factory
diff --git a/database/factories/InvoiceItemFactory.php b/database/factories/InvoiceItemFactory.php
index d0f2d953..aa973899 100644
--- a/database/factories/InvoiceItemFactory.php
+++ b/database/factories/InvoiceItemFactory.php
@@ -2,10 +2,10 @@
 
 namespace Database\Factories;
 
-use App\Models\InvoiceItem;
-use App\Models\Item;
-use App\Models\RecurringInvoice;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Sales\Models\RecurringInvoice;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class InvoiceItemFactory extends Factory
diff --git a/database/factories/ItemFactory.php b/database/factories/ItemFactory.php
index 67b7ad87..2fba8343 100644
--- a/database/factories/ItemFactory.php
+++ b/database/factories/ItemFactory.php
@@ -2,10 +2,10 @@
 
 namespace Database\Factories;
 
-use App\Models\Currency;
-use App\Models\Item;
-use App\Models\Unit;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Catalog\Models\Unit;
+use App\Domains\Money\Models\Currency;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ItemFactory extends Factory
diff --git a/database/factories/NoteFactory.php b/database/factories/NoteFactory.php
index 3637faae..d863a0ae 100644
--- a/database/factories/NoteFactory.php
+++ b/database/factories/NoteFactory.php
@@ -2,8 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\Note;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Metadata\Models\Note;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class NoteFactory extends Factory
diff --git a/database/factories/PaymentAllocationFactory.php b/database/factories/PaymentAllocationFactory.php
index dfe258c2..9cb3d067 100644
--- a/database/factories/PaymentAllocationFactory.php
+++ b/database/factories/PaymentAllocationFactory.php
@@ -2,9 +2,9 @@
 
 namespace Database\Factories;
 
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
@@ -12,6 +12,13 @@ use Illuminate\Database\Eloquent\Factories\Factory;
  */
 class PaymentAllocationFactory extends Factory
 {
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = PaymentAllocation::class;
+
     /**
      * Define the model's default state.
      *
diff --git a/database/factories/PaymentFactory.php b/database/factories/PaymentFactory.php
index c7e8b723..3ef8603b 100644
--- a/database/factories/PaymentFactory.php
+++ b/database/factories/PaymentFactory.php
@@ -2,12 +2,12 @@
 
 namespace Database\Factories;
 
-use App\Models\Currency;
-use App\Models\Customer;
-use App\Models\Payment;
-use App\Models\PaymentMethod;
-use App\Models\User;
-use App\Services\Document\SerialNumberService;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentMethod;
+use App\Domains\Sales\Application\SerialNumberService;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class PaymentFactory extends Factory
diff --git a/database/factories/PaymentMethodFactory.php b/database/factories/PaymentMethodFactory.php
index f1c15631..46c3daef 100644
--- a/database/factories/PaymentMethodFactory.php
+++ b/database/factories/PaymentMethodFactory.php
@@ -2,8 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\PaymentMethod;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Receivables\Models\PaymentMethod;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class PaymentMethodFactory extends Factory
diff --git a/database/factories/RecurringInvoiceFactory.php b/database/factories/RecurringInvoiceFactory.php
index 61e5e40d..fbd1a3bc 100644
--- a/database/factories/RecurringInvoiceFactory.php
+++ b/database/factories/RecurringInvoiceFactory.php
@@ -2,9 +2,9 @@
 
 namespace Database\Factories;
 
-use App\Models\Customer;
-use App\Models\RecurringInvoice;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\RecurringInvoice;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class RecurringInvoiceFactory extends Factory
diff --git a/database/factories/TaxFactory.php b/database/factories/TaxFactory.php
index f93cb3a0..19165a37 100644
--- a/database/factories/TaxFactory.php
+++ b/database/factories/TaxFactory.php
@@ -2,10 +2,10 @@
 
 namespace Database\Factories;
 
-use App\Models\Currency;
-use App\Models\Tax;
-use App\Models\TaxType;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Taxation\Models\Tax;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class TaxFactory extends Factory
diff --git a/database/factories/TaxTypeFactory.php b/database/factories/TaxTypeFactory.php
index 004eaf12..86aee36b 100644
--- a/database/factories/TaxTypeFactory.php
+++ b/database/factories/TaxTypeFactory.php
@@ -2,8 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\TaxType;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class TaxTypeFactory extends Factory
diff --git a/database/factories/UnitFactory.php b/database/factories/UnitFactory.php
index f3be3466..62cfa122 100644
--- a/database/factories/UnitFactory.php
+++ b/database/factories/UnitFactory.php
@@ -2,8 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\Unit;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Models\Unit;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class UnitFactory extends Factory
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 92156f00..ff104e1a 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -2,8 +2,8 @@
 
 namespace Database\Factories;
 
-use App\Models\Currency;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Money\Models\Currency;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Facades\Hash;
 
diff --git a/database/migrations/2020_12_02_064933_update_crater_version_320.php b/database/migrations/2020_12_02_064933_update_crater_version_320.php
index 02a0ad53..80736667 100644
--- a/database/migrations/2020_12_02_064933_update_crater_version_320.php
+++ b/database/migrations/2020_12_02_064933_update_crater_version_320.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2020_12_02_090527_update_crater_version_400.php b/database/migrations/2020_12_02_090527_update_crater_version_400.php
index 1c8610e6..dfba5b15 100644
--- a/database/migrations/2020_12_02_090527_update_crater_version_400.php
+++ b/database/migrations/2020_12_02_090527_update_crater_version_400.php
@@ -1,15 +1,15 @@
 <?php
 
-use App\Models\Address;
-use App\Models\CompanySetting;
-use App\Models\Estimate;
-use App\Models\Expense;
-use App\Models\FileDisk;
-use App\Models\Invoice;
-use App\Models\Item;
-use App\Models\Payment;
-use App\Models\Setting;
-use App\Models\User;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Contacts\Models\Address;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Operations\Models\Setting;
+use App\Platform\Storage\Models\FileDisk;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2020_12_08_133131_update_crater_version_401.php b/database/migrations/2020_12_08_133131_update_crater_version_401.php
index cbdac711..9c0fc503 100644
--- a/database/migrations/2020_12_08_133131_update_crater_version_401.php
+++ b/database/migrations/2020_12_08_133131_update_crater_version_401.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2020_12_14_051450_remove_template_id_from_invoices_and_estimates_table.php b/database/migrations/2020_12_14_051450_remove_template_id_from_invoices_and_estimates_table.php
index e7c20f45..4af2b28c 100644
--- a/database/migrations/2020_12_14_051450_remove_template_id_from_invoices_and_estimates_table.php
+++ b/database/migrations/2020_12_14_051450_remove_template_id_from_invoices_and_estimates_table.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Estimate;
-use App\Models\Invoice;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2020_12_23_061302_update_crater_version_402.php b/database/migrations/2020_12_23_061302_update_crater_version_402.php
index f73ab9f0..2ccb7d4c 100644
--- a/database/migrations/2020_12_23_061302_update_crater_version_402.php
+++ b/database/migrations/2020_12_23_061302_update_crater_version_402.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2020_12_31_100816_update_crater_version_403.php b/database/migrations/2020_12_31_100816_update_crater_version_403.php
index 7ee4ad79..880066f6 100644
--- a/database/migrations/2020_12_31_100816_update_crater_version_403.php
+++ b/database/migrations/2020_12_31_100816_update_crater_version_403.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_01_22_085644_update_crater_version_404.php b/database/migrations/2021_01_22_085644_update_crater_version_404.php
index 65c91f2b..e6caa6b9 100644
--- a/database/migrations/2021_01_22_085644_update_crater_version_404.php
+++ b/database/migrations/2021_01_22_085644_update_crater_version_404.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_03_23_145012_add_number_length_setting.php b/database/migrations/2021_03_23_145012_add_number_length_setting.php
index cf630e30..8d175d64 100644
--- a/database/migrations/2021_03_23_145012_add_number_length_setting.php
+++ b/database/migrations/2021_03_23_145012_add_number_length_setting.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\CompanySetting;
-use App\Models\User;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_05_05_063533_update_crater_version_410.php b/database/migrations/2021_05_05_063533_update_crater_version_410.php
index 8ee8764e..4d6a55e3 100644
--- a/database/migrations/2021_05_05_063533_update_crater_version_410.php
+++ b/database/migrations/2021_05_05_063533_update_crater_version_410.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_06_19_121939_update_crater_version_420.php b/database/migrations/2021_06_19_121939_update_crater_version_420.php
index 17e38640..ea1b6aa6 100644
--- a/database/migrations/2021_06_19_121939_update_crater_version_420.php
+++ b/database/migrations/2021_06_19_121939_update_crater_version_420.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_06_30_062411_update_customer_id_in_all_tables.php b/database/migrations/2021_06_30_062411_update_customer_id_in_all_tables.php
index b54a8cf5..86c84438 100644
--- a/database/migrations/2021_06_30_062411_update_customer_id_in_all_tables.php
+++ b/database/migrations/2021_06_30_062411_update_customer_id_in_all_tables.php
@@ -1,14 +1,14 @@
 <?php
 
-use App\Models\Address;
-use App\Models\Customer;
-use App\Models\CustomField;
-use App\Models\CustomFieldValue;
-use App\Models\Estimate;
-use App\Models\Expense;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Address;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Metadata\Models\CustomFieldValue;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_07_05_100256_change_relationship_of_company.php b/database/migrations/2021_07_05_100256_change_relationship_of_company.php
index 7de24069..68c40431 100644
--- a/database/migrations/2021_07_05_100256_change_relationship_of_company.php
+++ b/database/migrations/2021_07_05_100256_change_relationship_of_company.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_07_06_070204_add_owner_id_to_companies_table.php b/database/migrations/2021_07_06_070204_add_owner_id_to_companies_table.php
index b639ff4d..0db74cb1 100644
--- a/database/migrations/2021_07_06_070204_add_owner_id_to_companies_table.php
+++ b/database/migrations/2021_07_06_070204_add_owner_id_to_companies_table.php
@@ -1,7 +1,8 @@
 <?php
 
-use App\Models\Company;
-use App\Models\User;
+use App\Domains\Accounts\Application\CompanyService;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -30,7 +31,7 @@ return new class extends Migration
                 $company->slug = Str::slug($company->name);
                 $company->save();
 
-                $company->setupRoles();
+                app(CompanyService::class)->setupRoles($company);
                 $user->assign('super admin');
 
                 $users = User::where('role', 'admin')->get();
diff --git a/database/migrations/2021_07_08_110940_add_company_to_notes_table.php b/database/migrations/2021_07_08_110940_add_company_to_notes_table.php
index 1844a72c..b99247d2 100644
--- a/database/migrations/2021_07_08_110940_add_company_to_notes_table.php
+++ b/database/migrations/2021_07_08_110940_add_company_to_notes_table.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Note;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Metadata\Models\Note;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_08_16_091413_add_tax_per_item_into_items_table.php b/database/migrations/2021_08_16_091413_add_tax_per_item_into_items_table.php
index 90e3215e..ce74510c 100644
--- a/database/migrations/2021_08_16_091413_add_tax_per_item_into_items_table.php
+++ b/database/migrations/2021_08_16_091413_add_tax_per_item_into_items_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Item;
+use App\Domains\Catalog\Models\Item;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_09_28_130822_add_sequence_column.php b/database/migrations/2021_09_28_130822_add_sequence_column.php
index fe702b5b..75a44af1 100644
--- a/database/migrations/2021_09_28_130822_add_sequence_column.php
+++ b/database/migrations/2021_09_28_130822_add_sequence_column.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Customer;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_11_13_114808_calculate_base_values_for_existing_data.php b/database/migrations/2021_11_13_114808_calculate_base_values_for_existing_data.php
index acaf68fa..60061b60 100644
--- a/database/migrations/2021_11_13_114808_calculate_base_values_for_existing_data.php
+++ b/database/migrations/2021_11_13_114808_calculate_base_values_for_existing_data.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Models\CompanySetting;
-use App\Models\Customer;
-use App\Models\Item;
-use App\Models\User;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Contacts\Models\Customer;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_11_23_092111_add_new_company_settings.php b/database/migrations/2021_11_23_092111_add_new_company_settings.php
index 775d1a16..f6e00074 100644
--- a/database/migrations/2021_11_23_092111_add_new_company_settings.php
+++ b/database/migrations/2021_11_23_092111_add_new_company_settings.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Company;
-use App\Models\CompanySetting;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_11_23_093811_update_crater_version_500.php b/database/migrations/2021_11_23_093811_update_crater_version_500.php
index 31eb8214..5ae98025 100644
--- a/database/migrations/2021_11_23_093811_update_crater_version_500.php
+++ b/database/migrations/2021_11_23_093811_update_crater_version_500.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_12_01_120956_update_crater_version_501.php b/database/migrations/2021_12_01_120956_update_crater_version_501.php
index ba31ec0e..224764a5 100644
--- a/database/migrations/2021_12_01_120956_update_crater_version_501.php
+++ b/database/migrations/2021_12_01_120956_update_crater_version_501.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_12_02_063005_calculate_base_due_amount.php b/database/migrations/2021_12_02_063005_calculate_base_due_amount.php
index c956fec6..60499f8d 100644
--- a/database/migrations/2021_12_02_063005_calculate_base_due_amount.php
+++ b/database/migrations/2021_12_02_063005_calculate_base_due_amount.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Invoice;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_12_02_123007_update_crater_version_502.php b/database/migrations/2021_12_02_123007_update_crater_version_502.php
index f62017e1..ea63d630 100644
--- a/database/migrations/2021_12_02_123007_update_crater_version_502.php
+++ b/database/migrations/2021_12_02_123007_update_crater_version_502.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_12_03_154423_update_crater_version_503.php b/database/migrations/2021_12_03_154423_update_crater_version_503.php
index fa7799a6..0f3dc313 100644
--- a/database/migrations/2021_12_03_154423_update_crater_version_503.php
+++ b/database/migrations/2021_12_03_154423_update_crater_version_503.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_12_04_123415_add_type_to_payment_methods_table.php b/database/migrations/2021_12_04_123415_add_type_to_payment_methods_table.php
index 587b9daa..f7d70c39 100644
--- a/database/migrations/2021_12_04_123415_add_type_to_payment_methods_table.php
+++ b/database/migrations/2021_12_04_123415_add_type_to_payment_methods_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\PaymentMethod;
+use App\Domains\Receivables\Models\PaymentMethod;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_12_06_131201_update_crater_version_504.php b/database/migrations/2021_12_06_131201_update_crater_version_504.php
index 2609ed46..0ae0f1f7 100644
--- a/database/migrations/2021_12_06_131201_update_crater_version_504.php
+++ b/database/migrations/2021_12_06_131201_update_crater_version_504.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_12_09_054033_calculate_base_values_for_expenses.php b/database/migrations/2021_12_09_054033_calculate_base_values_for_expenses.php
index e755f4f9..1f4ca736 100644
--- a/database/migrations/2021_12_09_054033_calculate_base_values_for_expenses.php
+++ b/database/migrations/2021_12_09_054033_calculate_base_values_for_expenses.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\CompanySetting;
-use App\Models\Expense;
-use App\Models\User;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Purchases\Models\Expense;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_12_09_062434_update_crater_version_505.php b/database/migrations/2021_12_09_062434_update_crater_version_505.php
index 7391ce75..da9183e6 100644
--- a/database/migrations/2021_12_09_062434_update_crater_version_505.php
+++ b/database/migrations/2021_12_09_062434_update_crater_version_505.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_12_10_121739_update_creater_version_506.php b/database/migrations/2021_12_10_121739_update_creater_version_506.php
index 5a70461f..c3f81217 100644
--- a/database/migrations/2021_12_10_121739_update_creater_version_506.php
+++ b/database/migrations/2021_12_10_121739_update_creater_version_506.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_12_13_055813_calculate_base_amount_of_payments_table.php b/database/migrations/2021_12_13_055813_calculate_base_amount_of_payments_table.php
index 3695debd..dc91f708 100644
--- a/database/migrations/2021_12_13_055813_calculate_base_amount_of_payments_table.php
+++ b/database/migrations/2021_12_13_055813_calculate_base_amount_of_payments_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Payment;
+use App\Domains\Receivables\Models\Payment;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2021_12_13_093701_add_fields_to_email_logs_table.php b/database/migrations/2021_12_13_093701_add_fields_to_email_logs_table.php
index 3a053d87..598067ff 100644
--- a/database/migrations/2021_12_13_093701_add_fields_to_email_logs_table.php
+++ b/database/migrations/2021_12_13_093701_add_fields_to_email_logs_table.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_12_21_102521_change_enable_portal_field_of_customers_table.php b/database/migrations/2021_12_21_102521_change_enable_portal_field_of_customers_table.php
index 2343c4b0..bc6d4130 100644
--- a/database/migrations/2021_12_21_102521_change_enable_portal_field_of_customers_table.php
+++ b/database/migrations/2021_12_21_102521_change_enable_portal_field_of_customers_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Customer;
+use App\Domains\Contacts\Models\Customer;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2021_12_31_042453_add_type_to_tax_types_table.php b/database/migrations/2021_12_31_042453_add_type_to_tax_types_table.php
index aedcd531..84a90397 100644
--- a/database/migrations/2021_12_31_042453_add_type_to_tax_types_table.php
+++ b/database/migrations/2021_12_31_042453_add_type_to_tax_types_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\TaxType;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2022_01_05_115423_update_crater_version_600.php b/database/migrations/2022_01_05_115423_update_crater_version_600.php
index e00ad047..ba88a00d 100644
--- a/database/migrations/2022_01_05_115423_update_crater_version_600.php
+++ b/database/migrations/2022_01_05_115423_update_crater_version_600.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2022_01_06_103536_add_slug_to_companies.php b/database/migrations/2022_01_06_103536_add_slug_to_companies.php
index 0046aada..ee882854 100644
--- a/database/migrations/2022_01_06_103536_add_slug_to_companies.php
+++ b/database/migrations/2022_01_06_103536_add_slug_to_companies.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Company;
+use App\Domains\Accounts\Models\Company;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Str;
 
diff --git a/database/migrations/2022_01_12_132859_update_crater_version_601.php b/database/migrations/2022_01_12_132859_update_crater_version_601.php
index 1682eb46..88f14ace 100644
--- a/database/migrations/2022_01_12_132859_update_crater_version_601.php
+++ b/database/migrations/2022_01_12_132859_update_crater_version_601.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2022_01_13_123829_update_crater_version_602.php b/database/migrations/2022_01_13_123829_update_crater_version_602.php
index 07f61ec7..7b58bc8b 100644
--- a/database/migrations/2022_01_13_123829_update_crater_version_602.php
+++ b/database/migrations/2022_01_13_123829_update_crater_version_602.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2022_02_15_113648_update_crater_version_603.php b/database/migrations/2022_02_15_113648_update_crater_version_603.php
index 60d89a57..ae1ba860 100644
--- a/database/migrations/2022_02_15_113648_update_crater_version_603.php
+++ b/database/migrations/2022_02_15_113648_update_crater_version_603.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2022_02_17_081723_update_crater_version_604.php b/database/migrations/2022_02_17_081723_update_crater_version_604.php
index 33ce927b..0b3b5b90 100644
--- a/database/migrations/2022_02_17_081723_update_crater_version_604.php
+++ b/database/migrations/2022_02_17_081723_update_crater_version_604.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2022_03_03_060121_crater_version_605.php b/database/migrations/2022_03_03_060121_crater_version_605.php
index 7796cb51..fcc24f73 100644
--- a/database/migrations/2022_03_03_060121_crater_version_605.php
+++ b/database/migrations/2022_03_03_060121_crater_version_605.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2022_03_03_063237_change_over_due_status_to_sent.php b/database/migrations/2022_03_03_063237_change_over_due_status_to_sent.php
index 18c6e4d1..81fc1539 100644
--- a/database/migrations/2022_03_03_063237_change_over_due_status_to_sent.php
+++ b/database/migrations/2022_03_03_063237_change_over_due_status_to_sent.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Invoice;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2022_03_04_051438_calculate_base_values_for_invoice_items.php b/database/migrations/2022_03_04_051438_calculate_base_values_for_invoice_items.php
index 9e8c7eb6..cdd63744 100644
--- a/database/migrations/2022_03_04_051438_calculate_base_values_for_invoice_items.php
+++ b/database/migrations/2022_03_04_051438_calculate_base_values_for_invoice_items.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\InvoiceItem;
-use App\Models\Tax;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Taxation\Models\Tax;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2022_03_06_070829_update_crater_version_606.php b/database/migrations/2022_03_06_070829_update_crater_version_606.php
index 59ec5f15..1d32d618 100644
--- a/database/migrations/2022_03_06_070829_update_crater_version_606.php
+++ b/database/migrations/2022_03_06_070829_update_crater_version_606.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2024_02_04_005632_update_version_100.php b/database/migrations/2024_02_04_005632_update_version_100.php
index db039810..eb7a3f87 100644
--- a/database/migrations/2024_02_04_005632_update_version_100.php
+++ b/database/migrations/2024_02_04_005632_update_version_100.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2024_02_11_075831_update_version_110.php b/database/migrations/2024_02_11_075831_update_version_110.php
index 88fee94b..46f15b51 100644
--- a/database/migrations/2024_02_11_075831_update_version_110.php
+++ b/database/migrations/2024_02_11_075831_update_version_110.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\DB;
 
diff --git a/database/migrations/2024_05_04_110000_update_version_121.php b/database/migrations/2024_05_04_110000_update_version_121.php
index 5aa01caa..df5aa71d 100644
--- a/database/migrations/2024_05_04_110000_update_version_121.php
+++ b/database/migrations/2024_05_04_110000_update_version_121.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2024_05_04_110000_update_version_122.php b/database/migrations/2024_05_04_110000_update_version_122.php
index d59c20bf..fdbce973 100644
--- a/database/migrations/2024_05_04_110000_update_version_122.php
+++ b/database/migrations/2024_05_04_110000_update_version_122.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2024_07_12_235756_update_version_130.php b/database/migrations/2024_07_12_235756_update_version_130.php
index 7571cda3..55a8927c 100644
--- a/database/migrations/2024_07_12_235756_update_version_130.php
+++ b/database/migrations/2024_07_12_235756_update_version_130.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2025_08_18_101343_add_new_currencies_to_currencies_table.php b/database/migrations/2025_08_18_101343_add_new_currencies_to_currencies_table.php
index f3936f3b..fe3d9426 100644
--- a/database/migrations/2025_08_18_101343_add_new_currencies_to_currencies_table.php
+++ b/database/migrations/2025_08_18_101343_add_new_currencies_to_currencies_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Currency;
+use App\Domains\Money\Models\Currency;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2025_09_017_add_qar_currency_to_currencies_table.php b/database/migrations/2025_09_017_add_qar_currency_to_currencies_table.php
index a8d92838..c48f2437 100644
--- a/database/migrations/2025_09_017_add_qar_currency_to_currencies_table.php
+++ b/database/migrations/2025_09_017_add_qar_currency_to_currencies_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Currency;
+use App\Domains\Money\Models\Currency;
 use Illuminate\Database\Migrations\Migration;
 
 return new class extends Migration
diff --git a/database/migrations/2026_04_03_203140_rename_company_scoped_super_admin_to_owner.php b/database/migrations/2026_04_03_203140_rename_company_scoped_super_admin_to_owner.php
index 666aafc5..61105c26 100644
--- a/database/migrations/2026_04_03_203140_rename_company_scoped_super_admin_to_owner.php
+++ b/database/migrations/2026_04_03_203140_rename_company_scoped_super_admin_to_owner.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Company;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Silber\Bouncer\BouncerFacade;
 use Silber\Bouncer\Database\Role;
diff --git a/database/migrations/2026_07_29_120000_move_gotenberg_papersize_to_shared_page_setup.php b/database/migrations/2026_07_29_120000_move_gotenberg_papersize_to_shared_page_setup.php
index 78b71f65..2a7bb3fd 100644
--- a/database/migrations/2026_07_29_120000_move_gotenberg_papersize_to_shared_page_setup.php
+++ b/database/migrations/2026_07_29_120000_move_gotenberg_papersize_to_shared_page_setup.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Database\Migrations\Migration;
 
 /**
diff --git a/database/migrations/2026_08_02_120000_add_credit_note_support.php b/database/migrations/2026_08_02_120000_add_credit_note_support.php
index 1b4bf481..86569d6a 100644
--- a/database/migrations/2026_08_02_120000_add_credit_note_support.php
+++ b/database/migrations/2026_08_02_120000_add_credit_note_support.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Company;
-use App\Models\CompanySetting;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
diff --git a/database/migrations/2026_08_05_120000_stabilize_model_type_aliases.php b/database/migrations/2026_08_05_120000_stabilize_model_type_aliases.php
new file mode 100644
index 00000000..720301f2
--- /dev/null
+++ b/database/migrations/2026_08_05_120000_stabilize_model_type_aliases.php
@@ -0,0 +1,133 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Silber\Bouncer\Database\Ability;
+use Silber\Bouncer\Database\Role;
+
+return new class extends Migration
+{
+    /**
+     * Every database column that stores an Eloquent morph identity.
+     *
+     * @var array<string, list<string>>
+     */
+    public const COLUMNS = [
+        'media' => ['model_type'],
+        'email_logs' => ['mailable_type'],
+        'notifications' => ['notifiable_type'],
+        'personal_access_tokens' => ['tokenable_type'],
+        'custom_field_values' => ['custom_field_valuable_type'],
+        'abilities' => ['entity_type'],
+        'assigned_roles' => ['entity_type', 'restricted_to_type'],
+        'permissions' => ['entity_type'],
+    ];
+
+    /**
+     * Stable alias => legacy model basename.
+     *
+     * @var array<string, string>
+     */
+    public const FIRST_PARTY_ALIASES = [
+        'address' => 'Address',
+        'ai_conversation' => 'AiConversation',
+        'ai_message' => 'AiMessage',
+        'company' => 'Company',
+        'company_invitation' => 'CompanyInvitation',
+        'company_setting' => 'CompanySetting',
+        'country' => 'Country',
+        'currency' => 'Currency',
+        'custom_field' => 'CustomField',
+        'custom_field_value' => 'CustomFieldValue',
+        'customer' => 'Customer',
+        'email_log' => 'EmailLog',
+        'estimate' => 'Estimate',
+        'estimate_item' => 'EstimateItem',
+        'exchange_rate_log' => 'ExchangeRateLog',
+        'exchange_rate_provider' => 'ExchangeRateProvider',
+        'expense' => 'Expense',
+        'expense_category' => 'ExpenseCategory',
+        'file_disk' => 'FileDisk',
+        'impersonation_log' => 'ImpersonationLog',
+        'invoice' => 'Invoice',
+        'invoice_item' => 'InvoiceItem',
+        'item' => 'Item',
+        'marketplace_credential' => 'MarketplaceCredential',
+        'marketplace_operation' => 'MarketplaceOperation',
+        'module' => 'Module',
+        'note' => 'Note',
+        'payment' => 'Payment',
+        'payment_allocation' => 'PaymentAllocation',
+        'payment_method' => 'PaymentMethod',
+        'recurring_invoice' => 'RecurringInvoice',
+        'setting' => 'Setting',
+        'tax' => 'Tax',
+        'tax_type' => 'TaxType',
+        'transaction' => 'Transaction',
+        'unit' => 'Unit',
+        'user' => 'User',
+        'user_setting' => 'UserSetting',
+    ];
+
+    /** @var array<string, array{legacy: string, types: list<string>}> */
+    public const VENDOR_ALIASES = [
+        'bouncer_ability' => [
+            'legacy' => 'abilities',
+            'types' => ['abilities', Ability::class],
+        ],
+        'bouncer_role' => [
+            'legacy' => 'roles',
+            'types' => ['roles', Role::class],
+        ],
+    ];
+
+    public function up(): void
+    {
+        $this->replaceTypes(true);
+    }
+
+    public function down(): void
+    {
+        $this->replaceTypes(false);
+    }
+
+    private function replaceTypes(bool $up): void
+    {
+        foreach (self::COLUMNS as $table => $columns) {
+            if (! Schema::hasTable($table)) {
+                continue;
+            }
+
+            foreach ($columns as $column) {
+                if (! Schema::hasColumn($table, $column)) {
+                    continue;
+                }
+
+                foreach (self::FIRST_PARTY_ALIASES as $alias => $basename) {
+                    $legacyTypes = $up
+                        ? [
+                            $alias,
+                            'App\\Models\\'.$basename,
+                            'App\\'.$basename,
+                            'InvoiceShelf\\Models\\'.$basename,
+                            'InvoiceShelf\\'.$basename,
+                            'Crater\\Models\\'.$basename,
+                            'Crater\\'.$basename,
+                        ]
+                        : [$alias];
+
+                    DB::table($table)
+                        ->whereIn($column, $legacyTypes)
+                        ->update([$column => $up ? $alias : 'App\\Models\\'.$basename]);
+                }
+
+                foreach (self::VENDOR_ALIASES as $alias => $mapping) {
+                    DB::table($table)
+                        ->whereIn($column, $up ? [$alias, ...$mapping['types']] : [$alias])
+                        ->update([$column => $up ? $alias : $mapping['legacy']]);
+                }
+            }
+        }
+    }
+};
diff --git a/database/seeders/CurrenciesTableSeeder.php b/database/seeders/CurrenciesTableSeeder.php
index 29bb658f..e4476c66 100644
--- a/database/seeders/CurrenciesTableSeeder.php
+++ b/database/seeders/CurrenciesTableSeeder.php
@@ -2,7 +2,7 @@
 
 namespace Database\Seeders;
 
-use App\Models\Currency;
+use App\Domains\Money\Models\Currency;
 use Illuminate\Database\Seeder;
 
 class CurrenciesTableSeeder extends Seeder
diff --git a/database/seeders/DemoSeeder.php b/database/seeders/DemoSeeder.php
index dba53a1b..d1634df9 100644
--- a/database/seeders/DemoSeeder.php
+++ b/database/seeders/DemoSeeder.php
@@ -2,15 +2,16 @@
 
 namespace Database\Seeders;
 
+use App\Domains\Accounts\Application\CompanyService;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Country;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Money\Models\Currency;
 use App\Facades\Hashids;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Country;
-use App\Models\Currency;
-use App\Models\Customer;
-use App\Models\Setting;
-use App\Models\User;
-use App\Services\Company\CompanyService;
+use App\Platform\Operations\Models\Setting;
+use App\Support\Hashids\HashidConnection;
 use Illuminate\Database\Seeder;
 use Silber\Bouncer\BouncerFacade;
 
@@ -38,7 +39,7 @@ class DemoSeeder extends Seeder
             'tax_id' => '84-1234567',
         ]);
 
-        $company->unique_hash = Hashids::connection(Company::class)->encode($company->id);
+        $company->unique_hash = Hashids::connection(HashidConnection::Company->value)->encode($company->id);
         $company->save();
         app(CompanyService::class)->setupDefaults($company);
 
diff --git a/database/seeders/RealisticDemoSeeder.php b/database/seeders/RealisticDemoSeeder.php
index fc793663..94ba0401 100644
--- a/database/seeders/RealisticDemoSeeder.php
+++ b/database/seeders/RealisticDemoSeeder.php
@@ -2,34 +2,35 @@
 
 namespace Database\Seeders;
 
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Catalog\Models\Unit;
+use App\Domains\Contacts\Models\Address;
+use App\Domains\Contacts\Models\Country;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Metadata\Models\Note;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Purchases\Models\ExpenseCategory;
+use App\Domains\Receivables\Application\PaymentAllocationService;
+use App\Domains\Receivables\Jobs\GeneratePaymentPdfJob;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Receivables\Models\PaymentMethod;
+use App\Domains\Sales\Application\SerialNumberService;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\EstimateItem;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Sales\Models\RecurringInvoice;
+use App\Domains\Taxation\Models\Tax;
+use App\Domains\Taxation\Models\TaxType;
 use App\Facades\Hashids;
-use App\Jobs\GeneratePaymentPdfJob;
-use App\Models\Address;
-use App\Models\AiConversation;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Country;
-use App\Models\Currency;
-use App\Models\Customer;
-use App\Models\CustomField;
-use App\Models\Estimate;
-use App\Models\EstimateItem;
-use App\Models\Expense;
-use App\Models\ExpenseCategory;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\Item;
-use App\Models\Note;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
-use App\Models\PaymentMethod;
-use App\Models\RecurringInvoice;
-use App\Models\Tax;
-use App\Models\TaxType;
-use App\Models\Unit;
-use App\Models\User;
-use App\Services\Document\PaymentAllocationService;
-use App\Services\Document\SerialNumberService;
+use App\Platform\Ai\Models\AiConversation;
+use App\Support\Hashids\HashidConnection;
 use Carbon\Carbon;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\Artisan;
@@ -522,7 +523,7 @@ class RealisticDemoSeeder extends Seeder
 
         $invoice->sequence_number = $serial->nextSequenceNumber;
         $invoice->customer_sequence_number = $serial->nextCustomerSequenceNumber;
-        $invoice->unique_hash = Hashids::connection(Invoice::class)->encode($invoice->id);
+        $invoice->unique_hash = Hashids::connection(HashidConnection::Invoice->value)->encode($invoice->id);
         $invoice->created_at = $invoiceDate;
         $invoice->updated_at = $invoiceDate;
         $invoice->save();
@@ -599,7 +600,7 @@ class RealisticDemoSeeder extends Seeder
 
         $payment->sequence_number = $serial->nextSequenceNumber;
         $payment->customer_sequence_number = $serial->nextCustomerSequenceNumber;
-        $payment->unique_hash = Hashids::connection(Payment::class)->encode($payment->id);
+        $payment->unique_hash = Hashids::connection(HashidConnection::Payment->value)->encode($payment->id);
         $payment->created_at = $paymentDate;
         $payment->updated_at = $paymentDate;
         Payment::withoutEvents(fn () => $payment->save());
@@ -699,7 +700,7 @@ class RealisticDemoSeeder extends Seeder
 
         $estimate->sequence_number = $serial->nextSequenceNumber;
         $estimate->customer_sequence_number = $serial->nextCustomerSequenceNumber;
-        $estimate->unique_hash = Hashids::connection(Estimate::class)->encode($estimate->id);
+        $estimate->unique_hash = Hashids::connection(HashidConnection::Estimate->value)->encode($estimate->id);
         $estimate->created_at = $estimateDate;
         $estimate->updated_at = $estimateDate;
         $estimate->save();
diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php
index f414459e..c828778b 100644
--- a/database/seeders/UsersTableSeeder.php
+++ b/database/seeders/UsersTableSeeder.php
@@ -2,12 +2,13 @@
 
 namespace Database\Seeders;
 
+use App\Domains\Accounts\Application\CompanyService;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
 use App\Facades\Hashids;
-use App\Models\Company;
-use App\Models\Setting;
-use App\Models\User;
-use App\Services\Company\CompanyService;
-use App\Support\Setup\InstallUtils;
+use App\Platform\Operations\Installation\Application\InstallationState;
+use App\Platform\Operations\Models\Setting;
+use App\Support\Hashids\HashidConnection;
 use Illuminate\Database\Seeder;
 use Silber\Bouncer\BouncerFacade;
 
@@ -31,7 +32,7 @@ class UsersTableSeeder extends Seeder
             'slug' => 'xyz',
         ]);
 
-        $company->unique_hash = Hashids::connection(Company::class)->encode($company->id);
+        $company->unique_hash = Hashids::connection(HashidConnection::Company->value)->encode($company->id);
         $company->save();
         app(CompanyService::class)->setupDefaults($company);
         $user->companies()->attach($company->id);
@@ -41,6 +42,6 @@ class UsersTableSeeder extends Seeder
 
         Setting::setSetting('profile_complete', 0);
         // Set version.
-        InstallUtils::setCurrentVersion();
+        InstallationState::setCurrentVersion();
     }
 }
diff --git a/docs/architecture/0001-modular-monolith.md b/docs/architecture/0001-modular-monolith.md
new file mode 100644
index 00000000..e55d2140
--- /dev/null
+++ b/docs/architecture/0001-modular-monolith.md
@@ -0,0 +1,63 @@
+# ADR 0001: Laravel-native modular monolith
+
+Date: 2026-08-05
+
+Status: Accepted
+
+## Context
+
+InvoiceShelf 3.x is still in alpha and may break PHP namespaces and internal
+extension contracts. Existing installations must retain their database data,
+document links, and public `/api/v1` behavior. The current layer-first layout
+mixes sales, receivables, purchases, reporting, and infrastructure in global
+model, controller, and service directories.
+
+## Decision
+
+The backend is organized as a modular monolith under `app/Domains` and
+`app/Platform`.
+
+Business contexts are Accounts, Contacts, Catalog, Taxation, Money, Metadata,
+Sales, Receivables, Purchases, and Reporting. Platform capabilities are
+Modules, AI, Mail, PDF, Storage, and Operations.
+
+Each context owns its models, actions, queries, policies, events, jobs, and HTTP
+adapters. Large contexts may contain feature subdirectories. Every context is
+registered explicitly through a service provider; root route files are
+composition roots for context-owned route fragments.
+
+Direct Eloquent relationships across contexts are permitted for read
+navigation when declared by the architecture dependency map. Cross-context
+writes and workflows use contracts and application actions. Reporting may
+query shared tables through read-only query objects. Infrastructure is reached
+through platform contracts. No repository abstraction is required around
+Eloquent by default.
+
+All first-party models use stable morph aliases. Model namespaces, Hashids
+connection names, and public API discriminators are separate identities. The
+database stores aliases, Hashids retain their historical salt inputs, and v1
+resources retain their existing discriminator strings.
+
+Modules depend on the versioned `invoiceshelf/modules` SDK and must not import
+domain internals.
+
+## Migration rules
+
+- Contexts move in independently green pull requests.
+- A moved class has one canonical namespace; class aliases are forbidden.
+- Temporary adapters may connect migrated and unmigrated contexts, but must be
+  deleted when the counterpart context moves.
+- Existing table and column names remain unchanged and moved models declare
+  their table explicitly.
+- HTTP methods, paths, middleware, payloads, status codes, and OpenAPI schemas
+  remain stable.
+- Queue workers are drained and restarted for the namespace cutover; serialized
+  legacy jobs are not supported.
+
+## Consequences
+
+Feature ownership and cross-domain writes become explicit, while Eloquent
+remains usable without a framework-independent persistence layer. Namespace
+changes require coordinated imports across application code, factories,
+seeders, configuration, tests, and historical migrations, but no persisted
+record depends on those namespaces after the alias migration.
diff --git a/resources/scripts/features/admin/components/settings/pdfPageSetup.ts b/resources/scripts/features/admin/components/settings/pdfPageSetup.ts
index 21fed0d7..b338bdf6 100644
--- a/resources/scripts/features/admin/components/settings/pdfPageSetup.ts
+++ b/resources/scripts/features/admin/components/settings/pdfPageSetup.ts
@@ -16,7 +16,7 @@ export const PAGE_SETUP_KEYS = [
   'pdf_margin_left',
 ] as const
 
-/** Mirrors App\Rules\CssLength, so a bad value is caught before the round trip. */
+/** Mirrors App\Platform\Pdf\Rules\CssLength, so a bad value is caught before the round trip. */
 const CSS_LENGTH = /^(0|\d+(\.\d+)?(pt|px|pc|mm|cm|in))$/
 
 export function cssLength(t: (key: string) => string) {
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index 1de8b02b..c4823f67 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -18,7 +18,7 @@
 
     <!-- Module Styles -->
     @foreach(\InvoiceShelf\Modules\Registry::allStyles() as $name => $path)
-        @php($version = \App\Support\Module\ModuleAssetVersion::forPath($path))
+        @php($version = \App\Platform\Modules\Runtime\ModuleAssetVersion::forPath($path))
         <link rel="stylesheet" href="/modules/styles/{{ $name }}@if($version)?v={{ $version }}@endif">
     @endforeach
 
@@ -43,7 +43,7 @@
         @if (\Illuminate\Support\Str::startsWith($path, ['http://', 'https://']))
             <script type="module" src="{!! $path !!}"></script>
         @else
-            @php($version = \App\Support\Module\ModuleAssetVersion::forPath($path))
+            @php($version = \App\Platform\Modules\Runtime\ModuleAssetVersion::forPath($path))
             <script type="module" src="/modules/scripts/{{ $name }}@if($version)?v={{ $version }}@endif"></script>
         @endif
     @endforeach
diff --git a/resources/views/app/pdf/estimate/estimate1.blade.php b/resources/views/app/pdf/estimate/estimate1.blade.php
index 83a545d3..647a49db 100644
--- a/resources/views/app/pdf/estimate/estimate1.blade.php
+++ b/resources/views/app/pdf/estimate/estimate1.blade.php
@@ -420,7 +420,7 @@
             <tr>
                 <td class="text-center">
                     @if ($logo)
-                        <img class="header-logo" style="height:50px" src="{{ \App\Support\Pdf\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
+                        <img class="header-logo" style="height:50px" src="{{ \App\Platform\Pdf\Rendering\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
                     @else
                         @if ($estimate->customer->company)
                             <h2 class="header-logo"> {{ $estimate->customer->company->name }} </h2>
diff --git a/resources/views/app/pdf/estimate/estimate2.blade.php b/resources/views/app/pdf/estimate/estimate2.blade.php
index 1f5074e0..cd22250b 100644
--- a/resources/views/app/pdf/estimate/estimate2.blade.php
+++ b/resources/views/app/pdf/estimate/estimate2.blade.php
@@ -439,7 +439,7 @@
             <tr>
                 @if ($logo)
                     <td width="60%" class="header-section-left">
-                        <img class="header-logo" style="height:50px" src="{{ \App\Support\Pdf\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
+                        <img class="header-logo" style="height:50px" src="{{ \App\Platform\Pdf\Rendering\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
                     </td>
                 @else
                     <td width="60%" class="header-section-left" style="padding-top: 0px;">
diff --git a/resources/views/app/pdf/estimate/estimate3.blade.php b/resources/views/app/pdf/estimate/estimate3.blade.php
index eea2b580..d34fefb1 100644
--- a/resources/views/app/pdf/estimate/estimate3.blade.php
+++ b/resources/views/app/pdf/estimate/estimate3.blade.php
@@ -381,7 +381,7 @@
             <tr>
                 <td width="50%" class="header-section-left">
                     @if ($logo)
-                        <img class="header-logo" style="height:50px" src="{{ \App\Support\Pdf\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
+                        <img class="header-logo" style="height:50px" src="{{ \App\Platform\Pdf\Rendering\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
                     @else
                         <h1 class="header-logo"> {{ $estimate->customer->company->name }} </h1>
                     @endif
diff --git a/resources/views/app/pdf/invoice/invoice1.blade.php b/resources/views/app/pdf/invoice/invoice1.blade.php
index 2c7a84fd..0b959e4b 100644
--- a/resources/views/app/pdf/invoice/invoice1.blade.php
+++ b/resources/views/app/pdf/invoice/invoice1.blade.php
@@ -363,7 +363,7 @@
             <tr>
                 <td class="text-center">
                     @if ($logo)
-                        <img class="header-logo" style="height:50px" src="{{ \App\Support\Pdf\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
+                        <img class="header-logo" style="height:50px" src="{{ \App\Platform\Pdf\Rendering\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
                     @else
                         @if ($invoice->customer->company)
                             <h2 class="header-logo"> {{ $invoice->customer->company->name }}</h2>
diff --git a/resources/views/app/pdf/invoice/invoice2.blade.php b/resources/views/app/pdf/invoice/invoice2.blade.php
index a526ef6c..2fa038f9 100644
--- a/resources/views/app/pdf/invoice/invoice2.blade.php
+++ b/resources/views/app/pdf/invoice/invoice2.blade.php
@@ -408,7 +408,7 @@
             <tr>
                 <td width="60%" class="header-section-left">
                     @if ($logo)
-                        <img class="header-logo" style="height:50px" src="{{ \App\Support\Pdf\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
+                        <img class="header-logo" style="height:50px" src="{{ \App\Platform\Pdf\Rendering\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
                     @elseif ($invoice->customer->company)
                         <h1 class="header-logo" style="padding-top: 0px;">
                             {{ $invoice->customer->company->name }}
diff --git a/resources/views/app/pdf/invoice/invoice3.blade.php b/resources/views/app/pdf/invoice/invoice3.blade.php
index 884aa9ad..35ec7b25 100644
--- a/resources/views/app/pdf/invoice/invoice3.blade.php
+++ b/resources/views/app/pdf/invoice/invoice3.blade.php
@@ -341,7 +341,7 @@
             <tr>
                 <td width="50%" class="header-section-left">
                     @if ($logo)
-                        <img class="header-logo" style="height:50px" src="{{ \App\Support\Pdf\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
+                        <img class="header-logo" style="height:50px" src="{{ \App\Platform\Pdf\Rendering\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
                     @else
                         <h1 class="header-logo"> {{ $invoice->customer->company->name }} </h1>
                     @endif
diff --git a/resources/views/app/pdf/partials/credit-note-banner.blade.php b/resources/views/app/pdf/partials/credit-note-banner.blade.php
index d9e47a45..430b2c3f 100644
--- a/resources/views/app/pdf/partials/credit-note-banner.blade.php
+++ b/resources/views/app/pdf/partials/credit-note-banner.blade.php
@@ -11,7 +11,7 @@
     Every style is inline: a body-included partial cannot add rules to <head>,
     and inline styles are the one thing dompdf and Chromium honour identically.
 --}}
-@if (isset($invoice) && $invoice instanceof \App\Models\Invoice)
+@if (isset($invoice) && $invoice instanceof \App\Domains\Sales\Models\Invoice)
     @php
         $bannerRelatedInvoice = $invoice->relationLoaded('relatedInvoice') ? $invoice->getRelation('relatedInvoice') : null;
         $bannerCreditNotes = $invoice->relationLoaded('creditNotes') ? $invoice->getRelation('creditNotes') : null;
diff --git a/resources/views/app/pdf/partials/fonts.blade.php b/resources/views/app/pdf/partials/fonts.blade.php
index 7fd7d2b6..fbd7100c 100644
--- a/resources/views/app/pdf/partials/fonts.blade.php
+++ b/resources/views/app/pdf/partials/fonts.blade.php
@@ -2,9 +2,9 @@
      FontService::getInstalledFontFaces(). Bundled packages live under
      resources/static/fonts/, on-demand packages under storage/fonts/. --}}
 <style type="text/css">
-    {!! implode("\n", app(\App\Services\FontService::class)->getInstalledFontFaces()) !!}
+    {!! implode("\n", app(\App\Platform\Pdf\Application\FontService::class)->getInstalledFontFaces()) !!}
 
     body {
-        font-family: {!! app(\App\Services\FontService::class)->getFontFamilyChain() !!};
+        font-family: {!! app(\App\Platform\Pdf\Application\FontService::class)->getFontFamilyChain() !!};
     }
 </style>
diff --git a/resources/views/app/pdf/payment/payment.blade.php b/resources/views/app/pdf/payment/payment.blade.php
index 529b9cb4..4860b8b3 100644
--- a/resources/views/app/pdf/payment/payment.blade.php
+++ b/resources/views/app/pdf/payment/payment.blade.php
@@ -294,7 +294,7 @@
             <tr>
                 @if ($logo)
                     <td width="50%" class="header-section-left">
-                        <img style="height:50px" class="header-logo" src="{{ \App\Support\Pdf\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
+                        <img style="height:50px" class="header-logo" src="{{ \App\Platform\Pdf\Rendering\ImageUtils::toBase64Src($logo) }}" alt="Company Logo">
                     @else
                         @if ($payment->customer)
                     <td class="header-section-left" style="padding-top:0px;">
diff --git a/resources/views/app/pdf/reports/customer-statement.blade.php b/resources/views/app/pdf/reports/customer-statement.blade.php
index b039eb7a..0e504535 100644
--- a/resources/views/app/pdf/reports/customer-statement.blade.php
+++ b/resources/views/app/pdf/reports/customer-statement.blade.php
@@ -10,7 +10,7 @@
         <tr>
             <td>
                 @if (! empty($logo))
-                    <img class="report-logo" style="height:40px" src="{{ \App\Support\Pdf\ImageUtils::toBase64Src($logo) }}" alt="{{ $company->name }}">
+                    <img class="report-logo" style="height:40px" src="{{ \App\Platform\Pdf\Rendering\ImageUtils::toBase64Src($logo) }}" alt="{{ $company->name }}">
                 @else
                     <p class="report-company-name">{{ $company->name }}</p>
                 @endif
diff --git a/resources/views/app/pdf/reports/partials/layout.blade.php b/resources/views/app/pdf/reports/partials/layout.blade.php
index 05a25c1b..2b9906d2 100644
--- a/resources/views/app/pdf/reports/partials/layout.blade.php
+++ b/resources/views/app/pdf/reports/partials/layout.blade.php
@@ -28,7 +28,7 @@
         <tr>
             <td>
                 @if (! empty($logo))
-                    <img class="report-logo" style="height:40px" src="{{ \App\Support\Pdf\ImageUtils::toBase64Src($logo) }}" alt="{{ $company->name }}">
+                    <img class="report-logo" style="height:40px" src="{{ \App\Platform\Pdf\Rendering\ImageUtils::toBase64Src($logo) }}" alt="{{ $company->name }}">
                 @else
                     <p class="report-company-name">{{ $company->name }}</p>
                 @endif
diff --git a/routes/api.php b/routes/api.php
index d3ca5cc9..3f739d90 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,89 +1,5 @@
 <?php
 
-use App\Http\Controllers\Admin\AdminDashboardController;
-use App\Http\Controllers\Admin\BackupsController;
-use App\Http\Controllers\Admin\CompaniesController;
-use App\Http\Controllers\Admin\CountriesController;
-use App\Http\Controllers\Admin\CurrenciesController;
-use App\Http\Controllers\Admin\FontController;
-use App\Http\Controllers\Admin\Modules\MarketplacePairingController;
-use App\Http\Controllers\Admin\Modules\ModuleInstallationController;
-use App\Http\Controllers\Admin\Modules\ModulesController;
-use App\Http\Controllers\Admin\Settings\AiConfigurationController;
-use App\Http\Controllers\Admin\Settings\DiskController;
-use App\Http\Controllers\Admin\Settings\MailConfigurationController;
-use App\Http\Controllers\Admin\Settings\PDFConfigurationController;
-use App\Http\Controllers\Admin\Settings\SettingsController;
-use App\Http\Controllers\Admin\UpdateController;
-use App\Http\Controllers\Admin\UsersController;
-use App\Http\Controllers\AppVersionController;
-use App\Http\Controllers\Company\Ai\ChatController as AiChatController;
-use App\Http\Controllers\Company\Ai\ConversationController as AiConversationController;
-use App\Http\Controllers\Company\Ai\GenerationController as AiGenerationController;
-use App\Http\Controllers\Company\Auth\AuthController;
-use App\Http\Controllers\Company\Auth\ForgotPasswordController;
-use App\Http\Controllers\Company\Auth\InvitationRegistrationController;
-use App\Http\Controllers\Company\Auth\ResetPasswordController;
-use App\Http\Controllers\Company\Customer\CustomersController;
-use App\Http\Controllers\Company\Customer\CustomerStatementController;
-use App\Http\Controllers\Company\Customer\CustomerStatsController;
-use App\Http\Controllers\Company\Customer\SendCustomerStatementController;
-use App\Http\Controllers\Company\CustomField\CustomFieldsController;
-use App\Http\Controllers\Company\Dashboard\DashboardController;
-use App\Http\Controllers\Company\Estimate\EstimatesController;
-use App\Http\Controllers\Company\Estimate\EstimateTemplatesController;
-use App\Http\Controllers\Company\ExchangeRate\ExchangeRateProviderController;
-use App\Http\Controllers\Company\Expense\ExpenseCategoriesController;
-use App\Http\Controllers\Company\Expense\ExpensesController;
-use App\Http\Controllers\Company\General\BootstrapController;
-use App\Http\Controllers\Company\General\ConfigController;
-use App\Http\Controllers\Company\General\FormatsController;
-use App\Http\Controllers\Company\General\InvitationResponseController;
-use App\Http\Controllers\Company\General\NotesController;
-use App\Http\Controllers\Company\General\SearchController;
-use App\Http\Controllers\Company\General\SerialNumberController;
-use App\Http\Controllers\Company\Invoice\InvoicesController;
-use App\Http\Controllers\Company\Invoice\InvoiceTemplatesController;
-use App\Http\Controllers\Company\Item\ItemsController;
-use App\Http\Controllers\Company\Item\UnitsController;
-use App\Http\Controllers\Company\Members\MembersController;
-use App\Http\Controllers\Company\Modules\CompanyModulesController;
-use App\Http\Controllers\Company\Modules\ModuleSettingsController;
-use App\Http\Controllers\Company\Payment\CreditAllocationsController;
-use App\Http\Controllers\Company\Payment\PaymentMethodsController;
-use App\Http\Controllers\Company\Payment\PaymentsController;
-use App\Http\Controllers\Company\RecurringInvoice\RecurringInvoiceController;
-use App\Http\Controllers\Company\RecurringInvoice\RecurringInvoiceFrequencyController;
-use App\Http\Controllers\Company\Role\AbilitiesController;
-use App\Http\Controllers\Company\Role\RolesController;
-use App\Http\Controllers\Company\Settings\CompanyAiConfigurationController;
-use App\Http\Controllers\Company\Settings\CompanyController;
-use App\Http\Controllers\Company\Settings\CompanyMailConfigurationController;
-use App\Http\Controllers\Company\Settings\CompanySettingsController;
-use App\Http\Controllers\Company\Settings\InvitationController;
-use App\Http\Controllers\Company\Settings\TaxTypesController;
-use App\Http\Controllers\Company\Settings\UserProfileController;
-use App\Http\Controllers\CustomerPortal\Auth\ForgotPasswordController as AuthForgotPasswordController;
-use App\Http\Controllers\CustomerPortal\Auth\ResetPasswordController as AuthResetPasswordController;
-use App\Http\Controllers\CustomerPortal\Estimate\AcceptEstimateController as CustomerAcceptEstimateController;
-use App\Http\Controllers\CustomerPortal\Estimate\EstimatesController as CustomerEstimatesController;
-use App\Http\Controllers\CustomerPortal\Expense\ExpensesController as CustomerExpensesController;
-use App\Http\Controllers\CustomerPortal\General\BootstrapController as CustomerBootstrapController;
-use App\Http\Controllers\CustomerPortal\General\DashboardController as CustomerDashboardController;
-use App\Http\Controllers\CustomerPortal\General\ProfileController as CustomerProfileController;
-use App\Http\Controllers\CustomerPortal\Invoice\InvoicesController as CustomerInvoicesController;
-use App\Http\Controllers\CustomerPortal\Payment\PaymentMethodController;
-use App\Http\Controllers\CustomerPortal\Payment\PaymentsController as CustomerPaymentsController;
-use App\Http\Controllers\Setup\AiConfigurationController as InstallerAiConfigurationController;
-use App\Http\Controllers\Setup\AppDomainController;
-use App\Http\Controllers\Setup\DatabaseConfigurationController;
-use App\Http\Controllers\Setup\FilePermissionsController;
-use App\Http\Controllers\Setup\FinishController;
-use App\Http\Controllers\Setup\LanguagesController;
-use App\Http\Controllers\Setup\LoginController;
-use App\Http\Controllers\Setup\OnboardingWizardController;
-use App\Http\Controllers\Setup\RequirementsController;
-use App\Http\Controllers\Webhook\CronJobController;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -113,374 +29,104 @@ Route::prefix('/v1')->group(function () {
     // App version
     // ----------------------------------
 
-    Route::get('/app/version', AppVersionController::class);
+    require app_path('Platform/Operations/routes/version.php');
 
     // Authentication & Password Reset
     // ----------------------------------
 
-    Route::prefix('auth')->group(function () {
-        Route::post('login', [AuthController::class, 'login']);
-
-        Route::post('logout', [AuthController::class, 'logout'])->middleware('auth:sanctum');
-
-        // Send reset password mail
-        Route::post('password/email', [ForgotPasswordController::class, 'sendResetLinkEmail'])->middleware('throttle:10,2');
-
-        // handle reset password form process
-        Route::post('reset/password', [ResetPasswordController::class, 'reset']);
-    });
-
-    // Invitation Registration (public)
-    // ----------------------------------
-
-    Route::get('/invitations/{token}/details', [InvitationRegistrationController::class, 'details']);
-    Route::post('/auth/register-with-invitation', [InvitationRegistrationController::class, 'register']);
+    require app_path('Domains/Accounts/routes/public.php');
 
     // Countries
     // ----------------------------------
 
-    Route::get('/countries', CountriesController::class);
+    require app_path('Domains/Contacts/routes/public.php');
 
     // Onboarding
     // ----------------------------------
 
     Route::middleware(['redirect-if-installed'])->prefix('installation')->group(function () {
-        Route::get('/wizard-step', [OnboardingWizardController::class, 'getStep']);
-
-        Route::post('/wizard-step', [OnboardingWizardController::class, 'updateStep']);
-
-        Route::post('/wizard-language', [OnboardingWizardController::class, 'saveLanguage']);
-
-        Route::get('/languages', [LanguagesController::class, 'languages']);
-
-        Route::get('/requirements', [RequirementsController::class, 'requirements']);
-
-        Route::get('/permissions', [FilePermissionsController::class, 'permissions']);
-
-        Route::post('/database/config', [DatabaseConfigurationController::class, 'saveDatabaseEnvironment']);
-
-        Route::get('/database/config', [DatabaseConfigurationController::class, 'getDatabaseEnvironment']);
-
-        Route::put('/set-domain', AppDomainController::class);
-
-        Route::get('/ai/config', [InstallerAiConfigurationController::class, 'show']);
-        Route::post('/ai/config', [InstallerAiConfigurationController::class, 'save']);
-
-        Route::post('/login', LoginController::class);
-
-        Route::post('/finish', FinishController::class);
+        require app_path('Platform/Operations/Installation/routes/api.php');
+        require app_path('Platform/Ai/routes/installer.php');
     });
 
     // Super Admin
     // ----------------------------------
 
     Route::middleware(['auth:sanctum', 'super-admin'])->prefix('super-admin')->group(function () {
-        Route::get('dashboard', [AdminDashboardController::class, 'index']);
-        Route::get('companies', [CompaniesController::class, 'index']);
-        Route::get('companies/{company}', [CompaniesController::class, 'show']);
-        Route::put('companies/{company}', [CompaniesController::class, 'update']);
-
-        Route::get('users', [UsersController::class, 'index']);
-        Route::get('users/{user}', [UsersController::class, 'show']);
-        Route::put('users/{user}', [UsersController::class, 'update']);
-        Route::post('users/{user}/impersonate', [UsersController::class, 'impersonate']);
+        require app_path('Platform/Operations/routes/admin.php');
+        require app_path('Domains/Accounts/routes/admin.php');
     });
 
     // Stop impersonation - uses auth:sanctum only (the impersonated user's token, not super-admin)
     Route::middleware(['auth:sanctum'])->prefix('super-admin')->group(function () {
-        Route::post('stop-impersonating', [UsersController::class, 'stopImpersonating']);
+        require app_path('Domains/Accounts/routes/impersonation.php');
     });
 
     Route::middleware(['auth:sanctum', 'company'])->group(function () {
         Route::middleware(['bouncer'])->group(function () {
-
-            // Bootstrap
-            // ----------------------------------
-
-            Route::get('/bootstrap', BootstrapController::class);
-
-            // Invitations (user-scoped — respond to invitations)
-            // ----------------------------------
-
-            Route::get('/invitations/pending', [InvitationResponseController::class, 'pending']);
-            Route::post('/invitations/{invitation:token}/accept', [InvitationResponseController::class, 'accept']);
-            Route::post('/invitations/{invitation:token}/decline', [InvitationResponseController::class, 'decline']);
+            require app_path('Domains/Accounts/routes/company.php');
+            require app_path('Platform/Operations/routes/company.php');
 
             // Currencies
             // ----------------------------------
 
-            Route::prefix('/currencies')->group(function () {
-                Route::get('/used', [ExchangeRateProviderController::class, 'usedCurrenciesWithoutRate']);
+            require app_path('Domains/Money/routes/company.php');
 
-                Route::post('/bulk-update-exchange-rate', [ExchangeRateProviderController::class, 'bulkUpdate']);
-            });
-
-            // Dashboard
+            // Reporting and customers
             // ----------------------------------
 
-            Route::get('/dashboard', DashboardController::class);
-
-            // Auth check
-            // ----------------------------------
-
-            Route::get('/auth/check', [AuthController::class, 'check']);
-
-            // Search users
-            // ----------------------------------
-
-            Route::get('/search', SearchController::class);
-
-            Route::get('/search/user', [SearchController::class, 'users']);
-
-            // MISC
-            // ----------------------------------
-
-            Route::get('/config', ConfigController::class);
-
-            Route::get('/currencies', CurrenciesController::class);
-
-            Route::get('/timezones', [FormatsController::class, 'timezones']);
-
-            Route::get('/date/formats', [FormatsController::class, 'dateFormats']);
-
-            Route::get('/time/formats', [FormatsController::class, 'timeFormats']);
-
-            Route::get('/next-number', [SerialNumberController::class, 'nextNumber']);
-
-            Route::get('/number-placeholders', [SerialNumberController::class, 'placeholders']);
-
-            Route::get('/current-company', [BootstrapController::class, 'currentCompany']);
-
-            // Company Invitations (company-scoped — send invitations)
-            // ----------------------------------
-
-            Route::apiResource('company-invitations', InvitationController::class)->only(['index', 'store', 'destroy']);
-
-            // Customers
-            // ----------------------------------
-
-            Route::post('/customers/delete', [CustomersController::class, 'delete']);
-
-            Route::get('customers/{customer}/stats', CustomerStatsController::class);
-
-            Route::get('customers/{customer}/statement', CustomerStatementController::class);
-            Route::post('customers/{customer}/statement/send', SendCustomerStatementController::class);
-            Route::post('customers/{customer}/credit-allocations', [CreditAllocationsController::class, 'store']);
-
-            Route::resource('customers', CustomersController::class);
+            require app_path('Domains/Reporting/routes/company.php');
+            require app_path('Domains/Contacts/routes/company.php');
 
             // Items
             // ----------------------------------
 
-            Route::post('/items/delete', [ItemsController::class, 'delete']);
+            require app_path('Domains/Catalog/routes/company.php');
 
-            Route::resource('items', ItemsController::class);
-
-            Route::resource('units', UnitsController::class);
-
-            // Invoices
+            // Sales documents
             // -------------------------------------------------
 
-            Route::get('/invoices/{invoice}/send/preview', [InvoicesController::class, 'sendPreview']);
-
-            Route::post('/invoices/{invoice}/send', [InvoicesController::class, 'send']);
-
-            Route::post('/invoices/{invoice}/clone', [InvoicesController::class, 'clone']);
-
-            Route::post('/invoices/{invoice}/convert-to-estimate', [InvoicesController::class, 'convertToEstimate']);
-
-            Route::post('/invoices/{invoice}/credit-note', [InvoicesController::class, 'createCreditNote']);
-
-            Route::post('/invoices/{invoice}/status', [InvoicesController::class, 'changeStatus']);
-
-            Route::post('/invoices/delete', [InvoicesController::class, 'delete']);
-
-            Route::get('/invoices/templates', InvoiceTemplatesController::class);
-
-            Route::apiResource('invoices', InvoicesController::class);
-
-            // Recurring Invoice
-            // -------------------------------------------------
-
-            Route::get('/recurring-invoice-frequency', RecurringInvoiceFrequencyController::class);
-
-            Route::post('/recurring-invoices/delete', [RecurringInvoiceController::class, 'delete']);
-
-            Route::apiResource('recurring-invoices', RecurringInvoiceController::class);
-
-            // Estimates
-            // -------------------------------------------------
-
-            Route::get('/estimates/{estimate}/send/preview', [EstimatesController::class, 'sendPreview']);
-
-            Route::post('/estimates/{estimate}/send', [EstimatesController::class, 'send']);
-
-            Route::post('/estimates/{estimate}/clone', [EstimatesController::class, 'clone']);
-
-            Route::post('/estimates/{estimate}/status', [EstimatesController::class, 'changeStatus']);
-
-            Route::post('/estimates/{estimate}/convert-to-invoice', [EstimatesController::class, 'convertToInvoice']);
-
-            Route::get('/estimates/templates', EstimateTemplatesController::class);
-
-            Route::post('/estimates/delete', [EstimatesController::class, 'delete']);
-
-            Route::apiResource('estimates', EstimatesController::class);
+            require app_path('Domains/Sales/routes/company.php');
 
             // Expenses
             // ----------------------------------
 
-            Route::get('/expenses/{expense}/show/receipt', [ExpensesController::class, 'showReceipt']);
-
-            Route::post('/expenses/{expense}/upload/receipts', [ExpensesController::class, 'uploadReceipt']);
-
-            Route::post('/expenses/delete', [ExpensesController::class, 'delete']);
-
-            Route::apiResource('expenses', ExpensesController::class);
-
-            Route::apiResource('categories', ExpenseCategoriesController::class);
+            require app_path('Domains/Purchases/routes/company.php');
 
             // Payments
             // ----------------------------------
 
-            Route::get('/payments/{payment}/send/preview', [PaymentsController::class, 'sendPreview']);
-
-            Route::post('/payments/{payment}/send', [PaymentsController::class, 'send']);
-
-            Route::put('/payments/{payment}/allocations', [PaymentsController::class, 'replaceAllocations']);
-
-            Route::post('/payments/delete', [PaymentsController::class, 'delete']);
-
-            Route::apiResource('payments', PaymentsController::class);
-
-            Route::apiResource('payment-methods', PaymentMethodsController::class);
+            require app_path('Domains/Receivables/routes/company.php');
 
             // Custom fields
             // ----------------------------------
 
-            Route::resource('custom-fields', CustomFieldsController::class);
+            require app_path('Domains/Metadata/routes/company.php');
 
             // Backup & Disk
             // ----------------------------------
 
-            Route::apiResource('backups', BackupsController::class);
+            require app_path('Platform/Storage/routes/company.php');
 
-            Route::apiResource('/disks', DiskController::class);
-
-            Route::get('download-backup', [BackupsController::class, 'download']);
-
-            Route::get('/disk/drivers', [DiskController::class, 'getDiskDrivers']);
-            Route::get('/disk/purposes', [DiskController::class, 'getDiskPurposes']);
-            Route::put('/disk/purposes', [DiskController::class, 'updateDiskPurposes']);
-
-            // Fonts
+            // PDF rendering and fonts
             // ----------------------------------
 
-            Route::get('/fonts/status', [FontController::class, 'status']);
-            Route::post('/fonts/{package}/install', [FontController::class, 'install']);
+            require app_path('Platform/Pdf/routes/admin.php');
 
-            // Exchange Rate
-            // ----------------------------------
-
-            Route::get('/currencies/{currency}/exchange-rate', [ExchangeRateProviderController::class, 'getRate']);
-
-            Route::get('/currencies/{currency}/active-provider', [ExchangeRateProviderController::class, 'activeProvider']);
-
-            Route::get('/used-currencies', [ExchangeRateProviderController::class, 'usedCurrencies']);
-
-            Route::get('/supported-currencies', [ExchangeRateProviderController::class, 'supportedCurrencies']);
-
-            Route::apiResource('exchange-rate-providers', ExchangeRateProviderController::class);
-
-            // Settings
-            // ----------------------------------
-
-            Route::get('/me', [UserProfileController::class, 'show']);
-
-            Route::put('/me', [UserProfileController::class, 'update']);
-
-            Route::get('/me/settings', [UserProfileController::class, 'showSettings']);
-
-            Route::put('/me/settings', [UserProfileController::class, 'updateSettings']);
-
-            Route::post('/me/upload-avatar', [UserProfileController::class, 'uploadAvatar']);
-
-            Route::put('/company', [CompanyController::class, 'updateCompany']);
-
-            Route::post('/company/upload-logo', [CompanyController::class, 'uploadCompanyLogo']);
-
-            Route::get('/company/settings', [CompanySettingsController::class, 'show']);
-
-            Route::post('/company/settings', [CompanySettingsController::class, 'update']);
-
-            Route::get('/settings', [SettingsController::class, 'show']);
-
-            Route::post('/settings', [SettingsController::class, 'update']);
-
-            Route::get('/company/has-transactions', [CompanySettingsController::class, 'checkTransactions']);
+            require app_path('Platform/Operations/routes/settings.php');
 
             // Mails
             // ----------------------------------
 
-            Route::get('/mail/drivers', [MailConfigurationController::class, 'getMailDrivers']);
+            require app_path('Platform/Mail/routes/company.php');
 
-            Route::get('/mail/config', [MailConfigurationController::class, 'getMailEnvironment']);
-
-            Route::post('/mail/config', [MailConfigurationController::class, 'saveMailEnvironment']);
-
-            Route::post('/mail/test', [MailConfigurationController::class, 'testEmailConfig']);
-
-            Route::get('/company/mail/config', [CompanyMailConfigurationController::class, 'getDefaultConfig']);
-
-            Route::get('/company/mail/company-config', [CompanyMailConfigurationController::class, 'getMailConfig']);
-            Route::post('/company/mail/company-config', [CompanyMailConfigurationController::class, 'saveMailConfig']);
-            Route::post('/company/mail/company-test', [CompanyMailConfigurationController::class, 'testMailConfig']);
-
-            // AI Configuration
-            // ----------------------------------
-
-            Route::get('/ai/drivers', [AiConfigurationController::class, 'getDrivers']);
-            Route::get('/ai/config', [AiConfigurationController::class, 'getConfig']);
-            Route::post('/ai/config', [AiConfigurationController::class, 'saveConfig']);
-            Route::post('/ai/test', [AiConfigurationController::class, 'testConnection']);
-
-            Route::get('/company/ai/config', [CompanyAiConfigurationController::class, 'getConfig']);
-            Route::post('/company/ai/config', [CompanyAiConfigurationController::class, 'saveConfig']);
-            Route::post('/company/ai/test', [CompanyAiConfigurationController::class, 'testConnection']);
-
-            // AI Chat + text generation — rate-limited via the 'ai' limiter defined in RouteServiceProvider
-            Route::middleware('throttle:ai')->group(function () {
-                Route::post('/ai/chat', AiChatController::class);
-                Route::get('/ai/conversations', [AiConversationController::class, 'index']);
-                Route::get('/ai/conversations/{id}', [AiConversationController::class, 'show']);
-                Route::patch('/ai/conversations/{id}', [AiConversationController::class, 'update']);
-                Route::delete('/ai/conversations/{id}', [AiConversationController::class, 'destroy']);
-
-                Route::post('/ai/generate', AiGenerationController::class);
-            });
-
-            // PDF Generation
-            // ----------------------------------
-
-            Route::get('/pdf/drivers', [PDFConfigurationController::class, 'getDrivers']);
-
-            Route::get('/pdf/config', [PDFConfigurationController::class, 'getEnvironment']);
-
-            Route::post('/pdf/config', [PDFConfigurationController::class, 'saveEnvironment']);
-
-            Route::apiResource('notes', NotesController::class);
+            require app_path('Platform/Ai/routes/company.php');
 
             // Tax Types
             // ----------------------------------
 
-            Route::apiResource('tax-types', TaxTypesController::class);
+            require app_path('Domains/Taxation/routes/company.php');
 
-            // Roles
-            // ----------------------------------
-
-            Route::get('abilities', AbilitiesController::class);
-
-            Route::apiResource('roles', RolesController::class);
         });
 
         // Self Update
@@ -488,59 +134,10 @@ Route::prefix('/v1')->group(function () {
         // Disabled inside the official Docker image — containers upgrade via
         // `docker compose pull`, not the in-app updater (see EnsureNotContainerized).
 
-        Route::middleware('not-containerized')->group(function () {
-            Route::get('/check/update', [UpdateController::class, 'checkVersion']);
-            Route::post('/update/download', [UpdateController::class, 'download']);
-            Route::post('/update/unzip', [UpdateController::class, 'unzip']);
-            Route::post('/update/copy', [UpdateController::class, 'copy']);
-            Route::post('/update/delete', [UpdateController::class, 'delete']);
-            Route::post('/update/clean', [UpdateController::class, 'clean']);
-            Route::post('/update/migrate', [UpdateController::class, 'migrate']);
-            Route::post('/update/finish', [UpdateController::class, 'finish']);
-        });
+        require app_path('Platform/Operations/routes/updater.php');
 
-        // Companies
-        // -------------------------------------------------
+        require app_path('Domains/Accounts/routes/management.php');
 
-        Route::post('companies', [CompaniesController::class, 'store']);
-
-        Route::post('/transfer/ownership/{user}', [CompanySettingsController::class, 'transferOwnership']);
-
-        Route::post('companies/delete', [CompaniesController::class, 'destroy']);
-
-        Route::get('companies', [CompaniesController::class, 'userCompanies']);
-
-        // Users
-        // ----------------------------------
-
-        Route::post('/members/delete', [MembersController::class, 'delete']);
-
-        Route::apiResource('/members', MembersController::class);
-
-        // Modules
-        // ----------------------------------
-
-        Route::prefix('/modules')->group(function () {
-            Route::get('/', [ModulesController::class, 'index']);
-            Route::get('/pairing', [MarketplacePairingController::class, 'status']);
-            Route::post('/pairing/start', [MarketplacePairingController::class, 'start']);
-            Route::post('/pairing/poll', [MarketplacePairingController::class, 'poll']);
-            Route::delete('/pairing', [MarketplacePairingController::class, 'disconnect']);
-            Route::get('/{module}', [ModulesController::class, 'show']);
-            Route::post('/{module}/enable', [ModulesController::class, 'enable']);
-            Route::post('/{module}/disable', [ModulesController::class, 'disable']);
-            Route::post('/{module}/uninstall', [ModuleInstallationController::class, 'uninstall']);
-
-            Route::post('/install', [ModuleInstallationController::class, 'install']);
-
-            // Per-slug settings (schema-driven, per-company storage)
-            Route::get('/{slug}/settings', [ModuleSettingsController::class, 'show']);
-            Route::put('/{slug}/settings', [ModuleSettingsController::class, 'update']);
-        });
-
-        // Company-context Active Modules index (read-only, lists every
-        // instance-activated module with a has_settings flag)
-        Route::get('/company-modules', [CompanyModulesController::class, 'index']);
     });
 
     Route::prefix('/{company:slug}/customer')->group(function () {
@@ -548,50 +145,22 @@ Route::prefix('/v1')->group(function () {
         // Authentication & Password Reset
         // ----------------------------------
 
-        Route::prefix('auth')->group(function () {
-
-            // Send reset password mail
-            Route::post('password/email', [AuthForgotPasswordController::class, 'sendResetLinkEmail']);
-
-            // handle reset password form process
-            Route::post('reset/password', [AuthResetPasswordController::class, 'reset'])->name('customer.password.reset');
-        });
+        require app_path('Domains/Contacts/routes/customer-public.php');
 
         // Invoices, Estimates, Payments and Expenses endpoints
         // -------------------------------------------------------
 
         Route::middleware(['auth:customer', 'customer-portal'])->group(function () {
-            Route::get('/bootstrap', CustomerBootstrapController::class);
+            require app_path('Domains/Contacts/routes/customer.php');
 
-            Route::get('/dashboard', CustomerDashboardController::class);
+            require app_path('Domains/Sales/routes/customer.php');
 
-            Route::get('invoices', [CustomerInvoicesController::class, 'index']);
+            require app_path('Domains/Receivables/routes/customer.php');
 
-            Route::get('invoices/{id}', [CustomerInvoicesController::class, 'show']);
+            require app_path('Domains/Purchases/routes/customer.php');
 
-            Route::post('/estimate/{estimate}/status', CustomerAcceptEstimateController::class);
-
-            Route::get('estimates', [CustomerEstimatesController::class, 'index']);
-
-            Route::get('estimates/{id}', [CustomerEstimatesController::class, 'show']);
-
-            Route::get('payments', [CustomerPaymentsController::class, 'index']);
-
-            Route::get('payments/{id}', [CustomerPaymentsController::class, 'show']);
-
-            Route::get('/payment-method', PaymentMethodController::class);
-
-            Route::get('expenses', [CustomerExpensesController::class, 'index']);
-
-            Route::get('expenses/{id}', [CustomerExpensesController::class, 'show']);
-
-            Route::post('/profile', [CustomerProfileController::class, 'updateProfile']);
-
-            Route::get('/me', [CustomerProfileController::class, 'getUser']);
-
-            Route::get('/countries', CountriesController::class);
         });
     });
 });
 
-Route::get('/cron', CronJobController::class)->middleware('cron-job');
+require app_path('Platform/Operations/routes/webhooks.php');
diff --git a/routes/console.php b/routes/console.php
index f7571995..ab83c4bc 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Models\CompanySetting;
-use App\Models\RecurringInvoice;
-use App\Services\Document\RecurringInvoiceService;
-use App\Support\Setup\InstallUtils;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Sales\Application\RecurringInvoiceService;
+use App\Domains\Sales\Models\RecurringInvoice;
+use App\Platform\Operations\Installation\Application\InstallationState;
 use Illuminate\Support\Facades\Schedule;
 
 // Only run in demo environment
@@ -14,7 +14,7 @@ if (config('app.env') === 'demo') {
         ->withoutOverlapping();
 }
 
-if (InstallUtils::isDbCreated()) {
+if (InstallationState::isDbCreated()) {
     Schedule::command('check:invoices:status')
         ->daily();
 
diff --git a/routes/web.php b/routes/web.php
index 79b02648..730c3f4b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,147 +1,40 @@
 <?php
 
-use App\Http\Controllers\Company\Auth\LoginController;
-use App\Http\Controllers\Company\Expense\ExpensesController;
-use App\Http\Controllers\Company\Report\CustomerSalesReportController;
-use App\Http\Controllers\Company\Report\CustomerStatementReportController;
-use App\Http\Controllers\Company\Report\ExpensesReportController;
-use App\Http\Controllers\Company\Report\ItemSalesReportController;
-use App\Http\Controllers\Company\Report\ProfitLossReportController;
-use App\Http\Controllers\Company\Report\TaxSummaryReportController;
-use App\Http\Controllers\CustomerPortal\Auth\LoginController as CustomerLoginController;
-use App\Http\Controllers\CustomerPortal\EstimatePdfController as CustomerEstimatePdfController;
-use App\Http\Controllers\CustomerPortal\InvoicePdfController as CustomerInvoicePdfController;
-use App\Http\Controllers\CustomerPortal\PaymentPdfController as CustomerPaymentPdfController;
-use App\Http\Controllers\Modules\ScriptController;
-use App\Http\Controllers\Modules\StyleController;
-use App\Http\Controllers\Pdf\DocumentPdfController;
-use App\Http\Controllers\Setup\SessionLoginController;
-use App\Models\Company;
-use App\Models\CompanyInvitation;
+use App\Domains\Accounts\Models\Company;
 use Illuminate\Support\Facades\Route;
 
-// Module Asset Includes
-// ----------------------------------------------
-
-Route::get('/modules/styles/{style}', StyleController::class);
-
-Route::get('/modules/scripts/{script}', ScriptController::class);
-
-// Admin Auth
-// ----------------------------------------------
-
-Route::post('login', [LoginController::class, 'login']);
-
-Route::post('auth/logout', function () {
-    Auth::guard('web')->logout();
-
-    request()->session()->invalidate();
-    request()->session()->regenerateToken();
-});
-
-// Customer auth
-// ----------------------------------------------
-
-Route::post('/{company:slug}/customer/login', CustomerLoginController::class);
-
-Route::post('/{company:slug}/customer/logout', function () {
-    Auth::guard('customer')->logout();
-});
+require app_path('Domains/Accounts/routes/web.php');
+require app_path('Domains/Contacts/routes/web.php');
 
 // Report PDF & Expense Endpoints
 // ----------------------------------------------
 
 Route::middleware('auth:sanctum')->prefix('reports')->group(function () {
+    require app_path('Domains/Reporting/routes/web.php');
 
-    Route::get('/customers/{customer}/statement', CustomerStatementReportController::class);
-
-    // sales report by customer
-    // ----------------------------------
-    Route::get('/sales/customers/{hash}', CustomerSalesReportController::class);
-
-    // sales report by items
-    // ----------------------------------
-    Route::get('/sales/items/{hash}', ItemSalesReportController::class);
-
-    // report for expenses
-    // ----------------------------------
-    Route::get('/expenses/{hash}', ExpensesReportController::class);
-
-    // report for tax summary
-    // ----------------------------------
-    Route::get('/tax-summary/{hash}', TaxSummaryReportController::class);
-
-    // report for profit and loss
-    // ----------------------------------
-    Route::get('/profit-loss/{hash}', ProfitLossReportController::class);
-
-    // download expense receipt
-    // -------------------------------------------------
-    Route::get('/expenses/{expense}/download-receipt', [ExpensesController::class, 'downloadReceipt']);
-    Route::get('/expenses/{expense}/receipt', [ExpensesController::class, 'showReceipt']);
+    require app_path('Domains/Purchases/routes/web.php');
 });
 
 // PDF Endpoints
 // ----------------------------------------------
 
-// Invitation email link handlers
-// -------------------------------------------------
-
-Route::get('/invitations/{token}/decline', function (string $token) {
-    $invitation = CompanyInvitation::where('token', $token)->pending()->first();
-
-    if (! $invitation) {
-        return view('app')->with(['message' => 'Invitation not found or already expired.']);
-    }
-
-    $invitation->update(['status' => CompanyInvitation::STATUS_DECLINED]);
-
-    return view('app')->with(['message' => 'Invitation declined.']);
-});
-
 Route::middleware('pdf-auth')->group(function () {
-
-    //  invoice pdf
-    // -------------------------------------------------
-    Route::get('/invoices/pdf/{invoice:unique_hash}', [DocumentPdfController::class, 'invoice']);
-    Route::get('/estimates/pdf/{estimate:unique_hash}', [DocumentPdfController::class, 'estimate']);
-    Route::get('/payments/pdf/{payment:unique_hash}', [DocumentPdfController::class, 'payment']);
+    require app_path('Domains/Sales/routes/pdf.php');
+    require app_path('Domains/Receivables/routes/pdf.php');
 });
 
 // customer pdf endpoints for invoice, estimate and Payment
 // -------------------------------------------------
 
 Route::prefix('/customer')->group(function () {
-    Route::get('/invoices/{email_log:token}', [CustomerInvoicePdfController::class, 'getInvoice']);
-    Route::get('/invoices/view/{email_log:token}', [CustomerInvoicePdfController::class, 'getPdf'])->name('invoice');
-
-    Route::get('/estimates/{email_log:token}', [CustomerEstimatePdfController::class, 'getEstimate']);
-    Route::get('/estimates/view/{email_log:token}', [CustomerEstimatePdfController::class, 'getPdf'])->name('estimate');
-
-    Route::get('/payments/{email_log:token}', [CustomerPaymentPdfController::class, 'getPayment']);
-    Route::get('/payments/view/{email_log:token}', [CustomerPaymentPdfController::class, 'getPdf'])->name('payment');
+    require app_path('Domains/Sales/routes/public.php');
+    require app_path('Domains/Receivables/routes/public.php');
 });
 
 // Setup for installation of app
 // ----------------------------------------------
 
-Route::get('/installation', function () {
-    return view('app');
-})->name('install')
-    ->middleware(['redirect-if-installed']);
-
-// Catch-all for installation wizard sub-routes (language, requirements,
-// permissions, database, domain, mail, account, company, preferences).
-// The Vue Router handles the actual step rendering on the SPA side; this
-// just makes sure deep links and hard refreshes inside the wizard hit the
-// SPA shell instead of 404ing.
-Route::get('/installation/{vue?}', function () {
-    return view('app');
-})->where('vue', '.*')
-    ->middleware(['redirect-if-installed']);
-
-Route::post('/installation/session-login', SessionLoginController::class)
-    ->middleware(['redirect-if-installed', 'auth:sanctum']);
+require app_path('Platform/Operations/Installation/routes/web.php');
 
 // Registration via invitation (serves SPA)
 // -------------------------------------------------
diff --git a/tests/Feature/Admin/AdminSettingsTest.php b/tests/Feature/Admin/AdminSettingsTest.php
index 9f997616..7880a184 100644
--- a/tests/Feature/Admin/AdminSettingsTest.php
+++ b/tests/Feature/Admin/AdminSettingsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 use Symfony\Component\HttpClient\HttpClient;
@@ -224,9 +224,8 @@ test('pdf configuration rejects an unknown orientation', function () {
 });
 
 /**
- * A zero margin is a deliberate choice. AppConfigProvider guards its settings
- * with !empty(), and '0mm' is fine there, but a bare '0' would not be -- this
- * pins the behaviour either way.
+ * A zero margin is a deliberate choice. Runtime configuration must not discard
+ * it as empty, so this pins the behavior through the API round trip.
  */
 test('page numbers can be turned on and read back', function () {
     postJson('/api/v1/pdf/config', [
diff --git a/tests/Feature/Admin/BackupGlobalTest.php b/tests/Feature/Admin/BackupGlobalTest.php
index 07ef1db9..e54ee03d 100644
--- a/tests/Feature/Admin/BackupGlobalTest.php
+++ b/tests/Feature/Admin/BackupGlobalTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Jobs\CreateBackupJob;
-use App\Models\FileDisk;
-use App\Models\User;
-use App\Services\Storage\BackupConfigurationFactory;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Storage\Application\BackupConfigurationFactory;
+use App\Platform\Storage\Jobs\CreateBackupJob;
+use App\Platform\Storage\Models\FileDisk;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Queue;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Admin/BackupTest.php b/tests/Feature/Admin/BackupTest.php
index efbe751f..50b7a09b 100644
--- a/tests/Feature/Admin/BackupTest.php
+++ b/tests/Feature/Admin/BackupTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Jobs\CreateBackupJob;
-use App\Models\FileDisk;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Storage\Jobs\CreateBackupJob;
+use App\Platform\Storage\Models\FileDisk;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Queue;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Admin/CompanySettingTest.php b/tests/Feature/Admin/CompanySettingTest.php
index b623de07..5bafcc63 100644
--- a/tests/Feature/Admin/CompanySettingTest.php
+++ b/tests/Feature/Admin/CompanySettingTest.php
@@ -1,13 +1,13 @@
 <?php
 
-use App\Http\Controllers\Company\Settings\CompanyController;
-use App\Http\Controllers\Company\Settings\UserProfileController;
-use App\Http\Requests\CompanyRequest;
-use App\Http\Requests\ProfileRequest;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\Tax;
-use App\Models\User;
+use App\Domains\Accounts\Http\Controllers\Company\CompanyController;
+use App\Domains\Accounts\Http\Controllers\Company\UserProfileController;
+use App\Domains\Accounts\Http\Requests\CompanyRequest;
+use App\Domains\Accounts\Http\Requests\ProfileRequest;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Taxation\Models\Tax;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/CompanyTest.php b/tests/Feature/Admin/CompanyTest.php
index e15dbf5f..c4562522 100644
--- a/tests/Feature/Admin/CompanyTest.php
+++ b/tests/Feature/Admin/CompanyTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Http\Controllers\Admin\CompaniesController;
-use App\Http\Requests\CompaniesRequest;
-use App\Models\Company;
-use App\Models\User;
+use App\Domains\Accounts\Http\Controllers\Admin\CompaniesController;
+use App\Domains\Accounts\Http\Requests\CompaniesRequest;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/ConfigTest.php b/tests/Feature/Admin/ConfigTest.php
index a08a0b06..b1a08072 100644
--- a/tests/Feature/Admin/ConfigTest.php
+++ b/tests/Feature/Admin/ConfigTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/CreditNoteSchemaTest.php b/tests/Feature/Admin/CreditNoteSchemaTest.php
index 0d539bab..2157db3b 100644
--- a/tests/Feature/Admin/CreditNoteSchemaTest.php
+++ b/tests/Feature/Admin/CreditNoteSchemaTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\Tax;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Taxation\Models\Tax;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Schema;
 
diff --git a/tests/Feature/Admin/CreditNoteTest.php b/tests/Feature/Admin/CreditNoteTest.php
index fabaec20..9d779c70 100644
--- a/tests/Feature/Admin/CreditNoteTest.php
+++ b/tests/Feature/Admin/CreditNoteTest.php
@@ -1,17 +1,17 @@
 <?php
 
-use App\Mail\SendCreditNoteMail;
-use App\Mail\SendInvoiceMail;
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
-use App\Models\Tax;
-use App\Models\User;
-use App\Services\Document\CreditNoteService;
-use App\Services\Document\InvoiceService;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Application\CreditNoteService;
+use App\Domains\Sales\Application\InvoiceService;
+use App\Domains\Sales\Mail\SendCreditNoteMail;
+use App\Domains\Sales\Mail\SendInvoiceMail;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Taxation\Models\Tax;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\View;
diff --git a/tests/Feature/Admin/CurrenciesTest.php b/tests/Feature/Admin/CurrenciesTest.php
index 264c0d42..f6a42496 100644
--- a/tests/Feature/Admin/CurrenciesTest.php
+++ b/tests/Feature/Admin/CurrenciesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/CurrencyTest.php b/tests/Feature/Admin/CurrencyTest.php
index 93e7a110..c934b176 100644
--- a/tests/Feature/Admin/CurrencyTest.php
+++ b/tests/Feature/Admin/CurrencyTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Currency;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Money\Models\Currency;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/CustomFieldTest.php b/tests/Feature/Admin/CustomFieldTest.php
index 811c481d..2da95de5 100644
--- a/tests/Feature/Admin/CustomFieldTest.php
+++ b/tests/Feature/Admin/CustomFieldTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Http\Controllers\Company\CustomField\CustomFieldsController;
-use App\Http\Requests\CustomFieldRequest;
-use App\Models\CustomField;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Metadata\Http\Controllers\CustomFieldsController;
+use App\Domains\Metadata\Http\Requests\CustomFieldRequest;
+use App\Domains\Metadata\Models\CustomField;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/CustomerTest.php b/tests/Feature/Admin/CustomerTest.php
index 8088eed3..b81e2c2b 100644
--- a/tests/Feature/Admin/CustomerTest.php
+++ b/tests/Feature/Admin/CustomerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-use App\Http\Controllers\Company\Customer\CustomersController;
-use App\Http\Requests\CustomerRequest;
-use App\Models\Company;
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Http\Controllers\Company\CustomersController;
+use App\Domains\Contacts\Http\Requests\CustomerRequest;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/DashboardTest.php b/tests/Feature/Admin/DashboardTest.php
index 9107ce2b..a0a419c4 100644
--- a/tests/Feature/Admin/DashboardTest.php
+++ b/tests/Feature/Admin/DashboardTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Invoice;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/EstimateTest.php b/tests/Feature/Admin/EstimateTest.php
index e44860a8..3092da2a 100644
--- a/tests/Feature/Admin/EstimateTest.php
+++ b/tests/Feature/Admin/EstimateTest.php
@@ -1,15 +1,15 @@
 <?php
 
-use App\Http\Controllers\Company\Estimate\EstimatesController;
-use App\Http\Requests\DeleteEstimatesRequest;
-use App\Http\Requests\EstimatesRequest;
-use App\Http\Requests\SendEstimatesRequest;
-use App\Mail\SendEstimateMail;
-use App\Models\Company;
-use App\Models\Estimate;
-use App\Models\EstimateItem;
-use App\Models\Tax;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Sales\Http\Controllers\Company\EstimatesController;
+use App\Domains\Sales\Http\Requests\DeleteEstimatesRequest;
+use App\Domains\Sales\Http\Requests\EstimatesRequest;
+use App\Domains\Sales\Http\Requests\SendEstimatesRequest;
+use App\Domains\Sales\Mail\SendEstimateMail;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\EstimateItem;
+use App\Domains\Taxation\Models\Tax;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/ExpenseCategoryTest.php b/tests/Feature/Admin/ExpenseCategoryTest.php
index 58ca3606..1b7a7d4e 100644
--- a/tests/Feature/Admin/ExpenseCategoryTest.php
+++ b/tests/Feature/Admin/ExpenseCategoryTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Http\Controllers\Company\Expense\ExpenseCategoriesController;
-use App\Http\Requests\ExpenseCategoryRequest;
-use App\Models\ExpenseCategory;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Purchases\Http\Controllers\Company\ExpenseCategoriesController;
+use App\Domains\Purchases\Http\Requests\ExpenseCategoryRequest;
+use App\Domains\Purchases\Models\ExpenseCategory;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/ExpenseTest.php b/tests/Feature/Admin/ExpenseTest.php
index 1f924934..a704f4fb 100644
--- a/tests/Feature/Admin/ExpenseTest.php
+++ b/tests/Feature/Admin/ExpenseTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use App\Http\Controllers\Company\Expense\ExpensesController;
-use App\Http\Requests\ExpenseRequest;
-use App\Models\Company;
-use App\Models\Expense;
-use App\Models\Tax;
-use App\Models\TaxType;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Purchases\Http\Controllers\Company\ExpensesController;
+use App\Domains\Purchases\Http\Requests\ExpenseRequest;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Taxation\Models\Tax;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/FileDiskSsrfTest.php b/tests/Feature/Admin/FileDiskSsrfTest.php
index ff42fa61..6ec70e9f 100644
--- a/tests/Feature/Admin/FileDiskSsrfTest.php
+++ b/tests/Feature/Admin/FileDiskSsrfTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/FileDiskTest.php b/tests/Feature/Admin/FileDiskTest.php
index f189830f..d275c00a 100644
--- a/tests/Feature/Admin/FileDiskTest.php
+++ b/tests/Feature/Admin/FileDiskTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\FileDisk;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Storage\Models\FileDisk;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/InvitationTest.php b/tests/Feature/Admin/InvitationTest.php
index 65f7317e..10ae9872 100644
--- a/tests/Feature/Admin/InvitationTest.php
+++ b/tests/Feature/Admin/InvitationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Mail\CompanyInvitationMail;
-use App\Models\Company;
-use App\Models\CompanyInvitation;
-use App\Models\User;
+use App\Domains\Accounts\Mail\CompanyInvitationMail;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanyInvitation;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Mail;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Admin/InvoicePaymentAllocationDetailTest.php b/tests/Feature/Admin/InvoicePaymentAllocationDetailTest.php
index c27e0bf5..12a0317f 100644
--- a/tests/Feature/Admin/InvoicePaymentAllocationDetailTest.php
+++ b/tests/Feature/Admin/InvoicePaymentAllocationDetailTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/InvoiceTest.php b/tests/Feature/Admin/InvoiceTest.php
index 91fa96ac..7c61b5ef 100644
--- a/tests/Feature/Admin/InvoiceTest.php
+++ b/tests/Feature/Admin/InvoiceTest.php
@@ -1,16 +1,16 @@
 <?php
 
-use App\Http\Controllers\Company\Invoice\InvoicesController;
-use App\Http\Requests\ChangeInvoiceStatusRequest;
-use App\Http\Requests\InvoicesRequest;
-use App\Mail\SendInvoiceMail;
-use App\Models\Company;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
-use App\Models\Tax;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Http\Controllers\Company\InvoicesController;
+use App\Domains\Sales\Http\Requests\ChangeInvoiceStatusRequest;
+use App\Domains\Sales\Http\Requests\InvoicesRequest;
+use App\Domains\Sales\Mail\SendInvoiceMail;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Taxation\Models\Tax;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/ItemTest.php b/tests/Feature/Admin/ItemTest.php
index 003476fe..0c6ebf91 100644
--- a/tests/Feature/Admin/ItemTest.php
+++ b/tests/Feature/Admin/ItemTest.php
@@ -1,11 +1,11 @@
 <?php
 
-use App\Http\Controllers\Company\Item\ItemsController;
-use App\Http\Requests\ItemsRequest;
-use App\Models\Item;
-use App\Models\Tax;
-use App\Models\TaxType;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Http\Controllers\ItemsController;
+use App\Domains\Catalog\Http\Requests\ItemsRequest;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Taxation\Models\Tax;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/LocationTest.php b/tests/Feature/Admin/LocationTest.php
index e503667b..6ff4eddc 100644
--- a/tests/Feature/Admin/LocationTest.php
+++ b/tests/Feature/Admin/LocationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/MemberTest.php b/tests/Feature/Admin/MemberTest.php
index 68c92c96..84a89f66 100644
--- a/tests/Feature/Admin/MemberTest.php
+++ b/tests/Feature/Admin/MemberTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Http\Controllers\Company\Members\MembersController;
-use App\Http\Requests\MemberRequest;
-use App\Models\Company;
-use App\Models\User;
+use App\Domains\Accounts\Http\Controllers\Company\MembersController;
+use App\Domains\Accounts\Http\Requests\MemberRequest;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
 use Laravel\Sanctum\Sanctum;
 
 use function Pest\Laravel\getJson;
diff --git a/tests/Feature/Admin/Modules/ModuleLifecycleTest.php b/tests/Feature/Admin/Modules/ModuleLifecycleTest.php
index a0444e4d..335b259e 100644
--- a/tests/Feature/Admin/Modules/ModuleLifecycleTest.php
+++ b/tests/Feature/Admin/Modules/ModuleLifecycleTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Events\ModuleDisabledEvent;
-use App\Events\ModuleEnabledEvent;
-use App\Models\Module;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Modules\Events\ModuleDisabledEvent;
+use App\Platform\Modules\Events\ModuleEnabledEvent;
+use App\Platform\Modules\Models\Module;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Event;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Admin/Modules/ModuleResourceTest.php b/tests/Feature/Admin/Modules/ModuleResourceTest.php
index 6d641396..e40b3023 100644
--- a/tests/Feature/Admin/Modules/ModuleResourceTest.php
+++ b/tests/Feature/Admin/Modules/ModuleResourceTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Http\Resources\ModuleResource;
-use App\Models\Module as InstalledModule;
+use App\Platform\Modules\Http\Resources\ModuleResource;
+use App\Platform\Modules\Models\Module as InstalledModule;
 use Illuminate\Http\Request;
 
 it('maps the marketplace payload shape expected by the admin modules ui', function () {
diff --git a/tests/Feature/Admin/Modules/ModuleUninstallTest.php b/tests/Feature/Admin/Modules/ModuleUninstallTest.php
index 01592ee6..8f196d6b 100644
--- a/tests/Feature/Admin/Modules/ModuleUninstallTest.php
+++ b/tests/Feature/Admin/Modules/ModuleUninstallTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use App\Events\ModuleUninstalledEvent;
-use App\Http\Resources\ModuleResource;
-use App\Models\Company;
-use App\Models\MarketplaceOperation;
-use App\Models\Module;
-use App\Models\User;
-use App\Services\Marketplace\ModuleRuntimeAutoloader;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Modules\Events\ModuleUninstalledEvent;
+use App\Platform\Modules\Http\Resources\ModuleResource;
+use App\Platform\Modules\Models\MarketplaceOperation;
+use App\Platform\Modules\Models\Module;
+use App\Platform\Modules\Runtime\ModuleRuntimeAutoloader;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
diff --git a/tests/Feature/Admin/NextNumberTest.php b/tests/Feature/Admin/NextNumberTest.php
index 35a3f0d3..f0920222 100644
--- a/tests/Feature/Admin/NextNumberTest.php
+++ b/tests/Feature/Admin/NextNumberTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/NotesTest.php b/tests/Feature/Admin/NotesTest.php
index 0dd7d481..01df2bf7 100644
--- a/tests/Feature/Admin/NotesTest.php
+++ b/tests/Feature/Admin/NotesTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\Company;
-use App\Models\Note;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Metadata\Models\Note;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/PaymentMethodTest.php b/tests/Feature/Admin/PaymentMethodTest.php
index c0923742..87f2030a 100644
--- a/tests/Feature/Admin/PaymentMethodTest.php
+++ b/tests/Feature/Admin/PaymentMethodTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Http\Controllers\Company\Payment\PaymentMethodsController;
-use App\Http\Requests\PaymentMethodRequest;
-use App\Models\PaymentMethod;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Receivables\Http\Controllers\Company\PaymentMethodsController;
+use App\Domains\Receivables\Http\Requests\PaymentMethodRequest;
+use App\Domains\Receivables\Models\PaymentMethod;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/PaymentTest.php b/tests/Feature/Admin/PaymentTest.php
index 7fda2583..19c2a817 100644
--- a/tests/Feature/Admin/PaymentTest.php
+++ b/tests/Feature/Admin/PaymentTest.php
@@ -1,13 +1,13 @@
 <?php
 
-use App\Http\Controllers\Company\Payment\PaymentsController;
-use App\Http\Requests\PaymentRequest;
-use App\Mail\SendPaymentMail;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\User;
-use App\Services\Document\CreditNoteService;
-use App\Services\Document\PaymentAllocationService;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Receivables\Application\PaymentAllocationService;
+use App\Domains\Receivables\Http\Controllers\Company\PaymentsController;
+use App\Domains\Receivables\Http\Requests\PaymentRequest;
+use App\Domains\Receivables\Mail\SendPaymentMail;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Application\CreditNoteService;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/PdfPageSetupMigrationTest.php b/tests/Feature/Admin/PdfPageSetupMigrationTest.php
index 24c127d1..4e029efd 100644
--- a/tests/Feature/Admin/PdfPageSetupMigrationTest.php
+++ b/tests/Feature/Admin/PdfPageSetupMigrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 
 /**
  * Existing installs have paper size stored as one Gotenberg-only string. It has
diff --git a/tests/Feature/Admin/RealisticDemoSeederTest.php b/tests/Feature/Admin/RealisticDemoSeederTest.php
index 901dbdd1..cb776abc 100644
--- a/tests/Feature/Admin/RealisticDemoSeederTest.php
+++ b/tests/Feature/Admin/RealisticDemoSeederTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/RecurringInvoiceTest.php b/tests/Feature/Admin/RecurringInvoiceTest.php
index f4468250..d3827b06 100644
--- a/tests/Feature/Admin/RecurringInvoiceTest.php
+++ b/tests/Feature/Admin/RecurringInvoiceTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Http\Controllers\Company\RecurringInvoice\RecurringInvoiceController;
-use App\Http\Requests\RecurringInvoiceRequest;
-use App\Models\InvoiceItem;
-use App\Models\RecurringInvoice;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Sales\Http\Controllers\Company\RecurringInvoiceController;
+use App\Domains\Sales\Http\Requests\RecurringInvoiceRequest;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Sales\Models\RecurringInvoice;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Admin/RoleTest.php b/tests/Feature/Admin/RoleTest.php
index 18cfd555..eefb0da3 100644
--- a/tests/Feature/Admin/RoleTest.php
+++ b/tests/Feature/Admin/RoleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/TaxTypeTest.php b/tests/Feature/Admin/TaxTypeTest.php
index d0b93437..22c9a57d 100644
--- a/tests/Feature/Admin/TaxTypeTest.php
+++ b/tests/Feature/Admin/TaxTypeTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Http\Controllers\Company\Settings\TaxTypesController;
-use App\Http\Requests\TaxTypeRequest;
-use App\Models\TaxType;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Taxation\Http\Controllers\TaxTypesController;
+use App\Domains\Taxation\Http\Requests\TaxTypeRequest;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/UnitTest.php b/tests/Feature/Admin/UnitTest.php
index a8e2688a..4567fdc1 100644
--- a/tests/Feature/Admin/UnitTest.php
+++ b/tests/Feature/Admin/UnitTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Http\Controllers\Company\Item\UnitsController;
-use App\Http\Requests\UnitRequest;
-use App\Models\Unit;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Http\Controllers\UnitsController;
+use App\Domains\Catalog\Http\Requests\UnitRequest;
+use App\Domains\Catalog\Models\Unit;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Admin/UpdateContainerizedTest.php b/tests/Feature/Admin/UpdateContainerizedTest.php
index 864bf25b..b15db7e6 100644
--- a/tests/Feature/Admin/UpdateContainerizedTest.php
+++ b/tests/Feature/Admin/UpdateContainerizedTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Laravel\Sanctum\Sanctum;
 
 use function Pest\Laravel\getJson;
diff --git a/tests/Feature/Ai/AiBaseUrlSsrfTest.php b/tests/Feature/Ai/AiBaseUrlSsrfTest.php
index aff39b95..59c04951 100644
--- a/tests/Feature/Ai/AiBaseUrlSsrfTest.php
+++ b/tests/Feature/Ai/AiBaseUrlSsrfTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Ai/AiChatFlowTest.php b/tests/Feature/Ai/AiChatFlowTest.php
index a98ffe68..07d29aa0 100644
--- a/tests/Feature/Ai/AiChatFlowTest.php
+++ b/tests/Feature/Ai/AiChatFlowTest.php
@@ -1,13 +1,13 @@
 <?php
 
-use App\Models\AiConversation;
-use App\Models\AiMessage;
-use App\Models\User;
-use App\Services\AiConfigurationService;
-use App\Support\Ai\AiChatResponse;
-use App\Support\Ai\AiDriver;
-use App\Support\Ai\AiDriverFactory;
-use App\Support\Ai\AiException;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Ai\Application\AiConfigurationService;
+use App\Platform\Ai\Contracts\AiDriver;
+use App\Platform\Ai\Data\AiChatResponse;
+use App\Platform\Ai\Drivers\AiDriverFactory;
+use App\Platform\Ai\Exceptions\AiException;
+use App\Platform\Ai\Models\AiConversation;
+use App\Platform\Ai\Models\AiMessage;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 use Tests\Support\ScriptedAiDriver;
diff --git a/tests/Feature/Ai/AiConfigurationTest.php b/tests/Feature/Ai/AiConfigurationTest.php
index 4c7d9cbe..cb7540ed 100644
--- a/tests/Feature/Ai/AiConfigurationTest.php
+++ b/tests/Feature/Ai/AiConfigurationTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\CompanySetting;
-use App\Models\User;
-use App\Services\AiConfigurationService;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Ai\Application\AiConfigurationService;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Ai/AiGenerationTest.php b/tests/Feature/Ai/AiGenerationTest.php
index 34b29aeb..412b37fa 100644
--- a/tests/Feature/Ai/AiGenerationTest.php
+++ b/tests/Feature/Ai/AiGenerationTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Models\User;
-use App\Services\AiConfigurationService;
-use App\Support\Ai\AiChatResponse;
-use App\Support\Ai\AiDriver;
-use App\Support\Ai\AiDriverFactory;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Ai\Application\AiConfigurationService;
+use App\Platform\Ai\Contracts\AiDriver;
+use App\Platform\Ai\Data\AiChatResponse;
+use App\Platform\Ai\Drivers\AiDriverFactory;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Ai/AiToolAuthorizationTest.php b/tests/Feature/Ai/AiToolAuthorizationTest.php
index 503f59e9..e80a481f 100644
--- a/tests/Feature/Ai/AiToolAuthorizationTest.php
+++ b/tests/Feature/Ai/AiToolAuthorizationTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use App\Models\AiMessage;
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\User;
-use App\Services\AiConfigurationService;
-use App\Support\Ai\AiChatResponse;
-use App\Support\Ai\AiDriverFactory;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Ai\Application\AiConfigurationService;
+use App\Platform\Ai\Data\AiChatResponse;
+use App\Platform\Ai\Drivers\AiDriverFactory;
+use App\Platform\Ai\Models\AiMessage;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 use Silber\Bouncer\BouncerFacade;
diff --git a/tests/Feature/Ai/Tools/ListRecentPaymentsToolTest.php b/tests/Feature/Ai/Tools/ListRecentPaymentsToolTest.php
index 992a3d2f..a49b895b 100644
--- a/tests/Feature/Ai/Tools/ListRecentPaymentsToolTest.php
+++ b/tests/Feature/Ai/Tools/ListRecentPaymentsToolTest.php
@@ -1,11 +1,11 @@
 <?php
 
-use App\Models\Company;
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
-use App\Services\Ai\Tools\ListRecentPaymentsTool;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Ai\Application\Tools\ListRecentPaymentsTool;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Feature/Ai/Tools/RankExpenseCategoriesToolTest.php b/tests/Feature/Ai/Tools/RankExpenseCategoriesToolTest.php
index 94b038f5..86437b15 100644
--- a/tests/Feature/Ai/Tools/RankExpenseCategoriesToolTest.php
+++ b/tests/Feature/Ai/Tools/RankExpenseCategoriesToolTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Models\Company;
-use App\Models\Expense;
-use App\Models\ExpenseCategory;
-use App\Services\Ai\Tools\RankExpenseCategoriesTool;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Purchases\Models\ExpenseCategory;
+use App\Platform\Ai\Application\Tools\RankExpenseCategoriesTool;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Feature/Ai/Tools/RankTopCustomersToolTest.php b/tests/Feature/Ai/Tools/RankTopCustomersToolTest.php
index daed6425..d7fa3c26 100644
--- a/tests/Feature/Ai/Tools/RankTopCustomersToolTest.php
+++ b/tests/Feature/Ai/Tools/RankTopCustomersToolTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Models\Company;
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Services\Ai\Tools\RankTopCustomersTool;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Ai\Application\Tools\RankTopCustomersTool;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Feature/Ai/Tools/RankTopItemsToolTest.php b/tests/Feature/Ai/Tools/RankTopItemsToolTest.php
index 5b049632..c13c439a 100644
--- a/tests/Feature/Ai/Tools/RankTopItemsToolTest.php
+++ b/tests/Feature/Ai/Tools/RankTopItemsToolTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use App\Models\Company;
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\Item;
-use App\Models\Unit;
-use App\Services\Ai\Tools\RankTopItemsTool;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Catalog\Models\Unit;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Platform\Ai\Application\Tools\RankTopItemsTool;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Feature/Ai/Tools/SearchInvoicesToolTest.php b/tests/Feature/Ai/Tools/SearchInvoicesToolTest.php
index bee3524d..644321d1 100644
--- a/tests/Feature/Ai/Tools/SearchInvoicesToolTest.php
+++ b/tests/Feature/Ai/Tools/SearchInvoicesToolTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Models\Company;
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Services\Ai\Tools\SearchInvoicesTool;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Ai\Application\Tools\SearchInvoicesTool;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Feature/Architecture/AccountsDomainBoundaryTest.php b/tests/Feature/Architecture/AccountsDomainBoundaryTest.php
new file mode 100644
index 00000000..5b122ed3
--- /dev/null
+++ b/tests/Feature/Architecture/AccountsDomainBoundaryTest.php
@@ -0,0 +1,141 @@
+<?php
+
+use App\Adapters\Accounts\EloquentBusinessDefaultsProvisioner;
+use App\Adapters\Accounts\EloquentCompanyAddressWriter;
+use App\Adapters\Accounts\EloquentCompanyDataPurger;
+use App\Adapters\Accounts\EloquentMemberReferencesCleaner;
+use App\Adapters\Accounts\LaravelCompanyInvitationSender;
+use App\Adapters\Accounts\MediaLibraryCompanyLogoManager;
+use App\Adapters\Accounts\MediaLibraryUserAvatarManager;
+use App\Domains\Accounts\AccountsServiceProvider;
+use App\Domains\Accounts\Contracts\CompanyAddressWriter;
+use App\Domains\Accounts\Contracts\CompanyDataPurger;
+use App\Domains\Accounts\Contracts\CompanyDefaultsProvisioner;
+use App\Domains\Accounts\Contracts\CompanyInvitationSender;
+use App\Domains\Accounts\Contracts\CompanyLogoManager;
+use App\Domains\Accounts\Contracts\MemberReferencesCleaner;
+use App\Domains\Accounts\Contracts\UserAvatarManager;
+use App\Domains\Accounts\Http\Middleware\Authenticate;
+use App\Domains\Accounts\Http\Middleware\CompanyMiddleware;
+use App\Domains\Accounts\Http\Middleware\RedirectIfAuthenticated;
+use App\Domains\Accounts\Http\Middleware\RedirectIfUnauthorized;
+use App\Domains\Accounts\Http\Middleware\ScopeBouncer;
+use App\Domains\Accounts\Http\Middleware\SuperAdminMiddleware;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Accounts\Policies\CompanyPolicy;
+use App\Domains\Accounts\Policies\RolePolicy;
+use App\Domains\Accounts\Policies\UserPolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+use Silber\Bouncer\Database\Role;
+
+test('the accounts domain owns account behavior and authorization', function () {
+    expect(app()->getProviders(AccountsServiceProvider::class))->toHaveCount(1)
+        ->and(app(CompanyAddressWriter::class))->toBeInstanceOf(EloquentCompanyAddressWriter::class)
+        ->and(app(CompanyDataPurger::class))->toBeInstanceOf(EloquentCompanyDataPurger::class)
+        ->and(app(CompanyDefaultsProvisioner::class))->toBeInstanceOf(EloquentBusinessDefaultsProvisioner::class)
+        ->and(app(CompanyInvitationSender::class))->toBeInstanceOf(LaravelCompanyInvitationSender::class)
+        ->and(app(CompanyLogoManager::class))->toBeInstanceOf(MediaLibraryCompanyLogoManager::class)
+        ->and(app(MemberReferencesCleaner::class))->toBeInstanceOf(EloquentMemberReferencesCleaner::class)
+        ->and(app(UserAvatarManager::class))->toBeInstanceOf(MediaLibraryUserAvatarManager::class)
+        ->and(Gate::getPolicyFor(Company::class))->toBeInstanceOf(CompanyPolicy::class)
+        ->and(Gate::getPolicyFor(User::class))->toBeInstanceOf(UserPolicy::class)
+        ->and(Gate::getPolicyFor(Role::class))->toBeInstanceOf(RolePolicy::class)
+        ->and(Gate::has('create company'))->toBeTrue()
+        ->and(Gate::has('transfer company ownership'))->toBeTrue()
+        ->and(Gate::has('delete company'))->toBeTrue()
+        ->and(Gate::has('manage company'))->toBeTrue()
+        ->and(Gate::has('delete multiple users'))->toBeTrue()
+        ->and(Gate::has('owner only'))->toBeTrue();
+
+    expect(class_exists('App\\Services\\Company\\CompanyService'))->toBeFalse()
+        ->and(class_exists('App\\Services\\Company\\InvitationService'))->toBeFalse()
+        ->and(class_exists('App\\Services\\Company\\MemberService'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\CompanyPolicy'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\UserPolicy'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\RolePolicy'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\SettingsPolicy'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\OwnerPolicy'))->toBeFalse()
+        ->and(class_exists('App\\Mail\\CompanyInvitationMail'))->toBeFalse()
+        ->and(class_exists('App\\Notifications\\MailResetPasswordNotification'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Admin\\CompaniesController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Admin\\UsersController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Members\\MembersController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Role\\RolesController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Settings\\CompanyController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\CompanyCollection'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\Customer\\CompanyResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\Customer\\UserResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\RoleCollection'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\UserCollection'))->toBeFalse();
+});
+
+test('account middleware aliases resolve to the accounts domain', function () {
+    $middleware = app('router')->getMiddleware();
+
+    expect($middleware['auth'])->toBe(Authenticate::class)
+        ->and($middleware['company'])->toBe(CompanyMiddleware::class)
+        ->and($middleware['guest'])->toBe(RedirectIfAuthenticated::class)
+        ->and($middleware['redirect-if-unauthenticated'])->toBe(RedirectIfUnauthorized::class)
+        ->and($middleware['bouncer'])->toBe(ScopeBouncer::class)
+        ->and($middleware['super-admin'])->toBe(SuperAdminMiddleware::class);
+});
+
+test('the accounts domain preserves public and super-admin routes', function () {
+    $routes = collect(Route::getRoutes()->getRoutes());
+    $publicUris = [
+        'api/v1/auth/login',
+        'api/v1/auth/logout',
+        'api/v1/auth/password/email',
+        'api/v1/auth/register-with-invitation',
+        'api/v1/auth/reset/password',
+        'api/v1/invitations/{token}/details',
+        'login',
+        'auth/logout',
+        'invitations/{token}/decline',
+    ];
+    $publicRoutes = $routes
+        ->filter(fn ($route): bool => in_array($route->uri(), $publicUris, true))
+        ->filter(fn ($route): bool => str_starts_with($route->getActionName(), 'App\\Domains\\Accounts\\Http\\Controllers\\'));
+
+    expect($publicRoutes)->toHaveCount(count($publicUris));
+
+    foreach ($publicRoutes as $route) {
+        expect($route->getActionName())->toStartWith('App\\Domains\\Accounts\\Http\\Controllers\\');
+    }
+
+    $adminRoutes = $routes
+        ->filter(fn ($route): bool => str_starts_with($route->uri(), 'api/v1/super-admin/'))
+        ->reject(fn ($route): bool => $route->uri() === 'api/v1/super-admin/dashboard');
+
+    expect($adminRoutes)->toHaveCount(8);
+
+    foreach ($adminRoutes as $route) {
+        expect($route->getActionName())->toStartWith('App\\Domains\\Accounts\\Http\\Controllers\\Admin\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum');
+
+        if ($route->uri() !== 'api/v1/super-admin/stop-impersonating') {
+            expect($route->gatherMiddleware())->toContain('super-admin');
+        }
+    }
+});
+
+test('the accounts domain preserves company account routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => str_starts_with($route->getActionName(), 'App\\Domains\\Accounts\\Http\\Controllers\\'))
+        ->filter(fn ($route): bool => str_starts_with($route->uri(), 'api/v1/'))
+        ->reject(fn ($route): bool => str_starts_with($route->uri(), 'api/v1/auth/'))
+        ->reject(fn ($route): bool => $route->uri() === 'api/v1/invitations/{token}/details')
+        ->reject(fn ($route): bool => str_starts_with($route->uri(), 'api/v1/super-admin/'));
+
+    expect($routes)->toHaveCount(32);
+
+    foreach ($routes as $route) {
+        expect($route->gatherMiddleware())->toContain('auth:sanctum', 'company');
+
+        if (! preg_match('#^api/v1/(?:companies|members|transfer/)#', $route->uri())) {
+            expect($route->gatherMiddleware())->toContain('bouncer');
+        }
+    }
+});
diff --git a/tests/Feature/Architecture/AiPlatformBoundaryTest.php b/tests/Feature/Architecture/AiPlatformBoundaryTest.php
new file mode 100644
index 00000000..309a6b24
--- /dev/null
+++ b/tests/Feature/Architecture/AiPlatformBoundaryTest.php
@@ -0,0 +1,56 @@
+<?php
+
+use App\Platform\Ai\AiServiceProvider;
+use App\Platform\Ai\Application\AiToolRegistry;
+use App\Platform\Ai\Drivers\OpenRouterDriver;
+use App\Platform\Ai\Http\Company\ChatController;
+use App\Platform\Ai\Models\AiConversation;
+use App\Platform\Ai\Policies\AiConversationPolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Support\Facades\Route;
+use InvoiceShelf\Modules\Registry;
+
+test('the ai platform owns its provider extensions and authorization', function () {
+    expect(app()->getProviders(AiServiceProvider::class))->toHaveCount(1)
+        ->and(app(AiToolRegistry::class))->toBe(app(AiToolRegistry::class))
+        ->and(Gate::getPolicyFor(AiConversation::class))->toBeInstanceOf(AiConversationPolicy::class)
+        ->and(Gate::has('manage ai config'))->toBeTrue()
+        ->and(Gate::has('use ai'))->toBeTrue()
+        ->and(RateLimiter::limiter('ai'))->not->toBeNull()
+        ->and(Registry::driverMeta('ai', 'openrouter')['class'])->toBe(OpenRouterDriver::class);
+
+    expect(class_exists('App\\Providers\\AiServiceProvider'))->toBeFalse()
+        ->and(class_exists('App\\Services\\Ai\\AiAssistantService'))->toBeFalse()
+        ->and(class_exists('App\\Support\\Ai\\AiDriver'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\AiConversationPolicy'))->toBeFalse();
+});
+
+test('the ai platform preserves its public routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => str_contains($route->uri(), '/ai/'))
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'DELETE api/v1/ai/conversations/{id}',
+        'GET|HEAD api/v1/ai/config',
+        'GET|HEAD api/v1/ai/conversations',
+        'GET|HEAD api/v1/ai/conversations/{id}',
+        'GET|HEAD api/v1/ai/drivers',
+        'GET|HEAD api/v1/company/ai/config',
+        'GET|HEAD api/v1/installation/ai/config',
+        'PATCH api/v1/ai/conversations/{id}',
+        'POST api/v1/ai/chat',
+        'POST api/v1/ai/config',
+        'POST api/v1/ai/generate',
+        'POST api/v1/ai/test',
+        'POST api/v1/company/ai/config',
+        'POST api/v1/company/ai/test',
+        'POST api/v1/installation/ai/config',
+    ])->sort()->values()->all());
+
+    $chat = $routes->get('POST api/v1/ai/chat');
+
+    expect($chat->getActionName())->toBe(ChatController::class)
+        ->and($chat->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer', 'throttle:ai');
+});
diff --git a/tests/Feature/Architecture/CatalogDomainBoundaryTest.php b/tests/Feature/Architecture/CatalogDomainBoundaryTest.php
new file mode 100644
index 00000000..9448aeec
--- /dev/null
+++ b/tests/Feature/Architecture/CatalogDomainBoundaryTest.php
@@ -0,0 +1,62 @@
+<?php
+
+use App\Adapters\Catalog\TaxationItemTaxManager;
+use App\Domains\Catalog\CatalogServiceProvider;
+use App\Domains\Catalog\Contracts\ItemTaxManager;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Catalog\Models\Unit;
+use App\Domains\Catalog\Policies\ItemPolicy;
+use App\Domains\Catalog\Policies\UnitPolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the catalog domain owns item behavior and authorization', function () {
+    expect(app()->getProviders(CatalogServiceProvider::class))->toHaveCount(1)
+        ->and(app(ItemTaxManager::class))->toBeInstanceOf(TaxationItemTaxManager::class)
+        ->and(Gate::getPolicyFor(Item::class))->toBeInstanceOf(ItemPolicy::class)
+        ->and(Gate::getPolicyFor(Unit::class))->toBeInstanceOf(UnitPolicy::class)
+        ->and(Gate::has('delete multiple items'))->toBeTrue();
+
+    expect(class_exists('App\\Services\\ItemService'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\ItemPolicy'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\UnitPolicy'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Item\\ItemsController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Item\\UnitsController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\ItemsRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\DeleteItemsRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\UnitRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\ItemResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\UnitResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\ItemCollection'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\UnitCollection'))->toBeFalse();
+});
+
+test('the catalog domain preserves item and unit routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => preg_match('#^api/v1/(?:items|units)(?:$|/)#', $route->uri()) === 1)
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'DELETE api/v1/items/{item}',
+        'DELETE api/v1/units/{unit}',
+        'GET|HEAD api/v1/items',
+        'GET|HEAD api/v1/items/create',
+        'GET|HEAD api/v1/items/{item}',
+        'GET|HEAD api/v1/items/{item}/edit',
+        'GET|HEAD api/v1/units',
+        'GET|HEAD api/v1/units/create',
+        'GET|HEAD api/v1/units/{unit}',
+        'GET|HEAD api/v1/units/{unit}/edit',
+        'POST api/v1/items',
+        'POST api/v1/items/delete',
+        'POST api/v1/units',
+        'PUT|PATCH api/v1/items/{item}',
+        'PUT|PATCH api/v1/units/{unit}',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Catalog\\Http\\Controllers\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+});
diff --git a/tests/Feature/Architecture/ContactsDomainBoundaryTest.php b/tests/Feature/Architecture/ContactsDomainBoundaryTest.php
new file mode 100644
index 00000000..882eb972
--- /dev/null
+++ b/tests/Feature/Architecture/ContactsDomainBoundaryTest.php
@@ -0,0 +1,111 @@
+<?php
+
+use App\Adapters\Contacts\EloquentCustomerDataPurger;
+use App\Adapters\Contacts\EloquentCustomerPortalDashboardProvider;
+use App\Adapters\Contacts\EloquentCustomerStatsProvider;
+use App\Adapters\Contacts\MediaLibraryCustomerAvatarManager;
+use App\Domains\Contacts\ContactsServiceProvider;
+use App\Domains\Contacts\Contracts\CustomerAvatarManager;
+use App\Domains\Contacts\Contracts\CustomerDataPurger;
+use App\Domains\Contacts\Contracts\CustomerPortalDashboardProvider;
+use App\Domains\Contacts\Contracts\CustomerStatsProvider;
+use App\Domains\Contacts\Http\Middleware\CustomerGuest;
+use App\Domains\Contacts\Http\Middleware\CustomerPortalMiddleware;
+use App\Domains\Contacts\Http\Middleware\CustomerRedirectIfAuthenticated;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Contacts\Policies\CustomerPolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the contacts domain owns customer behavior and authorization', function () {
+    expect(app()->getProviders(ContactsServiceProvider::class))->toHaveCount(1)
+        ->and(app(CustomerAvatarManager::class))->toBeInstanceOf(MediaLibraryCustomerAvatarManager::class)
+        ->and(app(CustomerDataPurger::class))->toBeInstanceOf(EloquentCustomerDataPurger::class)
+        ->and(app(CustomerPortalDashboardProvider::class))->toBeInstanceOf(EloquentCustomerPortalDashboardProvider::class)
+        ->and(app(CustomerStatsProvider::class))->toBeInstanceOf(EloquentCustomerStatsProvider::class)
+        ->and(Gate::getPolicyFor(Customer::class))->toBeInstanceOf(CustomerPolicy::class)
+        ->and(Gate::has('delete multiple customers'))->toBeTrue();
+
+    foreach ([
+        'App\\Services\\CustomerService',
+        'App\\Policies\\CustomerPolicy',
+        'App\\Notifications\\CustomerMailResetPasswordNotification',
+        'App\\Http\\Controllers\\Admin\\CountriesController',
+        'App\\Http\\Controllers\\Company\\Customer\\CustomersController',
+        'App\\Http\\Controllers\\Company\\Customer\\CustomerStatsController',
+        'App\\Http\\Controllers\\CustomerPortal\\Auth\\ForgotPasswordController',
+        'App\\Http\\Controllers\\CustomerPortal\\Auth\\LoginController',
+        'App\\Http\\Controllers\\CustomerPortal\\Auth\\ResetPasswordController',
+        'App\\Http\\Controllers\\CustomerPortal\\General\\BootstrapController',
+        'App\\Http\\Controllers\\CustomerPortal\\General\\DashboardController',
+        'App\\Http\\Controllers\\CustomerPortal\\General\\ProfileController',
+        'App\\Http\\Requests\\CustomerRequest',
+        'App\\Http\\Requests\\DeleteCustomersRequest',
+        'App\\Http\\Requests\\Customer\\CustomerLoginRequest',
+        'App\\Http\\Requests\\Customer\\CustomerProfileRequest',
+        'App\\Http\\Resources\\AddressResource',
+        'App\\Http\\Resources\\CountryResource',
+        'App\\Http\\Resources\\CustomerResource',
+        'App\\Http\\Resources\\Customer\\AddressResource',
+        'App\\Http\\Resources\\Customer\\CountryResource',
+        'App\\Http\\Resources\\Customer\\CustomerResource',
+        'App\\Http\\Resources\\AddressCollection',
+        'App\\Http\\Resources\\CountryCollection',
+        'App\\Http\\Resources\\CustomerCollection',
+    ] as $legacyClass) {
+        expect(class_exists($legacyClass))->toBeFalse();
+    }
+});
+
+test('customer middleware aliases resolve to the contacts domain', function () {
+    $middleware = app('router')->getMiddleware();
+
+    expect($middleware['customer'])->toBe(CustomerRedirectIfAuthenticated::class)
+        ->and($middleware['customer-guest'])->toBe(CustomerGuest::class)
+        ->and($middleware['customer-portal'])->toBe(CustomerPortalMiddleware::class);
+});
+
+test('the contacts domain preserves public and company customer routes', function () {
+    $routes = collect(Route::getRoutes()->getRoutes());
+
+    $countryRoutes = $routes->filter(fn ($route): bool => in_array($route->uri(), [
+        'api/v1/countries',
+        'api/v1/{company}/customer/countries',
+    ], true));
+
+    expect($countryRoutes)->toHaveCount(2);
+
+    foreach ($countryRoutes as $route) {
+        expect($route->getActionName())->toBe('App\\Domains\\Contacts\\Http\\Controllers\\CountriesController');
+    }
+
+    $companyRoutes = $routes
+        ->filter(fn ($route): bool => preg_match('#^api/v1/customers(?:$|/)#', $route->uri()) === 1)
+        ->reject(fn ($route): bool => str_contains($route->uri(), '/statement') || str_contains($route->uri(), '/credit-allocations'));
+
+    expect($companyRoutes)->toHaveCount(9);
+
+    foreach ($companyRoutes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Contacts\\Http\\Controllers\\Company\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+});
+
+test('the contacts domain preserves customer portal identity routes', function () {
+    $routes = collect(Route::getRoutes()->getRoutes());
+    $portalRoutes = $routes
+        ->filter(fn ($route): bool => str_starts_with($route->getActionName(), 'App\\Domains\\Contacts\\Http\\Controllers\\CustomerPortal\\'));
+
+    expect($portalRoutes)->toHaveCount(8);
+
+    $authenticatedRoutes = $portalRoutes
+        ->filter(fn ($route): bool => str_starts_with($route->uri(), 'api/v1/{company}/customer/'))
+        ->reject(fn ($route): bool => str_contains($route->uri(), '/auth/'));
+
+    expect($authenticatedRoutes)->toHaveCount(4);
+
+    foreach ($authenticatedRoutes as $route) {
+        expect($route->gatherMiddleware())->toContain('auth:customer', 'customer-portal');
+    }
+});
diff --git a/tests/Feature/Architecture/MailPlatformBoundaryTest.php b/tests/Feature/Architecture/MailPlatformBoundaryTest.php
new file mode 100644
index 00000000..72fcf1cc
--- /dev/null
+++ b/tests/Feature/Architecture/MailPlatformBoundaryTest.php
@@ -0,0 +1,51 @@
+<?php
+
+use App\Platform\Mail\Application\EloquentEmailLogWriter;
+use App\Platform\Mail\Application\MailConfigurationService;
+use App\Platform\Mail\Contracts\EmailLogWriter;
+use App\Platform\Mail\Contracts\MailConfigurator;
+use App\Platform\Mail\Http\Admin\MailConfigurationController;
+use App\Platform\Mail\Http\Company\CompanyMailConfigurationController;
+use App\Platform\Mail\MailServiceProvider;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the mail platform owns configuration and authorization', function () {
+    expect(app()->getProviders(MailServiceProvider::class))->toHaveCount(1)
+        ->and(app(MailConfigurator::class))->toBeInstanceOf(MailConfigurationService::class)
+        ->and(app(EmailLogWriter::class))->toBeInstanceOf(EloquentEmailLogWriter::class)
+        ->and(Gate::has('manage email config'))->toBeTrue();
+
+    expect(class_exists('App\\Services\\Mail\\MailConfigurationService'))->toBeFalse()
+        ->and(class_exists('App\\Services\\Mail\\CompanyMailConfigService'))->toBeFalse()
+        ->and(class_exists('App\\Mail\\TestMail'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Admin\\Settings\\MailConfigurationController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Settings\\CompanyMailConfigurationController'))->toBeFalse();
+});
+
+test('the mail platform preserves its public configuration routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => preg_match('#^api/v1/(?:company/)?mail/#', $route->uri()) === 1)
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'GET|HEAD api/v1/company/mail/company-config',
+        'GET|HEAD api/v1/company/mail/config',
+        'GET|HEAD api/v1/mail/config',
+        'GET|HEAD api/v1/mail/drivers',
+        'POST api/v1/company/mail/company-config',
+        'POST api/v1/company/mail/company-test',
+        'POST api/v1/mail/config',
+        'POST api/v1/mail/test',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())->toStartWith('App\\Platform\\Mail\\Http\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+
+    expect($routes->get('GET|HEAD api/v1/mail/config')->getActionName())
+        ->toBe(MailConfigurationController::class.'@getMailEnvironment')
+        ->and($routes->get('GET|HEAD api/v1/company/mail/config')->getActionName())
+        ->toBe(CompanyMailConfigurationController::class.'@getDefaultConfig');
+});
diff --git a/tests/Feature/Architecture/MetadataDomainBoundaryTest.php b/tests/Feature/Architecture/MetadataDomainBoundaryTest.php
new file mode 100644
index 00000000..4471cd97
--- /dev/null
+++ b/tests/Feature/Architecture/MetadataDomainBoundaryTest.php
@@ -0,0 +1,64 @@
+<?php
+
+use App\Domains\Metadata\Application\EloquentCustomFieldValueWriter;
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
+use App\Domains\Metadata\MetadataServiceProvider;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Metadata\Models\Note;
+use App\Domains\Metadata\Policies\CustomFieldPolicy;
+use App\Domains\Metadata\Policies\NotePolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the metadata domain owns custom fields notes and authorization', function () {
+    expect(app()->getProviders(MetadataServiceProvider::class))->toHaveCount(1)
+        ->and(app(CustomFieldValueWriter::class))->toBeInstanceOf(EloquentCustomFieldValueWriter::class)
+        ->and(Gate::getPolicyFor(CustomField::class))->toBeInstanceOf(CustomFieldPolicy::class)
+        ->and(Gate::getPolicyFor(Note::class))->toBeInstanceOf(NotePolicy::class)
+        ->and(Gate::has('manage notes'))->toBeTrue()
+        ->and(Gate::has('view notes'))->toBeTrue();
+
+    expect(class_exists('App\\Services\\CustomFieldService'))->toBeFalse()
+        ->and(trait_exists('App\\Traits\\HasCustomFieldsTrait'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\CustomFieldPolicy'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\NotePolicy'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\CustomField\\CustomFieldsController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\General\\NotesController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\CustomFieldRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\NotesRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\CustomFieldResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\CustomFieldValueResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\Customer\\CustomFieldResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\Customer\\CustomFieldValueResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\NoteResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\CustomFieldCollection'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\CustomFieldValueCollection'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\NoteCollection'))->toBeFalse();
+});
+
+test('the metadata domain preserves custom field and note routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => preg_match('#^api/v1/(?:custom-fields|notes)(?:$|/)#', $route->uri()) === 1)
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'DELETE api/v1/custom-fields/{custom_field}',
+        'DELETE api/v1/notes/{note}',
+        'GET|HEAD api/v1/custom-fields',
+        'GET|HEAD api/v1/custom-fields/create',
+        'GET|HEAD api/v1/custom-fields/{custom_field}',
+        'GET|HEAD api/v1/custom-fields/{custom_field}/edit',
+        'GET|HEAD api/v1/notes',
+        'GET|HEAD api/v1/notes/{note}',
+        'POST api/v1/custom-fields',
+        'POST api/v1/notes',
+        'PUT|PATCH api/v1/custom-fields/{custom_field}',
+        'PUT|PATCH api/v1/notes/{note}',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Metadata\\Http\\Controllers\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+});
diff --git a/tests/Feature/Architecture/ModelTypeAliasMigrationTest.php b/tests/Feature/Architecture/ModelTypeAliasMigrationTest.php
new file mode 100644
index 00000000..d957a79d
--- /dev/null
+++ b/tests/Feature/Architecture/ModelTypeAliasMigrationTest.php
@@ -0,0 +1,84 @@
+<?php
+
+use Illuminate\Support\Facades\DB;
+
+test('the model identity migration covers every persisted morph column', function () {
+    $migration = require database_path('migrations/2026_08_05_120000_stabilize_model_type_aliases.php');
+
+    expect($migration::COLUMNS)->toBe([
+        'media' => ['model_type'],
+        'email_logs' => ['mailable_type'],
+        'notifications' => ['notifiable_type'],
+        'personal_access_tokens' => ['tokenable_type'],
+        'custom_field_values' => ['custom_field_valuable_type'],
+        'abilities' => ['entity_type'],
+        'assigned_roles' => ['entity_type', 'restricted_to_type'],
+        'permissions' => ['entity_type'],
+    ]);
+});
+
+test('legacy model types migrate to stable aliases and can be rolled back', function () {
+    $abilityId = DB::table('abilities')->insertGetId([
+        'name' => 'architecture-migration-test',
+        'entity_type' => 'InvoiceShelf\\Models\\Invoice',
+        'only_owned' => false,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $migration = require database_path('migrations/2026_08_05_120000_stabilize_model_type_aliases.php');
+    $migration->up();
+
+    expect(DB::table('abilities')->where('id', $abilityId)->value('entity_type'))->toBe('invoice');
+
+    $migration->down();
+
+    expect(DB::table('abilities')->where('id', $abilityId)->value('entity_type'))->toBe('App\\Models\\Invoice');
+});
+
+test('legacy bouncer role identities migrate and can be rolled back', function () {
+    $roleId = DB::table('roles')->insertGetId([
+        'name' => 'architecture-migration-role',
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+    $abilityId = DB::table('abilities')->insertGetId([
+        'name' => 'architecture-migration-ability',
+        'only_owned' => false,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+    $permissionId = DB::table('permissions')->insertGetId([
+        'ability_id' => $abilityId,
+        'entity_id' => $roleId,
+        'entity_type' => 'roles',
+        'forbidden' => false,
+    ]);
+
+    $migration = require database_path('migrations/2026_08_05_120000_stabilize_model_type_aliases.php');
+    $migration->up();
+
+    expect(DB::table('permissions')->where('id', $permissionId)->value('entity_type'))
+        ->toBe('bouncer_role');
+
+    $migration->down();
+
+    expect(DB::table('permissions')->where('id', $permissionId)->value('entity_type'))
+        ->toBe('roles');
+});
+
+test('unknown model identities are left untouched', function () {
+    $abilityId = DB::table('abilities')->insertGetId([
+        'name' => 'architecture-unknown-test',
+        'entity_type' => 'Modules\\Example\\Models\\Record',
+        'only_owned' => false,
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+
+    $migration = require database_path('migrations/2026_08_05_120000_stabilize_model_type_aliases.php');
+    $migration->up();
+
+    expect(DB::table('abilities')->where('id', $abilityId)->value('entity_type'))
+        ->toBe('Modules\\Example\\Models\\Record');
+});
diff --git a/tests/Feature/Architecture/ModulePlatformBoundaryTest.php b/tests/Feature/Architecture/ModulePlatformBoundaryTest.php
new file mode 100644
index 00000000..b9746965
--- /dev/null
+++ b/tests/Feature/Architecture/ModulePlatformBoundaryTest.php
@@ -0,0 +1,62 @@
+<?php
+
+use App\Platform\Modules\Models\MarketplaceCredential;
+use App\Platform\Modules\Models\MarketplaceOperation;
+use App\Platform\Modules\Models\Module;
+use App\Platform\Modules\ModuleServiceProvider;
+use Illuminate\Routing\Route as IlluminateRoute;
+use Illuminate\Support\Facades\Route;
+
+test('the module platform owns its provider and persistence models', function () {
+    expect(app()->getProviders(ModuleServiceProvider::class))->not->toBeEmpty()
+        ->and((new Module)->getTable())->toBe('modules')
+        ->and((new MarketplaceCredential)->getTable())->toBe('marketplace_credentials')
+        ->and((new MarketplaceOperation)->getTable())->toBe('marketplace_operations')
+        ->and(class_exists('App\\Models\\Module'))->toBeFalse()
+        ->and(class_exists('App\\Services\\Marketplace\\MarketplaceInstaller'))->toBeFalse();
+});
+
+test('the module platform preserves its public routes and middleware', function () {
+    $routes = collect(Route::getRoutes())->filter(
+        fn (IlluminateRoute $route): bool => $route->uri() === 'api/v1/company-modules'
+            || str_starts_with($route->uri(), 'api/v1/modules')
+            || str_starts_with($route->uri(), 'modules/scripts')
+            || str_starts_with($route->uri(), 'modules/styles')
+    );
+
+    $signatures = $routes
+        ->flatMap(fn (IlluminateRoute $route): array => collect($route->methods())
+            ->reject(fn (string $method): bool => $method === 'HEAD')
+            ->map(fn (string $method): string => "{$method} {$route->uri()}")
+            ->all())
+        ->sort()
+        ->values()
+        ->all();
+
+    expect($signatures)->toBe(collect([
+        'GET api/v1/company-modules',
+        'GET api/v1/modules',
+        'GET api/v1/modules/pairing',
+        'POST api/v1/modules/pairing/start',
+        'POST api/v1/modules/pairing/poll',
+        'DELETE api/v1/modules/pairing',
+        'GET api/v1/modules/{module}',
+        'POST api/v1/modules/{module}/enable',
+        'POST api/v1/modules/{module}/disable',
+        'POST api/v1/modules/{module}/uninstall',
+        'POST api/v1/modules/install',
+        'GET api/v1/modules/{slug}/settings',
+        'PUT api/v1/modules/{slug}/settings',
+        'GET modules/scripts/{script}',
+        'GET modules/styles/{style}',
+    ])->sort()->values()->all());
+
+    $routes->each(function (IlluminateRoute $route): void {
+        $expected = str_starts_with($route->uri(), 'api/')
+            ? ['api', 'auth:sanctum', 'company']
+            : ['web'];
+
+        expect($route->middleware())->toBe($expected)
+            ->and($route->getActionName())->toStartWith('App\\Platform\\Modules\\');
+    });
+});
diff --git a/tests/Feature/Architecture/MoneyDomainBoundaryTest.php b/tests/Feature/Architecture/MoneyDomainBoundaryTest.php
new file mode 100644
index 00000000..22f4a9b1
--- /dev/null
+++ b/tests/Feature/Architecture/MoneyDomainBoundaryTest.php
@@ -0,0 +1,62 @@
+<?php
+
+use App\Adapters\Money\EloquentExchangeRateBackfill;
+use App\Domains\Money\Contracts\ExchangeRateBackfill;
+use App\Domains\Money\ExchangeRates\CurrencyConverterDriver;
+use App\Domains\Money\ExchangeRates\CurrencyFreakDriver;
+use App\Domains\Money\Models\ExchangeRateProvider;
+use App\Domains\Money\MoneyServiceProvider;
+use App\Domains\Money\Policies\ExchangeRateProviderPolicy;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+use InvoiceShelf\Modules\Registry;
+
+test('the money domain owns exchange-rate behavior and authorization', function () {
+    expect(app()->getProviders(MoneyServiceProvider::class))->toHaveCount(1)
+        ->and(app(ExchangeRateBackfill::class))->toBeInstanceOf(EloquentExchangeRateBackfill::class)
+        ->and(Gate::getPolicyFor(ExchangeRateProvider::class))->toBeInstanceOf(ExchangeRateProviderPolicy::class)
+        ->and(Registry::driverMeta('exchange_rate', 'currency_converter')['class'] ?? null)
+        ->toBe(CurrencyConverterDriver::class)
+        ->and(Registry::driverMeta('exchange_rate', 'currency_freak')['class'] ?? null)
+        ->toBe(CurrencyFreakDriver::class);
+
+    expect(class_exists('App\\Providers\\DriverRegistryProvider'))->toBeFalse()
+        ->and(class_exists('App\\Support\\ExchangeRate\\ExchangeRateDriverFactory'))->toBeFalse()
+        ->and(class_exists('App\\Services\\Document\\CurrencyService'))->toBeFalse()
+        ->and(class_exists('App\\Services\\ExchangeRateProviderService'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\ExchangeRateProviderPolicy'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Admin\\CurrenciesController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\ExchangeRate\\ExchangeRateProviderController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\ExchangeRateProviderRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\CurrencyResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\Customer\\CurrencyResource'))->toBeFalse();
+});
+
+test('the money domain preserves its public routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => preg_match(
+            '#^api/v1/(?:currencies(?:$|/)|exchange-rate-providers(?:$|/)|supported-currencies$|used-currencies$)#',
+            $route->uri(),
+        ) === 1)
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'DELETE api/v1/exchange-rate-providers/{exchange_rate_provider}',
+        'GET|HEAD api/v1/currencies',
+        'GET|HEAD api/v1/currencies/used',
+        'GET|HEAD api/v1/currencies/{currency}/active-provider',
+        'GET|HEAD api/v1/currencies/{currency}/exchange-rate',
+        'GET|HEAD api/v1/exchange-rate-providers',
+        'GET|HEAD api/v1/exchange-rate-providers/{exchange_rate_provider}',
+        'GET|HEAD api/v1/supported-currencies',
+        'GET|HEAD api/v1/used-currencies',
+        'POST api/v1/currencies/bulk-update-exchange-rate',
+        'POST api/v1/exchange-rate-providers',
+        'PUT|PATCH api/v1/exchange-rate-providers/{exchange_rate_provider}',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())->toStartWith('App\\Domains\\Money\\Http\\Controllers\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+});
diff --git a/tests/Feature/Architecture/OperationsPlatformBoundaryTest.php b/tests/Feature/Architecture/OperationsPlatformBoundaryTest.php
new file mode 100644
index 00000000..39c2a462
--- /dev/null
+++ b/tests/Feature/Architecture/OperationsPlatformBoundaryTest.php
@@ -0,0 +1,152 @@
+<?php
+
+use App\Platform\Operations\Http\Middleware\CronJobMiddleware;
+use App\Platform\Operations\Http\Middleware\EnsureNotContainerized;
+use App\Platform\Operations\Installation\Http\Middleware\EnsureInstalled;
+use App\Platform\Operations\Installation\Http\Middleware\RedirectIfInstalled;
+use App\Platform\Operations\Installation\Http\Middleware\UseInstallWizardTokenAuth;
+use App\Platform\Operations\OperationsServiceProvider;
+use App\Platform\Storage\Application\FileDiskService;
+use App\Platform\Storage\Contracts\StorageConfigurator;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the operations platform owns runtime configuration commands and authorization', function () {
+    expect(app()->getProviders(OperationsServiceProvider::class))->toHaveCount(1)
+        ->and(app(StorageConfigurator::class))->toBeInstanceOf(FileDiskService::class)
+        ->and(Gate::has('manage settings'))->toBeTrue()
+        ->and(Gate::has('manage update app'))->toBeTrue()
+        ->and(Artisan::all())->toHaveKeys(['core:update', 'reset:app']);
+
+    expect(class_exists('App\\Providers\\AppConfigProvider'))->toBeFalse()
+        ->and(class_exists('App\\Support\\Update\\Updater'))->toBeFalse()
+        ->and(class_exists('App\\Console\\Commands\\UpdateCommand'))->toBeFalse()
+        ->and(class_exists('App\\Console\\Commands\\ResetApp'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\AppVersionController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Admin\\UpdateController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Admin\\Settings\\SettingsController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Admin\\AdminDashboardController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\General\\BootstrapController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\General\\ConfigController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\General\\FormatsController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Webhook\\CronJobController'))->toBeFalse()
+        ->and(class_exists('App\\Support\\Setup\\InstallUtils'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Setup\\LoginController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Middleware\\InstallationMiddleware'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\DatabaseEnvironmentRequest'))->toBeFalse();
+});
+
+test('the operations platform owns bootstrap configuration and admin diagnostics routes', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => in_array($route->uri(), [
+            'api/v1/bootstrap',
+            'api/v1/config',
+            'api/v1/current-company',
+            'api/v1/date/formats',
+            'api/v1/super-admin/dashboard',
+            'api/v1/time/formats',
+            'api/v1/timezones',
+        ], true))
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'GET|HEAD api/v1/bootstrap',
+        'GET|HEAD api/v1/config',
+        'GET|HEAD api/v1/current-company',
+        'GET|HEAD api/v1/date/formats',
+        'GET|HEAD api/v1/super-admin/dashboard',
+        'GET|HEAD api/v1/time/formats',
+        'GET|HEAD api/v1/timezones',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())->toStartWith('App\\Platform\\Operations\\Http\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum');
+    }
+
+    expect($routes->get('GET|HEAD api/v1/super-admin/dashboard')->gatherMiddleware())
+        ->toContain('super-admin')
+        ->and($routes->except('GET|HEAD api/v1/super-admin/dashboard')->every(
+            fn ($route): bool => in_array('company', $route->gatherMiddleware(), true)
+                && in_array('bouncer', $route->gatherMiddleware(), true),
+        ))->toBeTrue();
+});
+
+test('the operations platform preserves its public routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => preg_match(
+            '#^api/(?:v1/(?:app/version|settings$|check/update$|update/)|cron$)#',
+            $route->uri(),
+        ) === 1)
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'GET|HEAD api/cron',
+        'GET|HEAD api/v1/app/version',
+        'GET|HEAD api/v1/check/update',
+        'GET|HEAD api/v1/settings',
+        'POST api/v1/settings',
+        'POST api/v1/update/clean',
+        'POST api/v1/update/copy',
+        'POST api/v1/update/delete',
+        'POST api/v1/update/download',
+        'POST api/v1/update/finish',
+        'POST api/v1/update/migrate',
+        'POST api/v1/update/unzip',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())->toStartWith('App\\Platform\\Operations\\Http\\');
+    }
+
+    foreach (['GET|HEAD api/v1/settings', 'POST api/v1/settings'] as $key) {
+        expect($routes->get($key)->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+
+    foreach ($routes->filter(fn ($route) => str_contains($route->uri(), 'update')) as $route) {
+        expect($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'not-containerized');
+    }
+
+    expect($routes->get('GET|HEAD api/cron')->gatherMiddleware())->toContain('cron-job')
+        ->and(app('router')->getMiddleware()['cron-job'] ?? null)->toBe(CronJobMiddleware::class)
+        ->and(app('router')->getMiddleware()['not-containerized'] ?? null)->toBe(EnsureNotContainerized::class);
+});
+
+test('the operations platform owns installation routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => (
+            str_starts_with($route->uri(), 'api/v1/installation/')
+            && ! str_starts_with($route->uri(), 'api/v1/installation/ai/')
+        ) || str_starts_with($route->uri(), 'installation'))
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'GET|HEAD api/v1/installation/database/config',
+        'GET|HEAD api/v1/installation/languages',
+        'GET|HEAD api/v1/installation/permissions',
+        'GET|HEAD api/v1/installation/requirements',
+        'GET|HEAD api/v1/installation/wizard-step',
+        'GET|HEAD installation',
+        'GET|HEAD installation/{vue?}',
+        'POST api/v1/installation/database/config',
+        'POST api/v1/installation/finish',
+        'POST api/v1/installation/login',
+        'POST api/v1/installation/wizard-language',
+        'POST api/v1/installation/wizard-step',
+        'POST installation/session-login',
+        'PUT api/v1/installation/set-domain',
+    ])->sort()->values()->all());
+
+    foreach ($routes->filter(fn ($route) => str_starts_with($route->uri(), 'api/')) as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Platform\\Operations\\Installation\\Http\\Controllers\\')
+            ->and($route->gatherMiddleware())->toContain('redirect-if-installed');
+    }
+
+    expect($routes->get('POST installation/session-login')->getActionName())
+        ->toBe('App\\Platform\\Operations\\Installation\\Http\\Controllers\\SessionLoginController')
+        ->and(app('router')->getMiddleware()['install'] ?? null)->toBe(EnsureInstalled::class)
+        ->and(app('router')->getMiddleware()['redirect-if-installed'] ?? null)->toBe(RedirectIfInstalled::class)
+        ->and(app()->make(UseInstallWizardTokenAuth::class))->toBeInstanceOf(UseInstallWizardTokenAuth::class);
+});
diff --git a/tests/Feature/Architecture/PdfPlatformBoundaryTest.php b/tests/Feature/Architecture/PdfPlatformBoundaryTest.php
new file mode 100644
index 00000000..54ff9e04
--- /dev/null
+++ b/tests/Feature/Architecture/PdfPlatformBoundaryTest.php
@@ -0,0 +1,56 @@
+<?php
+
+use App\Platform\Pdf\Application\PdfConfigurationService;
+use App\Platform\Pdf\Contracts\PdfConfigurator;
+use App\Platform\Pdf\Http\Admin\FontController;
+use App\Platform\Pdf\Http\Admin\PdfConfigurationController;
+use App\Platform\Pdf\Http\Middleware\PdfMiddleware;
+use App\Platform\Pdf\PdfServiceProvider;
+use App\Platform\Pdf\Rendering\PdfService;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the pdf platform owns rendering configuration fonts and authorization', function () {
+    expect(app()->getProviders(PdfServiceProvider::class))->toHaveCount(1)
+        ->and(app('pdf.driver'))->toBeInstanceOf(PdfService::class)
+        ->and(app(PdfConfigurator::class))->toBeInstanceOf(PdfConfigurationService::class)
+        ->and(Gate::has('manage pdf config'))->toBeTrue()
+        ->and(Artisan::all())->toHaveKeys(['make:template', 'pdf:compare']);
+
+    expect(class_exists('App\\Providers\\PdfServiceProvider'))->toBeFalse()
+        ->and(class_exists('App\\Services\\FontService'))->toBeFalse()
+        ->and(class_exists('App\\Facades\\Pdf'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Admin\\FontController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Admin\\Settings\\PDFConfigurationController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\PDFConfigurationRequest'))->toBeFalse()
+        ->and(class_exists('App\\Console\\Commands\\ComparePdfDriversCommand'))->toBeFalse()
+        ->and(trait_exists('App\\Traits\\GeneratesPdfTrait'))->toBeFalse()
+        ->and(is_dir(app_path('Support/Pdf')))->toBeFalse();
+});
+
+test('the pdf platform preserves its public configuration routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => preg_match('#^api/v1/(?:fonts/|pdf/)#', $route->uri()) === 1)
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'GET|HEAD api/v1/fonts/status',
+        'GET|HEAD api/v1/pdf/config',
+        'GET|HEAD api/v1/pdf/drivers',
+        'POST api/v1/fonts/{package}/install',
+        'POST api/v1/pdf/config',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())->toStartWith('App\\Platform\\Pdf\\Http\\Admin\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+
+    expect($routes->get('GET|HEAD api/v1/fonts/status')->getActionName())
+        ->toBe(FontController::class.'@status')
+        ->and($routes->get('GET|HEAD api/v1/pdf/config')->getActionName())
+        ->toBe(PdfConfigurationController::class.'@getEnvironment')
+        ->and(app('router')->getMiddleware()['pdf-auth'] ?? null)
+        ->toBe(PdfMiddleware::class);
+});
diff --git a/tests/Feature/Architecture/PurchasesDomainBoundaryTest.php b/tests/Feature/Architecture/PurchasesDomainBoundaryTest.php
new file mode 100644
index 00000000..46369997
--- /dev/null
+++ b/tests/Feature/Architecture/PurchasesDomainBoundaryTest.php
@@ -0,0 +1,99 @@
+<?php
+
+use App\Adapters\Purchases\MediaLibraryExpenseReceiptManager;
+use App\Adapters\Purchases\MoneyExpenseExchangeRateRecorder;
+use App\Adapters\Purchases\TaxationExpenseTaxManager;
+use App\Domains\Purchases\Contracts\ExpenseExchangeRateRecorder;
+use App\Domains\Purchases\Contracts\ExpenseReceiptManager;
+use App\Domains\Purchases\Contracts\ExpenseTaxManager;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Purchases\Models\ExpenseCategory;
+use App\Domains\Purchases\Policies\ExpenseCategoryPolicy;
+use App\Domains\Purchases\Policies\ExpensePolicy;
+use App\Domains\Purchases\PurchasesServiceProvider;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the purchases domain owns expense behavior and authorization', function () {
+    expect(app()->getProviders(PurchasesServiceProvider::class))->toHaveCount(1)
+        ->and(app(ExpenseTaxManager::class))->toBeInstanceOf(TaxationExpenseTaxManager::class)
+        ->and(app(ExpenseExchangeRateRecorder::class))->toBeInstanceOf(MoneyExpenseExchangeRateRecorder::class)
+        ->and(app(ExpenseReceiptManager::class))->toBeInstanceOf(MediaLibraryExpenseReceiptManager::class)
+        ->and(Gate::getPolicyFor(Expense::class))->toBeInstanceOf(ExpensePolicy::class)
+        ->and(Gate::getPolicyFor(ExpenseCategory::class))->toBeInstanceOf(ExpenseCategoryPolicy::class)
+        ->and(Gate::has('delete multiple expenses'))->toBeTrue();
+
+    expect(class_exists('App\\Services\\Document\\ExpenseService'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\ExpensePolicy'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\ExpenseCategoryPolicy'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Expense\\ExpensesController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Expense\\ExpenseCategoriesController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\CustomerPortal\\Expense\\ExpensesController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\ExpenseRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\ExpenseCategoryRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\DeleteExpensesRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\UploadExpenseReceiptRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\ExpenseResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\ExpenseCategoryResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\ExpenseCollection'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\ExpenseCategoryCollection'))->toBeFalse();
+
+    expect(class_exists('App\\Http\\Resources\\Customer\\ExpenseResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\Customer\\ExpenseCategoryResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\Customer\\ExpenseCollection'))->toBeFalse();
+});
+
+test('the purchases domain preserves company expense routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => preg_match('#^api/v1/(?:expenses|categories)(?:$|/)#', $route->uri()) === 1)
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'DELETE api/v1/categories/{category}',
+        'DELETE api/v1/expenses/{expense}',
+        'GET|HEAD api/v1/categories',
+        'GET|HEAD api/v1/categories/{category}',
+        'GET|HEAD api/v1/expenses',
+        'GET|HEAD api/v1/expenses/{expense}',
+        'GET|HEAD api/v1/expenses/{expense}/show/receipt',
+        'POST api/v1/categories',
+        'POST api/v1/expenses',
+        'POST api/v1/expenses/delete',
+        'POST api/v1/expenses/{expense}/upload/receipts',
+        'PUT|PATCH api/v1/categories/{category}',
+        'PUT|PATCH api/v1/expenses/{expense}',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Purchases\\Http\\Controllers\\Company\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+});
+
+test('the purchases domain preserves customer and receipt web routes', function () {
+    $customerRoutes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => str_starts_with($route->uri(), 'api/v1/{company}/customer/expenses'));
+
+    expect($customerRoutes)->toHaveCount(2);
+
+    foreach ($customerRoutes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Purchases\\Http\\Controllers\\CustomerPortal\\')
+            ->and($route->gatherMiddleware())->toContain('auth:customer', 'customer-portal');
+    }
+
+    $receiptRoutes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => in_array($route->uri(), [
+            'reports/expenses/{expense}/download-receipt',
+            'reports/expenses/{expense}/receipt',
+        ], true));
+
+    expect($receiptRoutes)->toHaveCount(2);
+
+    foreach ($receiptRoutes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Purchases\\Http\\Controllers\\Company\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum');
+    }
+});
diff --git a/tests/Feature/Architecture/ReceivablesDomainBoundaryTest.php b/tests/Feature/Architecture/ReceivablesDomainBoundaryTest.php
new file mode 100644
index 00000000..4f45a3f7
--- /dev/null
+++ b/tests/Feature/Architecture/ReceivablesDomainBoundaryTest.php
@@ -0,0 +1,123 @@
+<?php
+
+use App\Adapters\Receivables\LaravelPaymentEmailSender;
+use App\Adapters\Receivables\MoneyPaymentExchangeRateRecorder;
+use App\Adapters\Receivables\SalesInvoiceBalanceUpdater;
+use App\Adapters\Receivables\SalesPaymentNumberAssigner;
+use App\Domains\Receivables\Application\PaymentService;
+use App\Domains\Receivables\Contracts\InvoiceBalanceUpdater;
+use App\Domains\Receivables\Contracts\PaymentEmailSender;
+use App\Domains\Receivables\Contracts\PaymentExchangeRateRecorder;
+use App\Domains\Receivables\Contracts\PaymentNumberAssigner;
+use App\Domains\Receivables\Contracts\PaymentPdfDataProvider;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentMethod;
+use App\Domains\Receivables\Policies\PaymentMethodPolicy;
+use App\Domains\Receivables\Policies\PaymentPolicy;
+use App\Domains\Receivables\ReceivablesServiceProvider;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the receivables domain owns payment behavior and authorization', function () {
+    expect(app()->getProviders(ReceivablesServiceProvider::class))->toHaveCount(1)
+        ->and(app(PaymentPdfDataProvider::class))->toBeInstanceOf(PaymentService::class)
+        ->and(app(InvoiceBalanceUpdater::class))->toBeInstanceOf(SalesInvoiceBalanceUpdater::class)
+        ->and(app(PaymentNumberAssigner::class))->toBeInstanceOf(SalesPaymentNumberAssigner::class)
+        ->and(app(PaymentExchangeRateRecorder::class))->toBeInstanceOf(MoneyPaymentExchangeRateRecorder::class)
+        ->and(app(PaymentEmailSender::class))->toBeInstanceOf(LaravelPaymentEmailSender::class)
+        ->and(Gate::getPolicyFor(Payment::class))->toBeInstanceOf(PaymentPolicy::class)
+        ->and(Gate::getPolicyFor(PaymentMethod::class))->toBeInstanceOf(PaymentMethodPolicy::class)
+        ->and(Gate::has('send payment'))->toBeTrue()
+        ->and(Gate::has('delete multiple payments'))->toBeTrue();
+
+    foreach ([
+        'App\\Services\\Document\\PaymentService',
+        'App\\Services\\Document\\PaymentAllocationService',
+        'App\\Policies\\PaymentPolicy',
+        'App\\Policies\\PaymentMethodPolicy',
+        'App\\Jobs\\GeneratePaymentPdfJob',
+        'App\\Mail\\SendPaymentMail',
+        'App\\Http\\Controllers\\Company\\Payment\\PaymentsController',
+        'App\\Http\\Controllers\\Company\\Payment\\PaymentMethodsController',
+        'App\\Http\\Controllers\\Company\\Payment\\CreditAllocationsController',
+        'App\\Http\\Controllers\\CustomerPortal\\Payment\\PaymentsController',
+        'App\\Http\\Controllers\\CustomerPortal\\Payment\\PaymentMethodController',
+        'App\\Http\\Controllers\\CustomerPortal\\PaymentPdfController',
+        'App\\Http\\Requests\\PaymentRequest',
+        'App\\Http\\Requests\\PaymentMethodRequest',
+        'App\\Http\\Requests\\DeletePaymentsRequest',
+        'App\\Http\\Requests\\ReplacePaymentAllocationsRequest',
+        'App\\Http\\Requests\\CreditAllocationRequest',
+        'App\\Http\\Requests\\SendPaymentRequest',
+        'App\\Http\\Resources\\PaymentResource',
+        'App\\Http\\Resources\\PaymentMethodResource',
+        'App\\Http\\Resources\\PaymentCollection',
+        'App\\Http\\Resources\\PaymentMethodCollection',
+        'App\\Http\\Resources\\TransactionResource',
+        'App\\Http\\Resources\\Customer\\PaymentResource',
+        'App\\Http\\Resources\\Customer\\PaymentMethodResource',
+        'App\\Http\\Resources\\Customer\\PaymentCollection',
+        'App\\Http\\Resources\\Customer\\PaymentMethodCollection',
+        'App\\Http\\Resources\\Customer\\TransactionResource',
+    ] as $legacyClass) {
+        expect(class_exists($legacyClass))->toBeFalse();
+    }
+});
+
+test('the receivables domain preserves company payment routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => preg_match('#^api/v1/(?:payments|payment-methods)(?:$|/)#', $route->uri()) === 1
+            || $route->uri() === 'api/v1/customers/{customer}/credit-allocations')
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'DELETE api/v1/payment-methods/{payment_method}',
+        'DELETE api/v1/payments/{payment}',
+        'GET|HEAD api/v1/payment-methods',
+        'GET|HEAD api/v1/payment-methods/{payment_method}',
+        'GET|HEAD api/v1/payments',
+        'GET|HEAD api/v1/payments/{payment}',
+        'GET|HEAD api/v1/payments/{payment}/send/preview',
+        'POST api/v1/customers/{customer}/credit-allocations',
+        'POST api/v1/payment-methods',
+        'POST api/v1/payments',
+        'POST api/v1/payments/delete',
+        'POST api/v1/payments/{payment}/send',
+        'PUT api/v1/payments/{payment}/allocations',
+        'PUT|PATCH api/v1/payment-methods/{payment_method}',
+        'PUT|PATCH api/v1/payments/{payment}',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Receivables\\Http\\Controllers\\Company\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+});
+
+test('the receivables domain preserves customer and pdf routes', function () {
+    $customerRoutes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => str_starts_with($route->uri(), 'api/v1/{company}/customer/payments')
+            || $route->uri() === 'api/v1/{company}/customer/payment-method');
+
+    expect($customerRoutes)->toHaveCount(3);
+
+    foreach ($customerRoutes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Receivables\\Http\\Controllers\\CustomerPortal\\')
+            ->and($route->gatherMiddleware())->toContain('auth:customer', 'customer-portal');
+    }
+
+    $pdfRoutes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => in_array($route->uri(), [
+            'payments/pdf/{payment}',
+            'customer/payments/{email_log}',
+            'customer/payments/view/{email_log}',
+        ], true));
+
+    expect($pdfRoutes)->toHaveCount(3);
+
+    foreach ($pdfRoutes as $route) {
+        expect($route->getActionName())->toStartWith('App\\Domains\\Receivables\\Http\\Controllers\\');
+    }
+});
diff --git a/tests/Feature/Architecture/ReportingDomainBoundaryTest.php b/tests/Feature/Architecture/ReportingDomainBoundaryTest.php
new file mode 100644
index 00000000..1757f1f4
--- /dev/null
+++ b/tests/Feature/Architecture/ReportingDomainBoundaryTest.php
@@ -0,0 +1,92 @@
+<?php
+
+use App\Domains\Reporting\Queries\CustomerStatementQuery;
+use App\Domains\Reporting\Rendering\CustomerStatementPdfRenderer;
+use App\Domains\Reporting\ReportingServiceProvider;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the reporting domain owns report queries rendering and authorization', function () {
+    expect(app()->getProviders(ReportingServiceProvider::class))->toHaveCount(1)
+        ->and(app(CustomerStatementQuery::class))->toBeInstanceOf(CustomerStatementQuery::class)
+        ->and(app(CustomerStatementPdfRenderer::class))->toBeInstanceOf(CustomerStatementPdfRenderer::class)
+        ->and(Gate::has('view dashboard'))->toBeTrue()
+        ->and(Gate::has('view report'))->toBeTrue();
+
+    expect(class_exists('App\\Policies\\ReportPolicy'))->toBeFalse()
+        ->and(class_exists('App\\Services\\CustomerStatementService'))->toBeFalse()
+        ->and(class_exists('App\\Services\\CustomerStatementPdfService'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\CustomerStatementRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\SendCustomerStatementRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\CustomerStatementResource'))->toBeFalse()
+        ->and(class_exists('App\\Mail\\SendCustomerStatementMail'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Customer\\CustomerStatementController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Customer\\SendCustomerStatementController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Dashboard\\DashboardController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\General\\SearchController'))->toBeFalse()
+        ->and(class_exists('App\\Policies\\DashboardPolicy'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Report\\CustomerSalesReportController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Report\\CustomerStatementReportController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Report\\ExpensesReportController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Report\\ItemSalesReportController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Report\\ProfitLossReportController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Report\\TaxSummaryReportController'))->toBeFalse();
+});
+
+test('the reporting domain owns dashboard and search projections', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => in_array($route->uri(), [
+            'api/v1/dashboard',
+            'api/v1/search',
+            'api/v1/search/user',
+        ], true));
+
+    expect($routes)->toHaveCount(3);
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Reporting\\Http\\Controllers\\Company\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+});
+
+test('the reporting domain preserves customer statement api routes', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => in_array($route->uri(), [
+            'api/v1/customers/{customer}/statement',
+            'api/v1/customers/{customer}/statement/send',
+        ], true));
+
+    expect($routes)->toHaveCount(2);
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Reporting\\Http\\Controllers\\Company\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+});
+
+test('the reporting domain preserves authenticated report routes', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => preg_match(
+            '#^reports/(?:customers/[^/]+/statement|sales/(?:customers|items)/[^/]+|expenses/[^/]+|tax-summary/[^/]+|profit-loss/[^/]+)$#',
+            $route->uri(),
+        ) === 1)
+        ->reject(fn ($route): bool => str_contains($route->uri(), 'download-receipt') || str_contains($route->uri(), 'receipt'))
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'GET|HEAD reports/customers/{customer}/statement',
+        'GET|HEAD reports/expenses/{hash}',
+        'GET|HEAD reports/profit-loss/{hash}',
+        'GET|HEAD reports/sales/customers/{hash}',
+        'GET|HEAD reports/sales/items/{hash}',
+        'GET|HEAD reports/tax-summary/{hash}',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Reporting\\Http\\Controllers\\')
+            ->and($route->gatherMiddleware())->toContain('web', 'auth:sanctum');
+    }
+});
diff --git a/tests/Feature/Architecture/SalesDomainBoundaryTest.php b/tests/Feature/Architecture/SalesDomainBoundaryTest.php
new file mode 100644
index 00000000..0f50ff4f
--- /dev/null
+++ b/tests/Feature/Architecture/SalesDomainBoundaryTest.php
@@ -0,0 +1,124 @@
+<?php
+
+use App\Adapters\Sales\LaravelEstimateEmailSender;
+use App\Adapters\Sales\LaravelInvoiceEmailSender;
+use App\Adapters\Sales\MoneyDocumentExchangeRateRecorder;
+use App\Domains\Sales\Application\EstimateService;
+use App\Domains\Sales\Application\InvoiceService;
+use App\Domains\Sales\Contracts\DocumentExchangeRateRecorder;
+use App\Domains\Sales\Contracts\EstimateEmailSender;
+use App\Domains\Sales\Contracts\EstimatePdfDataProvider;
+use App\Domains\Sales\Contracts\InvoiceEmailSender;
+use App\Domains\Sales\Contracts\InvoicePdfDataProvider;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\RecurringInvoice;
+use App\Domains\Sales\Policies\EstimatePolicy;
+use App\Domains\Sales\Policies\InvoicePolicy;
+use App\Domains\Sales\Policies\RecurringInvoicePolicy;
+use App\Domains\Sales\SalesServiceProvider;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the sales domain owns document behavior authorization and commands', function () {
+    expect(app()->getProviders(SalesServiceProvider::class))->toHaveCount(1)
+        ->and(app(EstimatePdfDataProvider::class))->toBeInstanceOf(EstimateService::class)
+        ->and(app(InvoicePdfDataProvider::class))->toBeInstanceOf(InvoiceService::class)
+        ->and(app(DocumentExchangeRateRecorder::class))->toBeInstanceOf(MoneyDocumentExchangeRateRecorder::class)
+        ->and(app(EstimateEmailSender::class))->toBeInstanceOf(LaravelEstimateEmailSender::class)
+        ->and(app(InvoiceEmailSender::class))->toBeInstanceOf(LaravelInvoiceEmailSender::class)
+        ->and(Gate::getPolicyFor(Estimate::class))->toBeInstanceOf(EstimatePolicy::class)
+        ->and(Gate::getPolicyFor(Invoice::class))->toBeInstanceOf(InvoicePolicy::class)
+        ->and(Gate::getPolicyFor(RecurringInvoice::class))->toBeInstanceOf(RecurringInvoicePolicy::class)
+        ->and(Gate::has('send invoice'))->toBeTrue()
+        ->and(Gate::has('create credit note'))->toBeTrue()
+        ->and(Gate::has('send estimate'))->toBeTrue()
+        ->and(Gate::has('delete multiple invoices'))->toBeTrue()
+        ->and(Gate::has('delete multiple estimates'))->toBeTrue()
+        ->and(Gate::has('delete multiple recurring invoices'))->toBeTrue()
+        ->and(Artisan::all())->toHaveKeys(['check:estimates:status', 'check:invoices:status']);
+
+    foreach ([
+        'App\\Services\\Document\\CreditNoteService',
+        'App\\Services\\Document\\DocumentItemService',
+        'App\\Services\\Document\\EstimateService',
+        'App\\Services\\Document\\InvoiceBalanceService',
+        'App\\Services\\Document\\InvoiceService',
+        'App\\Services\\Document\\RecurringInvoiceService',
+        'App\\Services\\Document\\SerialNumberService',
+        'App\\Policies\\CreditNotePolicy',
+        'App\\Policies\\EstimatePolicy',
+        'App\\Policies\\InvoicePolicy',
+        'App\\Policies\\RecurringInvoicePolicy',
+        'App\\Jobs\\GenerateEstimatePdfJob',
+        'App\\Jobs\\GenerateInvoicePdfJob',
+        'App\\Mail\\EstimateViewedMail',
+        'App\\Mail\\InvoiceViewedMail',
+        'App\\Mail\\SendCreditNoteMail',
+        'App\\Mail\\SendEstimateMail',
+        'App\\Mail\\SendInvoiceMail',
+        'App\\Http\\Controllers\\Company\\Estimate\\EstimatesController',
+        'App\\Http\\Controllers\\Company\\Estimate\\EstimateTemplatesController',
+        'App\\Http\\Controllers\\Company\\Invoice\\InvoicesController',
+        'App\\Http\\Controllers\\Company\\Invoice\\InvoiceTemplatesController',
+        'App\\Http\\Controllers\\Company\\RecurringInvoice\\RecurringInvoiceController',
+        'App\\Http\\Controllers\\Company\\RecurringInvoice\\RecurringInvoiceFrequencyController',
+        'App\\Http\\Controllers\\Company\\General\\SerialNumberController',
+        'App\\Http\\Controllers\\CustomerPortal\\Estimate\\AcceptEstimateController',
+        'App\\Http\\Controllers\\CustomerPortal\\Estimate\\EstimatesController',
+        'App\\Http\\Controllers\\CustomerPortal\\Invoice\\InvoicesController',
+        'App\\Http\\Controllers\\CustomerPortal\\EstimatePdfController',
+        'App\\Http\\Controllers\\CustomerPortal\\InvoicePdfController',
+        'App\\Http\\Controllers\\Pdf\\DocumentPdfController',
+    ] as $legacyClass) {
+        expect(class_exists($legacyClass))->toBeFalse();
+    }
+});
+
+test('the sales domain preserves company document routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => preg_match(
+            '#^api/v1/(?:invoices|estimates|recurring-invoices|recurring-invoice-frequency|next-number|number-placeholders)(?:$|/)#',
+            $route->uri(),
+        ) === 1);
+
+    expect($routes)->toHaveCount(34);
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Sales\\Http\\Controllers\\Company\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+});
+
+test('the sales domain preserves customer and pdf routes', function () {
+    $customerRoutes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => str_starts_with($route->uri(), 'api/v1/{company}/customer/invoices')
+            || str_starts_with($route->uri(), 'api/v1/{company}/customer/estimates')
+            || $route->uri() === 'api/v1/{company}/customer/estimate/{estimate}/status');
+
+    expect($customerRoutes)->toHaveCount(5);
+
+    foreach ($customerRoutes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Sales\\Http\\Controllers\\CustomerPortal\\')
+            ->and($route->gatherMiddleware())->toContain('auth:customer', 'customer-portal');
+    }
+
+    $pdfRoutes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => in_array($route->uri(), [
+            'invoices/pdf/{invoice}',
+            'estimates/pdf/{estimate}',
+            'customer/invoices/{email_log}',
+            'customer/invoices/view/{email_log}',
+            'customer/estimates/{email_log}',
+            'customer/estimates/view/{email_log}',
+        ], true));
+
+    expect($pdfRoutes)->toHaveCount(6);
+
+    foreach ($pdfRoutes as $route) {
+        expect($route->getActionName())->toStartWith('App\\Domains\\Sales\\Http\\Controllers\\');
+    }
+});
diff --git a/tests/Feature/Architecture/StoragePlatformBoundaryTest.php b/tests/Feature/Architecture/StoragePlatformBoundaryTest.php
new file mode 100644
index 00000000..870c8756
--- /dev/null
+++ b/tests/Feature/Architecture/StoragePlatformBoundaryTest.php
@@ -0,0 +1,60 @@
+<?php
+
+use App\Platform\Storage\Application\FileDiskService;
+use App\Platform\Storage\Contracts\StorageConfigurator;
+use App\Platform\Storage\Http\BackupsController;
+use App\Platform\Storage\Http\DiskController;
+use App\Platform\Storage\StorageServiceProvider;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the storage platform owns its provider extensions and authorization', function () {
+    expect(app()->getProviders(StorageServiceProvider::class))->toHaveCount(1)
+        ->and(app(StorageConfigurator::class))->toBeInstanceOf(FileDiskService::class)
+        ->and(Gate::has('manage backups'))->toBeTrue()
+        ->and(Gate::has('manage file disk'))->toBeTrue()
+        ->and(Artisan::all())->toHaveKey('media:secure');
+
+    expect(class_exists('App\\Providers\\DropboxServiceProvider'))->toBeFalse()
+        ->and(class_exists('App\\Services\\Storage\\FileDiskService'))->toBeFalse()
+        ->and(class_exists('App\\Jobs\\CreateBackupJob'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Admin\\BackupsController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Admin\\Settings\\DiskController'))->toBeFalse();
+});
+
+test('the storage platform preserves its public routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => preg_match(
+            '#^api/v1/(backups(?:/|$)|disks(?:/|$)|download-backup$|disk/(?:drivers|purposes)$)#',
+            $route->uri(),
+        ) === 1)
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'DELETE api/v1/backups/{backup}',
+        'DELETE api/v1/disks/{disk}',
+        'GET|HEAD api/v1/backups',
+        'GET|HEAD api/v1/backups/{backup}',
+        'GET|HEAD api/v1/disk/drivers',
+        'GET|HEAD api/v1/disk/purposes',
+        'GET|HEAD api/v1/disks',
+        'GET|HEAD api/v1/disks/{disk}',
+        'GET|HEAD api/v1/download-backup',
+        'POST api/v1/backups',
+        'POST api/v1/disks',
+        'PUT api/v1/disk/purposes',
+        'PUT|PATCH api/v1/backups/{backup}',
+        'PUT|PATCH api/v1/disks/{disk}',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())->toStartWith('App\\Platform\\Storage\\Http\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+
+    expect($routes->get('GET|HEAD api/v1/backups')->getActionName())
+        ->toBe(BackupsController::class.'@index')
+        ->and($routes->get('GET|HEAD api/v1/disks')->getActionName())
+        ->toBe(DiskController::class.'@index');
+});
diff --git a/tests/Feature/Architecture/TaxationDomainBoundaryTest.php b/tests/Feature/Architecture/TaxationDomainBoundaryTest.php
new file mode 100644
index 00000000..1dd2a29b
--- /dev/null
+++ b/tests/Feature/Architecture/TaxationDomainBoundaryTest.php
@@ -0,0 +1,40 @@
+<?php
+
+use App\Domains\Taxation\Models\TaxType;
+use App\Domains\Taxation\Policies\TaxTypePolicy;
+use App\Domains\Taxation\TaxationServiceProvider;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Route;
+
+test('the taxation domain owns tax-type authorization and HTTP adapters', function () {
+    expect(app()->getProviders(TaxationServiceProvider::class))->toHaveCount(1)
+        ->and(Gate::getPolicyFor(TaxType::class))->toBeInstanceOf(TaxTypePolicy::class);
+
+    expect(class_exists('App\\Policies\\TaxTypePolicy'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Controllers\\Company\\Settings\\TaxTypesController'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Requests\\TaxTypeRequest'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\TaxTypeResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\TaxResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\Customer\\TaxTypeResource'))->toBeFalse()
+        ->and(class_exists('App\\Http\\Resources\\Customer\\TaxResource'))->toBeFalse();
+});
+
+test('the taxation domain preserves tax-type routes and middleware', function () {
+    $routes = collect(Route::getRoutes()->getRoutes())
+        ->filter(fn ($route): bool => str_starts_with($route->uri(), 'api/v1/tax-types'))
+        ->keyBy(fn ($route): string => implode('|', $route->methods()).' '.$route->uri());
+
+    expect($routes->keys()->sort()->values()->all())->toBe(collect([
+        'DELETE api/v1/tax-types/{tax_type}',
+        'GET|HEAD api/v1/tax-types',
+        'GET|HEAD api/v1/tax-types/{tax_type}',
+        'POST api/v1/tax-types',
+        'PUT|PATCH api/v1/tax-types/{tax_type}',
+    ])->sort()->values()->all());
+
+    foreach ($routes as $route) {
+        expect($route->getActionName())
+            ->toStartWith('App\\Domains\\Taxation\\Http\\Controllers\\')
+            ->and($route->gatherMiddleware())->toContain('auth:sanctum', 'company', 'bouncer');
+    }
+});
diff --git a/tests/Feature/Company/BootstrapSecurityTest.php b/tests/Feature/Company/BootstrapSecurityTest.php
index 9ed247a2..56aab0e6 100644
--- a/tests/Feature/Company/BootstrapSecurityTest.php
+++ b/tests/Feature/Company/BootstrapSecurityTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Setting;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Company/CompanyMailConfigurationControllerTest.php b/tests/Feature/Company/CompanyMailConfigurationControllerTest.php
index ef2bf60a..4ad702c0 100644
--- a/tests/Feature/Company/CompanyMailConfigurationControllerTest.php
+++ b/tests/Feature/Company/CompanyMailConfigurationControllerTest.php
@@ -1,10 +1,9 @@
 <?php
 
-use App\Models\CompanySetting;
-use App\Models\Setting;
-use App\Models\User;
-use App\Services\Mail\CompanyMailConfigService;
-use App\Services\Mail\MailConfigurationService;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Mail\Application\MailConfigurationService;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
@@ -101,7 +100,7 @@ test('company mail runtime apply maps postmark settings into laravel config', fu
         'company_from_mail' => 'runtime@example.com',
     ], $this->companyId);
 
-    CompanyMailConfigService::apply($this->companyId);
+    app(MailConfigurationService::class)->applyCompanyConfig($this->companyId);
 
     expect(config('mail.default'))->toBe('postmark');
     expect(config('services.postmark.token'))->toBe('runtime-postmark-token');
diff --git a/tests/Feature/Company/ExchangeRate/BulkExchangeRateTest.php b/tests/Feature/Company/ExchangeRate/BulkExchangeRateTest.php
new file mode 100644
index 00000000..df4c67ff
--- /dev/null
+++ b/tests/Feature/Company/ExchangeRate/BulkExchangeRateTest.php
@@ -0,0 +1,53 @@
+<?php
+
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Sales\Models\Invoice;
+use Illuminate\Support\Facades\Artisan;
+use Laravel\Sanctum\Sanctum;
+
+use function Pest\Laravel\postJson;
+
+beforeEach(function () {
+    Artisan::call('db:seed', ['--class' => 'DatabaseSeeder', '--force' => true]);
+    Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]);
+
+    $this->user = User::findOrFail(1);
+    $this->companyId = $this->user->companies()->firstOrFail()->id;
+    $this->withHeaders(['company' => $this->companyId]);
+    Sanctum::actingAs($this->user, ['*']);
+});
+
+test('bulk exchange-rate setup still updates legacy documents through the domain contract', function () {
+    CompanySetting::setSettings(['bulk_exchange_rate_configured' => 'NO'], $this->companyId);
+
+    $currency = Currency::findOrFail(1);
+    $invoice = Invoice::factory()->create([
+        'company_id' => $this->companyId,
+        'currency_id' => $currency->id,
+        'sub_total' => 100,
+        'total' => 140,
+        'tax' => 20,
+        'due_amount' => 80,
+        'exchange_rate' => null,
+    ]);
+
+    postJson('/api/v1/currencies/bulk-update-exchange-rate', [
+        'currencies' => [[
+            'id' => $currency->id,
+            'exchange_rate' => 2,
+        ]],
+    ])->assertOk()->assertJson(['success' => true]);
+
+    $invoice->refresh();
+
+    expect($invoice->exchange_rate)->toBe(2.0)
+        ->and($invoice->base_discount_val)->toBe(200)
+        ->and($invoice->base_sub_total)->toBe(200)
+        ->and($invoice->base_total)->toBe(280)
+        ->and($invoice->base_tax)->toBe(40)
+        ->and($invoice->base_due_amount)->toBe(160)
+        ->and(CompanySetting::getSetting('bulk_exchange_rate_configured', $this->companyId))
+        ->toBe('YES');
+});
diff --git a/tests/Feature/Company/ExchangeRate/ExchangeRateDriverListTest.php b/tests/Feature/Company/ExchangeRate/ExchangeRateDriverListTest.php
index 332dbc0a..ab3d3981 100644
--- a/tests/Feature/Company/ExchangeRate/ExchangeRateDriverListTest.php
+++ b/tests/Feature/Company/ExchangeRate/ExchangeRateDriverListTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use InvoiceShelf\Modules\Registry;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Company/ExchangeRate/ExchangeRateSsrfTest.php b/tests/Feature/Company/ExchangeRate/ExchangeRateSsrfTest.php
index 907a5bd9..0a6e0d49 100644
--- a/tests/Feature/Company/ExchangeRate/ExchangeRateSsrfTest.php
+++ b/tests/Feature/Company/ExchangeRate/ExchangeRateSsrfTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Company/Modules/BootstrapModuleMenuTest.php b/tests/Feature/Company/Modules/BootstrapModuleMenuTest.php
index f011457f..83bc320d 100644
--- a/tests/Feature/Company/Modules/BootstrapModuleMenuTest.php
+++ b/tests/Feature/Company/Modules/BootstrapModuleMenuTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use InvoiceShelf\Modules\Registry;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Company/Modules/CompanyModulesIndexTest.php b/tests/Feature/Company/Modules/CompanyModulesIndexTest.php
index f73f2a51..bd7d4fb7 100644
--- a/tests/Feature/Company/Modules/CompanyModulesIndexTest.php
+++ b/tests/Feature/Company/Modules/CompanyModulesIndexTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Module;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Modules\Models\Module;
 use Illuminate\Support\Facades\Artisan;
 use InvoiceShelf\Modules\Registry;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Company/Modules/ModuleSettingsControllerTest.php b/tests/Feature/Company/Modules/ModuleSettingsControllerTest.php
index c4918682..c76ff75b 100644
--- a/tests/Feature/Company/Modules/ModuleSettingsControllerTest.php
+++ b/tests/Feature/Company/Modules/ModuleSettingsControllerTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\CompanySetting;
-use App\Models\User;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 use InvoiceShelf\Modules\Registry;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Customer/AuthTest.php b/tests/Feature/Customer/AuthTest.php
index e9bb9a5d..31b41dfa 100644
--- a/tests/Feature/Customer/AuthTest.php
+++ b/tests/Feature/Customer/AuthTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Customer;
+use App\Domains\Contacts\Models\Customer;
 use Illuminate\Support\Facades\Artisan;
 
 use function Pest\Laravel\postJson;
diff --git a/tests/Feature/Customer/DashboardTest.php b/tests/Feature/Customer/DashboardTest.php
index 0b2b598b..66eb63c2 100644
--- a/tests/Feature/Customer/DashboardTest.php
+++ b/tests/Feature/Customer/DashboardTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature\Customer;
 
-use App\Models\Customer;
+use App\Domains\Contacts\Models\Customer;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Customer/EmailLogTokenTest.php b/tests/Feature/Customer/EmailLogTokenTest.php
index 84cd4ece..db0c1b36 100644
--- a/tests/Feature/Customer/EmailLogTokenTest.php
+++ b/tests/Feature/Customer/EmailLogTokenTest.php
@@ -2,10 +2,10 @@
 
 namespace Tests\Feature\Customer;
 
-use App\Models\CompanySetting;
-use App\Models\EmailLog;
-use App\Models\Invoice;
-use App\Models\Payment;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Mail\Models\EmailLog;
 use Illuminate\Support\Facades\Artisan;
 
 use function Pest\Laravel\get;
diff --git a/tests/Feature/Customer/EstimateTest.php b/tests/Feature/Customer/EstimateTest.php
index 77fcf1ab..b9698f16 100644
--- a/tests/Feature/Customer/EstimateTest.php
+++ b/tests/Feature/Customer/EstimateTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Customer;
 
-use App\Models\Customer;
-use App\Models\Estimate;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\Estimate;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Customer/ExpenseTest.php b/tests/Feature/Customer/ExpenseTest.php
index d3e64c7b..31d037d9 100644
--- a/tests/Feature/Customer/ExpenseTest.php
+++ b/tests/Feature/Customer/ExpenseTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Customer;
 
-use App\Models\Customer;
-use App\Models\Expense;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Purchases\Models\Expense;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Customer/InvoiceTest.php b/tests/Feature/Customer/InvoiceTest.php
index 09a57062..2a31def4 100644
--- a/tests/Feature/Customer/InvoiceTest.php
+++ b/tests/Feature/Customer/InvoiceTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Customer;
 
-use App\Models\Customer;
-use App\Models\Invoice;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Customer/PaymentTest.php b/tests/Feature/Customer/PaymentTest.php
index 4a82071a..92fc7eb4 100644
--- a/tests/Feature/Customer/PaymentTest.php
+++ b/tests/Feature/Customer/PaymentTest.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Feature\Customer;
 
-use App\Models\Customer;
-use App\Models\Payment;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Models\Payment;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Customer/ProfileTest.php b/tests/Feature/Customer/ProfileTest.php
index 81bc241f..f0741baf 100644
--- a/tests/Feature/Customer/ProfileTest.php
+++ b/tests/Feature/Customer/ProfileTest.php
@@ -2,9 +2,10 @@
 
 namespace Tests\Feature\Customer;
 
-use App\Http\Controllers\CustomerPortal\General\ProfileController;
-use App\Http\Requests\Customer\CustomerProfileRequest;
-use App\Models\Customer;
+use App\Domains\Contacts\Http\Controllers\CustomerPortal\ProfileController;
+use App\Domains\Contacts\Http\Requests\CustomerPortal\CustomerProfileRequest;
+use App\Domains\Contacts\Models\Address;
+use App\Domains\Contacts\Models\Customer;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Laravel\Sanctum\Sanctum;
@@ -60,3 +61,29 @@ test('get customer', function () {
 
     getJson("api/v1/{$customer->company->slug}/customer/me")->assertOk();
 });
+
+test('updating one address does not replace the other address', function () {
+    $customer = Auth::guard('customer')->user();
+    $billing = Address::factory()->create([
+        'customer_id' => $customer->id,
+        'type' => Address::BILLING_TYPE,
+        'name' => 'Old Billing',
+    ]);
+    $shipping = Address::factory()->create([
+        'customer_id' => $customer->id,
+        'type' => Address::SHIPPING_TYPE,
+        'name' => 'Existing Shipping',
+    ]);
+
+    postJson("api/v1/{$customer->company->slug}/customer/profile", [
+        'billing' => [
+            'name' => 'New Billing',
+            'address_street_1' => 'Billing Street',
+        ],
+    ])->assertOk();
+
+    expect($customer->fresh()->billingAddress->name)->toBe('New Billing')
+        ->and($customer->fresh()->shippingAddress->is($shipping))->toBeTrue();
+
+    $this->assertDatabaseMissing('addresses', ['id' => $billing->id]);
+});
diff --git a/tests/Feature/CustomerStatementTest.php b/tests/Feature/CustomerStatementTest.php
index df67fc35..ad693782 100644
--- a/tests/Feature/CustomerStatementTest.php
+++ b/tests/Feature/CustomerStatementTest.php
@@ -1,13 +1,13 @@
 <?php
 
-use App\Mail\SendCustomerStatementMail;
-use App\Models\Company;
-use App\Models\Customer;
-use App\Models\EmailLog;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Reporting\Mail\SendCustomerStatementMail;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Mail\Models\EmailLog;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Mail;
@@ -192,7 +192,7 @@ test('sending a statement attaches the live PDF and logs it against the customer
     $sent->build();
 
     expect(EmailLog::query()
-        ->where('mailable_type', Customer::class)
+        ->where('mailable_type', $customer->getMorphClass())
         ->where('mailable_id', $customer->id)
         ->where('from', 'configured@example.test')
         ->exists())->toBeTrue();
diff --git a/tests/Feature/Marketplace/CanonicalJsonTest.php b/tests/Feature/Marketplace/CanonicalJsonTest.php
index ea829b5d..7ce5d354 100644
--- a/tests/Feature/Marketplace/CanonicalJsonTest.php
+++ b/tests/Feature/Marketplace/CanonicalJsonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Services\Marketplace\CanonicalJson;
+use App\Platform\Modules\Marketplace\CanonicalJson;
 
 it('canonicalizes signed manifests recursively without changing list order', function () {
     $manifest = [
diff --git a/tests/Feature/Marketplace/MarketplaceClientTest.php b/tests/Feature/Marketplace/MarketplaceClientTest.php
index 2633a313..28e0c33e 100644
--- a/tests/Feature/Marketplace/MarketplaceClientTest.php
+++ b/tests/Feature/Marketplace/MarketplaceClientTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Services\Marketplace\MarketplaceClient;
+use App\Platform\Modules\Marketplace\MarketplaceClient;
 use Illuminate\Support\Facades\Http;
 
 it('downloads HTTP artifacts from the configured local marketplace origin', function () {
diff --git a/tests/Feature/Marketplace/MarketplaceInstallerTest.php b/tests/Feature/Marketplace/MarketplaceInstallerTest.php
index 06cb8dba..ca2b20e3 100644
--- a/tests/Feature/Marketplace/MarketplaceInstallerTest.php
+++ b/tests/Feature/Marketplace/MarketplaceInstallerTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\Module;
-use App\Services\Marketplace\CanonicalJson;
-use App\Services\Marketplace\MarketplaceInstaller;
+use App\Platform\Modules\Marketplace\CanonicalJson;
+use App\Platform\Modules\Marketplace\MarketplaceInstaller;
+use App\Platform\Modules\Models\Module;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
 
diff --git a/tests/Feature/Marketplace/MarketplacePairingTest.php b/tests/Feature/Marketplace/MarketplacePairingTest.php
index c538c458..75ed68c8 100644
--- a/tests/Feature/Marketplace/MarketplacePairingTest.php
+++ b/tests/Feature/Marketplace/MarketplacePairingTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\MarketplaceCredential;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Modules\Models\MarketplaceCredential;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Http;
diff --git a/tests/Feature/Marketplace/ModuleRuntimeAutoloaderTest.php b/tests/Feature/Marketplace/ModuleRuntimeAutoloaderTest.php
index ca960929..7ded7774 100644
--- a/tests/Feature/Marketplace/ModuleRuntimeAutoloaderTest.php
+++ b/tests/Feature/Marketplace/ModuleRuntimeAutoloaderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Services\Marketplace\ModuleRuntimeAutoloader;
+use App\Platform\Modules\Runtime\ModuleRuntimeAutoloader;
 use Illuminate\Support\Facades\File;
 use Modules\AutoloadProbe\Providers\AutoloadProbeServiceProvider;
 
diff --git a/tests/Feature/Modules/ModuleAssetCacheTest.php b/tests/Feature/Modules/ModuleAssetCacheTest.php
index 77ff1f72..0aac8d6e 100644
--- a/tests/Feature/Modules/ModuleAssetCacheTest.php
+++ b/tests/Feature/Modules/ModuleAssetCacheTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Support\Module\ModuleAssetVersion;
+use App\Platform\Modules\Runtime\ModuleAssetVersion;
 use Illuminate\Support\Facades\File;
 use InvoiceShelf\Modules\Registry;
 
diff --git a/tests/Feature/PaymentAllocationTest.php b/tests/Feature/PaymentAllocationTest.php
index e17ac3ca..ca046b0a 100644
--- a/tests/Feature/PaymentAllocationTest.php
+++ b/tests/Feature/PaymentAllocationTest.php
@@ -1,13 +1,13 @@
 <?php
 
-use App\Jobs\GeneratePaymentPdfJob;
-use App\Models\Currency;
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
-use App\Models\User;
-use App\Services\Document\PaymentAllocationService;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Receivables\Application\PaymentAllocationService;
+use App\Domains\Receivables\Jobs\GeneratePaymentPdfJob;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Queue;
diff --git a/tests/Feature/Pdf/ComparePdfDriversCommandTest.php b/tests/Feature/Pdf/ComparePdfDriversCommandTest.php
index e12c7cbe..5312416f 100644
--- a/tests/Feature/Pdf/ComparePdfDriversCommandTest.php
+++ b/tests/Feature/Pdf/ComparePdfDriversCommandTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Invoice;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 use Symfony\Component\Console\Command\Command;
diff --git a/tests/Feature/Pdf/CustomTemplateCommandTest.php b/tests/Feature/Pdf/CustomTemplateCommandTest.php
index 6fea6c1b..1d1f2f58 100644
--- a/tests/Feature/Pdf/CustomTemplateCommandTest.php
+++ b/tests/Feature/Pdf/CustomTemplateCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Feature/Pdf/CustomTemplatePartialsTest.php b/tests/Feature/Pdf/CustomTemplatePartialsTest.php
index ebaf4ed0..8f57770c 100644
--- a/tests/Feature/Pdf/CustomTemplatePartialsTest.php
+++ b/tests/Feature/Pdf/CustomTemplatePartialsTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Invoice;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Feature/Pdf/DemoCompanyProfileTest.php b/tests/Feature/Pdf/DemoCompanyProfileTest.php
index 4daa209d..d875cf90 100644
--- a/tests/Feature/Pdf/DemoCompanyProfileTest.php
+++ b/tests/Feature/Pdf/DemoCompanyProfileTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Models\Company;
-use App\Models\CompanySetting;
-use App\Models\Currency;
-use App\Models\Invoice;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Money\Models\Currency;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Feature/Pdf/PaymentAllocationReceiptTest.php b/tests/Feature/Pdf/PaymentAllocationReceiptTest.php
index fb8f2bb5..a3d7fb1a 100644
--- a/tests/Feature/Pdf/PaymentAllocationReceiptTest.php
+++ b/tests/Feature/Pdf/PaymentAllocationReceiptTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
-use App\Services\Document\PaymentService;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Application\PaymentService;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Feature/Pdf/PdfOverrideTest.php b/tests/Feature/Pdf/PdfOverrideTest.php
index 7c59c5fb..cf8a20b8 100644
--- a/tests/Feature/Pdf/PdfOverrideTest.php
+++ b/tests/Feature/Pdf/PdfOverrideTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\Payment;
-use App\Models\User;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Receivables\Models\Payment;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Feature/Pdf/PdfTemplateFallbackTest.php b/tests/Feature/Pdf/PdfTemplateFallbackTest.php
index 6f4ae5de..1fca18cb 100644
--- a/tests/Feature/Pdf/PdfTemplateFallbackTest.php
+++ b/tests/Feature/Pdf/PdfTemplateFallbackTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Models\User;
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
diff --git a/tests/Feature/Pdf/PdfTemplateListingTest.php b/tests/Feature/Pdf/PdfTemplateListingTest.php
index a8cc9cf7..3d93b84b 100644
--- a/tests/Feature/Pdf/PdfTemplateListingTest.php
+++ b/tests/Feature/Pdf/PdfTemplateListingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Support\Pdf\PdfTemplateUtils;
+use App\Platform\Pdf\Rendering\PdfTemplateUtils;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
 
diff --git a/tests/Feature/Pdf/PdfTemplateRenderTest.php b/tests/Feature/Pdf/PdfTemplateRenderTest.php
index d99b0c17..cd856649 100644
--- a/tests/Feature/Pdf/PdfTemplateRenderTest.php
+++ b/tests/Feature/Pdf/PdfTemplateRenderTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Models\Estimate;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Testing\TestResponse;
@@ -41,7 +41,7 @@ function stockPdfTemplates(string $type): array
  *
  * This used to only assert %PDF appeared somewhere in the first kilobyte: the
  * body carried the status line and headers of an inner Response ahead of the
- * payload, because GeneratesPdfTrait wrapped $pdf->stream() — already a Response
+ * payload, because GeneratesPdf wrapped $pdf->stream() — already a Response
  * — in another response()->make(). Readers scan for the header so nobody
  * noticed, but the bytes were malformed. The trait now passes ->output(), so the
  * position can be asserted, and a regression would be caught rather than
diff --git a/tests/Feature/Pdf/PdfTemplateValidationTest.php b/tests/Feature/Pdf/PdfTemplateValidationTest.php
index 95dcdd74..be650ae9 100644
--- a/tests/Feature/Pdf/PdfTemplateValidationTest.php
+++ b/tests/Feature/Pdf/PdfTemplateValidationTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\User;
-use App\Rules\PdfTemplateExists;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Pdf\Rules\PdfTemplateExists;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Validator;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Pdf/ReportContentTest.php b/tests/Feature/Pdf/ReportContentTest.php
index 972f2cfa..f00078aa 100644
--- a/tests/Feature/Pdf/ReportContentTest.php
+++ b/tests/Feature/Pdf/ReportContentTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Testing\TestResponse;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Pdf/ReportPdfDownloadTest.php b/tests/Feature/Pdf/ReportPdfDownloadTest.php
index 009558a3..8bbf7da2 100644
--- a/tests/Feature/Pdf/ReportPdfDownloadTest.php
+++ b/tests/Feature/Pdf/ReportPdfDownloadTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Facades\Pdf;
-use App\Models\User;
-use App\Support\Pdf\PdfPageSetup;
-use App\Support\Pdf\ResponseStream;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Pdf\Facades\Pdf;
+use App\Platform\Pdf\Rendering\PdfPageSetup;
+use App\Platform\Pdf\Rendering\ResponseStream;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Pdf/TaxSummaryReportTest.php b/tests/Feature/Pdf/TaxSummaryReportTest.php
index 60220cd6..1e79ef17 100644
--- a/tests/Feature/Pdf/TaxSummaryReportTest.php
+++ b/tests/Feature/Pdf/TaxSummaryReportTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use App\Models\Company;
-use App\Models\Expense;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\Tax;
-use App\Models\TaxType;
-use App\Models\User;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Taxation\Models\Tax;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Testing\TestResponse;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Purchases/ExpenseReceiptManagerTest.php b/tests/Feature/Purchases/ExpenseReceiptManagerTest.php
new file mode 100644
index 00000000..fd0e8e20
--- /dev/null
+++ b/tests/Feature/Purchases/ExpenseReceiptManagerTest.php
@@ -0,0 +1,51 @@
+<?php
+
+use App\Domains\Purchases\Contracts\ExpenseReceiptManager;
+use App\Domains\Purchases\Data\PendingExpenseReceipt;
+use App\Domains\Purchases\Models\Expense;
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Storage;
+
+beforeEach(function () {
+    Artisan::call('db:seed', ['--class' => 'DatabaseSeeder', '--force' => true]);
+    Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]);
+});
+
+test('it stores replaces reads and clears expense receipts through the purchases contract', function () {
+    Storage::fake('local');
+
+    $expense = Expense::factory()->create();
+    $manager = app(ExpenseReceiptManager::class);
+
+    $uploadedReceipt = UploadedFile::fake()->create('first-receipt.pdf', 10, 'application/pdf');
+
+    $manager->attach($expense, new PendingExpenseReceipt(
+        $uploadedReceipt->getPathname(),
+        $uploadedReceipt->getClientOriginalName(),
+    ));
+
+    $firstReceipt = $manager->first($expense);
+
+    expect($firstReceipt)->not->toBeNull()
+        ->and($firstReceipt->fileName)->toBe('first-receipt.pdf')
+        ->and($expense->fresh()->getMedia('receipts'))->toHaveCount(1);
+
+    $manager->attachBase64(
+        $expense,
+        'data:image/png;base64,'.base64_encode('replacement receipt'),
+        'replacement.png',
+        replaceExisting: true,
+    );
+
+    $replacement = $manager->first($expense);
+
+    expect($replacement)->not->toBeNull()
+        ->and($replacement->fileName)->toBe('replacement.png')
+        ->and($expense->fresh()->getMedia('receipts'))->toHaveCount(1);
+
+    $manager->clear($expense);
+
+    expect($manager->first($expense))->toBeNull()
+        ->and($expense->fresh()->getMedia('receipts'))->toBeEmpty();
+});
diff --git a/tests/Feature/RealisticDemoSeederTest.php b/tests/Feature/RealisticDemoSeederTest.php
index 102344e1..108bc20b 100644
--- a/tests/Feature/RealisticDemoSeederTest.php
+++ b/tests/Feature/RealisticDemoSeederTest.php
@@ -1,11 +1,11 @@
 <?php
 
-use App\Models\Customer;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
-use App\Models\User;
-use App\Services\CustomerStatementService;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Reporting\Queries\CustomerStatementQuery;
+use App\Domains\Sales\Models\Invoice;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Queue;
@@ -43,14 +43,14 @@ test('realistic demo provides current-month account activity for every customer'
     $company = User::where('email', 'demo@invoiceshelf.com')->firstOrFail()->companies()->firstOrFail();
     $from = Carbon::now()->startOfMonth();
     $to = Carbon::now();
-    $statementService = app(CustomerStatementService::class);
+    $statementQuery = app(CustomerStatementQuery::class);
 
     Customer::query()
         ->where('company_id', $company->id)
-        ->each(function (Customer $customer) use ($statementService, $from, $to): void {
-            $statement = $statementService->statement(
+        ->each(function (Customer $customer) use ($statementQuery, $from, $to): void {
+            $statement = $statementQuery->statement(
                 $customer,
-                CustomerStatementService::TYPE_ACTIVITY,
+                CustomerStatementQuery::TYPE_ACTIVITY,
                 $from,
                 $to,
             );
diff --git a/tests/Feature/Receivables/PaymentEmailLogTest.php b/tests/Feature/Receivables/PaymentEmailLogTest.php
new file mode 100644
index 00000000..264ddc59
--- /dev/null
+++ b/tests/Feature/Receivables/PaymentEmailLogTest.php
@@ -0,0 +1,39 @@
+<?php
+
+use App\Domains\Receivables\Mail\SendPaymentMail;
+use App\Domains\Receivables\Models\Payment;
+use App\Platform\Mail\Models\EmailLog;
+use App\Platform\Persistence\ModelIdentityMap;
+use Illuminate\Support\Facades\Artisan;
+
+use function Pest\Laravel\getJson;
+
+beforeEach(function () {
+    Artisan::call('db:seed', ['--class' => 'DatabaseSeeder', '--force' => true]);
+    Artisan::call('db:seed', ['--class' => 'DemoSeeder', '--force' => true]);
+});
+
+test('payment mail records a stable public link through the mail platform', function () {
+    $payment = Payment::factory()->create();
+    $mail = new SendPaymentMail([
+        'from' => 'billing@example.com',
+        'to' => 'customer@example.com',
+        'subject' => 'Payment receipt',
+        'body' => 'Thanks for your payment.',
+        'payment' => $payment->toArray(),
+        'attach' => ['data' => null],
+    ]);
+
+    $mail->build();
+
+    $log = EmailLog::query()->sole();
+
+    expect($log->mailable_type)->toBe(ModelIdentityMap::aliasFor(Payment::class))
+        ->and((int) $log->mailable_id)->toBe($payment->id)
+        ->and($log->token)->not->toBeEmpty()
+        ->and($mail->data['url'])->toBe(route('payment', ['email_log' => $log->token]));
+
+    getJson('/customer/payments/'.$log->token)
+        ->assertOk()
+        ->assertJsonPath('data.id', $payment->id);
+});
diff --git a/tests/Pest.php b/tests/Pest.php
index 2deca95e..bb47d2e7 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -6,7 +6,17 @@ use Tests\TestCase;
 uses(TestCase::class, RefreshDatabase::class)->in('Feature');
 uses(TestCase::class, RefreshDatabase::class)->in('Unit');
 
-// The module-system tests scaffold real modules on disk (Modules/ScaffoldProbe).
-// Paratest isolates the database but not that shared filesystem path, so run this
-// group serially after the parallel pass to avoid cross-worker collisions.
-uses()->group('modules')->in('Feature/Company/Modules');
+// Module-system tests scaffold, install, and remove real directories under
+// Modules. Paratest isolates the database but not that shared filesystem path,
+// so every filesystem-mutating module suite runs serially after the parallel
+// pass to avoid one worker scanning another worker's staging directory.
+uses()->group('modules')->in(
+    'Feature/Admin/Modules',
+    'Feature/Company/Modules',
+    'Feature/Marketplace',
+);
+
+// Architecture assertions parse broad namespace graphs and retain that graph
+// for the life of a worker. Run them in the serial phase so an ordinary feature
+// test is not handed the parser's memory footprint in the same 128 MB process.
+uses()->group('architecture')->in('Unit/Architecture', 'Feature/Architecture');
diff --git a/tests/Support/ScriptedAiDriver.php b/tests/Support/ScriptedAiDriver.php
index cb862936..2d1ea15e 100644
--- a/tests/Support/ScriptedAiDriver.php
+++ b/tests/Support/ScriptedAiDriver.php
@@ -2,8 +2,8 @@
 
 namespace Tests\Support;
 
-use App\Support\Ai\AiChatResponse;
-use App\Support\Ai\AiDriver;
+use App\Platform\Ai\Contracts\AiDriver;
+use App\Platform\Ai\Data\AiChatResponse;
 
 /**
  * Test double for AiDriver that returns pre-queued responses from an array, so
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 0faafe0d..bc77f724 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,9 +2,7 @@
 
 namespace Tests;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
-use Illuminate\Support\Str;
 use JMac\Testing\Traits\AdditionalAssertions;
 
 abstract class TestCase extends BaseTestCase
@@ -19,17 +17,5 @@ abstract class TestCase extends BaseTestCase
         // (resources/views/app.blade.php → @vite) would throw ViteManifestNotFoundException.
         // Stub Vite so those views render without a built manifest.
         $this->withoutVite();
-
-        Factory::guessFactoryNamesUsing(function (string $modelName) {
-            // We can also customise where our factories live too if we want:
-            $namespace = 'Database\\Factories\\';
-
-            // Here we are getting the model name from the class namespace
-            $modelName = Str::afterLast($modelName, '\\');
-
-            // Finally we'll build up the full class path where
-            // Laravel will find our model factory
-            return $namespace.$modelName.'Factory';
-        });
     }
 }
diff --git a/tests/Unit/AddressCountryLocalizationTest.php b/tests/Unit/AddressCountryLocalizationTest.php
index eebcdb05..e2b6fb69 100644
--- a/tests/Unit/AddressCountryLocalizationTest.php
+++ b/tests/Unit/AddressCountryLocalizationTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Address;
-use App\Models\Country;
+use App\Domains\Contacts\Models\Address;
+use App\Domains\Contacts\Models\Country;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Artisan;
 
diff --git a/tests/Unit/AddressTest.php b/tests/Unit/AddressTest.php
index 2f0d5bb9..a809880a 100644
--- a/tests/Unit/AddressTest.php
+++ b/tests/Unit/AddressTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Address;
+use App\Domains\Contacts\Models\Address;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/AiConfigurationServiceTest.php b/tests/Unit/AiConfigurationServiceTest.php
index a748bb74..94192a79 100644
--- a/tests/Unit/AiConfigurationServiceTest.php
+++ b/tests/Unit/AiConfigurationServiceTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Models\CompanySetting;
-use App\Models\Setting;
-use App\Models\User;
-use App\Services\AiConfigurationService;
-use App\Support\Ai\OpenRouterDriver;
+use App\Domains\Accounts\Models\CompanySetting;
+use App\Domains\Accounts\Models\User;
+use App\Platform\Ai\Application\AiConfigurationService;
+use App\Platform\Ai\Drivers\OpenRouterDriver;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Crypt;
 
diff --git a/tests/Unit/AiDriverFactoryTest.php b/tests/Unit/AiDriverFactoryTest.php
index ca1bc886..0b63609e 100644
--- a/tests/Unit/AiDriverFactoryTest.php
+++ b/tests/Unit/AiDriverFactoryTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Support\Ai\AiChatResponse;
-use App\Support\Ai\AiDriver;
-use App\Support\Ai\AiDriverFactory;
-use App\Support\Ai\OpenRouterDriver;
+use App\Platform\Ai\Contracts\AiDriver;
+use App\Platform\Ai\Data\AiChatResponse;
+use App\Platform\Ai\Drivers\AiDriverFactory;
+use App\Platform\Ai\Drivers\OpenRouterDriver;
 use InvoiceShelf\Modules\Registry;
 
 test('make resolves the built-in openrouter driver', function () {
diff --git a/tests/Unit/AiToolRegistryTest.php b/tests/Unit/AiToolRegistryTest.php
index c5b6403a..304fbd50 100644
--- a/tests/Unit/AiToolRegistryTest.php
+++ b/tests/Unit/AiToolRegistryTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Services\Ai\AiToolRegistry;
-use App\Services\Ai\Tools\AiTool;
+use App\Platform\Ai\Application\AiToolRegistry;
+use App\Platform\Ai\Application\Tools\AiTool;
 
 /**
  * A stub tool for exercising the registry without touching any real DB tables.
diff --git a/tests/Unit/Architecture/DomainArchitectureTest.php b/tests/Unit/Architecture/DomainArchitectureTest.php
new file mode 100644
index 00000000..85009214
--- /dev/null
+++ b/tests/Unit/Architecture/DomainArchitectureTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @return list<string>
+ */
+function phpFilesUnder(string $directory): array
+{
+    if (! is_dir($directory)) {
+        return [];
+    }
+
+    $files = [];
+    $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory));
+
+    foreach ($iterator as $file) {
+        if ($file->isFile() && $file->getExtension() === 'php') {
+            $files[] = $file->getPathname();
+        }
+    }
+
+    return $files;
+}
+
+test('domain code does not depend on legacy service or controller layers', function () {
+    $files = phpFilesUnder(app_path('Domains'));
+
+    expect($files)->toBeArray();
+
+    foreach ($files as $file) {
+        $source = file_get_contents($file);
+
+        expect($source)->not->toContain('App\\Http\\Controllers')
+            ->not->toContain('App\\Services');
+    }
+});
+
+test('platform code does not depend on legacy controllers', function () {
+    foreach (phpFilesUnder(app_path('Platform')) as $file) {
+        expect(file_get_contents($file))->not->toContain('App\\Http\\Controllers');
+    }
+});
+
+test('legacy application layer directories contain no php classes', function () {
+    $legacyDirectories = [
+        'Console/Commands',
+        'Http/Controllers',
+        'Http/Requests',
+        'Http/Resources',
+        'Jobs',
+        'Mail',
+        'Models',
+        'Policies',
+        'Services',
+        'Traits',
+    ];
+
+    foreach ($legacyDirectories as $directory) {
+        expect(phpFilesUnder(app_path($directory)))->toBe([]);
+    }
+});
+
+test('support remains independent of domains', function () {
+    foreach (phpFilesUnder(app_path('Support')) as $file) {
+        expect(file_get_contents($file))->not->toContain('App\\Domains');
+    }
+});
diff --git a/tests/Unit/Architecture/HashidIdentityTest.php b/tests/Unit/Architecture/HashidIdentityTest.php
new file mode 100644
index 00000000..93131ac3
--- /dev/null
+++ b/tests/Unit/Architecture/HashidIdentityTest.php
@@ -0,0 +1,23 @@
+<?php
+
+use App\Facades\Hashids as HashidsFacade;
+use App\Support\Hashids\HashidConnection;
+use Hashids\Hashids;
+
+test('hashid connections retain their historical salts', function (HashidConnection $connection, string $legacyClass) {
+    $config = config("hashids.connections.{$connection->value}");
+
+    expect($config)->toBeArray()
+        ->and($config['salt'])->toBe($legacyClass.config('app.key'));
+
+    $legacy = new Hashids($legacyClass.config('app.key'), $config['length'], $config['alphabet']);
+
+    expect(HashidsFacade::connection($connection->value)->encode(1))->toBe($legacy->encode(1));
+})->with([
+    [HashidConnection::Invoice, 'App\\Models\\Invoice'],
+    [HashidConnection::Estimate, 'App\\Models\\Estimate'],
+    [HashidConnection::Payment, 'App\\Models\\Payment'],
+    [HashidConnection::Company, 'App\\Models\\Company'],
+    [HashidConnection::EmailLog, 'App\\Models\\EmailLog'],
+    [HashidConnection::Transaction, 'App\\Models\\Transaction'],
+]);
diff --git a/tests/Unit/Architecture/ModelIdentityMapTest.php b/tests/Unit/Architecture/ModelIdentityMapTest.php
new file mode 100644
index 00000000..dede281a
--- /dev/null
+++ b/tests/Unit/Architecture/ModelIdentityMapTest.php
@@ -0,0 +1,80 @@
+<?php
+
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Sales\Models\Invoice;
+use App\Platform\Modules\Models\MarketplaceCredential;
+use App\Platform\Modules\Models\MarketplaceOperation;
+use App\Platform\Modules\Models\Module;
+use App\Platform\Persistence\ModelIdentityMap;
+use Illuminate\Database\Eloquent\Relations\Relation;
+use Silber\Bouncer\Database\Ability;
+use Silber\Bouncer\Database\Role;
+
+test('first-party and bouncer models use stable morph aliases', function () {
+    expect(ModelIdentityMap::aliases())
+        ->toHaveKey('company', Company::class)
+        ->toHaveKey('customer', Customer::class)
+        ->toHaveKey('invoice', Invoice::class)
+        ->toHaveKey('marketplace_credential', MarketplaceCredential::class)
+        ->toHaveKey('marketplace_operation', MarketplaceOperation::class)
+        ->toHaveKey('module', Module::class)
+        ->toHaveKey('user', User::class)
+        ->toHaveKey('bouncer_ability', Ability::class)
+        ->toHaveKey('bouncer_role', Role::class);
+
+    expect((new Invoice)->getMorphClass())->toBe('invoice')
+        ->and((new User)->getMorphClass())->toBe('user')
+        ->and((new Role)->getMorphClass())->toBe('bouncer_role')
+        ->and(Relation::getMorphedModel('customer'))->toBe(Customer::class);
+});
+
+test('every first-party model has a stable identity', function () {
+    $models = collect([app_path('Models'), app_path('Domains'), app_path('Platform')])
+        ->filter(fn (string $directory): bool => is_dir($directory))
+        ->flatMap(function (string $directory): array {
+            $files = [];
+            $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory));
+
+            foreach ($iterator as $file) {
+                $path = str_replace('\\', '/', $file->getPathname());
+
+                if ($file->isFile() && $file->getExtension() === 'php' && str_contains($path, '/Models/')) {
+                    $relative = substr($path, strlen(str_replace('\\', '/', app_path())) + 1);
+                    $files[] = 'App\\'.str_replace('/', '\\', substr($relative, 0, -4));
+                }
+            }
+
+            return $files;
+        })
+        ->values();
+
+    $mappedModels = collect(ModelIdentityMap::aliases())
+        ->values()
+        ->filter(fn (string $model): bool => str_starts_with($model, 'App\\'))
+        ->values();
+
+    expect($models->diff($mappedModels)->values()->all())->toBe([])
+        ->and($mappedModels->diff($models)->values()->all())->toBe([]);
+});
+
+test('first-party models have canonical owners and explicit table contracts', function () {
+    expect(is_dir(app_path('Models')))->toBeFalse();
+
+    collect(ModelIdentityMap::aliases())
+        ->values()
+        ->filter(fn (string $model): bool => str_starts_with($model, 'App\\'))
+        ->each(function (string $model): void {
+            $table = new ReflectionProperty($model, 'table');
+
+            expect($table->getDeclaringClass()->getName())->toBe($model)
+                ->and((new $model)->getTable())->not->toBeEmpty();
+        });
+});
+
+test('database aliases do not leak through the existing v1 discriminator', function () {
+    expect(ModelIdentityMap::publicType('invoice'))->toBe('App\\Models\\Invoice')
+        ->and(ModelIdentityMap::publicType('Modules\\Example\\Models\\Record'))
+        ->toBe('Modules\\Example\\Models\\Record');
+});
diff --git a/tests/Unit/CompanySettingTest.php b/tests/Unit/CompanySettingTest.php
index 7a768b94..4b36b21f 100644
--- a/tests/Unit/CompanySettingTest.php
+++ b/tests/Unit/CompanySettingTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Company;
-use App\Models\CompanySetting;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\CompanySetting;
 use Illuminate\Support\Facades\Artisan;
 
 use function Pest\Faker\fake;
diff --git a/tests/Unit/CompanyTest.php b/tests/Unit/CompanyTest.php
index 082221ca..9af1a291 100644
--- a/tests/Unit/CompanyTest.php
+++ b/tests/Unit/CompanyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Company;
+use App\Domains\Accounts\Models\Company;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/Console/UpdateCommandTest.php b/tests/Unit/Console/UpdateCommandTest.php
index 5a9f6669..a0a93c7b 100644
--- a/tests/Unit/Console/UpdateCommandTest.php
+++ b/tests/Unit/Console/UpdateCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Console\Commands\UpdateCommand;
+use App\Platform\Operations\Console\UpdateCommand;
 
 it('reads installed version from version file', function () {
     $command = app(UpdateCommand::class);
diff --git a/tests/Unit/CountryTest.php b/tests/Unit/CountryTest.php
index 15901925..a60afdff 100644
--- a/tests/Unit/CountryTest.php
+++ b/tests/Unit/CountryTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Address;
-use App\Models\Country;
+use App\Domains\Contacts\Models\Address;
+use App\Domains\Contacts\Models\Country;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/CustomFieldTest.php b/tests/Unit/CustomFieldTest.php
index bea128bc..507c845d 100644
--- a/tests/Unit/CustomFieldTest.php
+++ b/tests/Unit/CustomFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\CustomField;
+use App\Domains\Metadata\Models\CustomField;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/CustomFieldValueTest.php b/tests/Unit/CustomFieldValueTest.php
index 94f5229e..e7c9aa21 100644
--- a/tests/Unit/CustomFieldValueTest.php
+++ b/tests/Unit/CustomFieldValueTest.php
@@ -1,6 +1,9 @@
 <?php
 
-use App\Models\CustomFieldValue;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Metadata\Contracts\CustomFieldValueWriter;
+use App\Domains\Metadata\Models\CustomField;
+use App\Domains\Metadata\Models\CustomFieldValue;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
@@ -19,3 +22,28 @@ test('custom field value belongs to custom field', function () {
 
     $this->assertTrue($fieldValue->customField()->exists());
 });
+
+test('custom field values are attached and updated through the metadata contract', function () {
+    $customField = CustomField::factory()->create([
+        'model_type' => 'Customer',
+        'type' => 'Input',
+    ]);
+    $customer = Customer::factory()->create([
+        'company_id' => $customField->company_id,
+    ]);
+    $writer = app(CustomFieldValueWriter::class);
+
+    $writer->attach($customer, [[
+        'id' => $customField->id,
+        'value' => 'First value',
+    ]]);
+
+    expect($customer->fields()->sole()->string_answer)->toBe('First value');
+
+    $writer->update($customer, [[
+        'id' => $customField->id,
+        'value' => 'Updated value',
+    ]]);
+
+    expect($customer->fields()->sole()->string_answer)->toBe('Updated value');
+});
diff --git a/tests/Unit/CustomerTest.php b/tests/Unit/CustomerTest.php
index 91402664..278e17b6 100644
--- a/tests/Unit/CustomerTest.php
+++ b/tests/Unit/CustomerTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Address;
-use App\Models\Customer;
+use App\Domains\Contacts\Models\Address;
+use App\Domains\Contacts\Models\Customer;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/EstimateItemTest.php b/tests/Unit/EstimateItemTest.php
index 49f15ebf..9b13035e 100644
--- a/tests/Unit/EstimateItemTest.php
+++ b/tests/Unit/EstimateItemTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\Estimate;
-use App\Models\EstimateItem;
-use App\Models\Item;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\EstimateItem;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/EstimateTest.php b/tests/Unit/EstimateTest.php
index f5f7a9a3..f9a44ea3 100644
--- a/tests/Unit/EstimateTest.php
+++ b/tests/Unit/EstimateTest.php
@@ -1,11 +1,11 @@
 <?php
 
-use App\Http\Requests\EstimatesRequest;
-use App\Models\Estimate;
-use App\Models\EstimateItem;
-use App\Models\Tax;
-use App\Services\Document\DocumentItemService;
-use App\Services\Document\EstimateService;
+use App\Domains\Sales\Application\DocumentItemService;
+use App\Domains\Sales\Application\EstimateService;
+use App\Domains\Sales\Http\Requests\EstimatesRequest;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\EstimateItem;
+use App\Domains\Taxation\Models\Tax;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
@@ -52,7 +52,11 @@ test('create estimate', function () {
 
     $request->replace($estimate);
 
-    $response = app(EstimateService::class)->create($request);
+    $response = app(EstimateService::class)->create(
+        attributes: $request->getEstimatePayload(),
+        items: $request->input('items'),
+        taxes: $request->input('taxes'),
+    );
 
     $this->assertDatabaseHas('estimate_items', [
         'estimate_id' => $response->id,
@@ -97,7 +101,12 @@ test('update estimate', function () {
 
     $number_attributes['estimate_number'] = $estimate_number[0].'-'.sprintf('%06d', intval($estimate_number[1]));
 
-    app(EstimateService::class)->update($estimate, $request);
+    app(EstimateService::class)->update(
+        estimate: $estimate,
+        attributes: $request->getEstimatePayload(),
+        items: $request->input('items'),
+        taxes: $request->input('taxes'),
+    );
 
     $this->assertDatabaseHas('estimate_items', [
         'estimate_id' => $estimate->id,
diff --git a/tests/Unit/ExchangeRateDriverFactoryTest.php b/tests/Unit/ExchangeRateDriverFactoryTest.php
index 127481c0..49ca26c0 100644
--- a/tests/Unit/ExchangeRateDriverFactoryTest.php
+++ b/tests/Unit/ExchangeRateDriverFactoryTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Support\ExchangeRate\CurrencyFreakDriver;
-use App\Support\ExchangeRate\ExchangeRateDriver;
-use App\Support\ExchangeRate\ExchangeRateDriverFactory;
+use App\Domains\Money\ExchangeRates\CurrencyFreakDriver;
+use App\Domains\Money\ExchangeRates\ExchangeRateDriver;
+use App\Domains\Money\ExchangeRates\ExchangeRateDriverFactory;
 use InvoiceShelf\Modules\Registry;
 
 test('make resolves built-in drivers from the factory map', function () {
diff --git a/tests/Unit/ExchangeRateLogTest.php b/tests/Unit/ExchangeRateLogTest.php
index c3bb434d..22b17fd7 100644
--- a/tests/Unit/ExchangeRateLogTest.php
+++ b/tests/Unit/ExchangeRateLogTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\ExchangeRateLog;
-use App\Models\Expense;
+use App\Domains\Money\Models\ExchangeRateLog;
+use App\Domains\Purchases\Models\Expense;
 
 beforeEach(function () {
     Artisan::call('db:seed', ['--class' => 'DatabaseSeeder', '--force' => true]);
diff --git a/tests/Unit/ExpenseCategoryTest.php b/tests/Unit/ExpenseCategoryTest.php
index 2232c36c..1ad47880 100644
--- a/tests/Unit/ExpenseCategoryTest.php
+++ b/tests/Unit/ExpenseCategoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\ExpenseCategory;
+use App\Domains\Purchases\Models\ExpenseCategory;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/ExpenseTest.php b/tests/Unit/ExpenseTest.php
index 950b24bd..02a89f28 100644
--- a/tests/Unit/ExpenseTest.php
+++ b/tests/Unit/ExpenseTest.php
@@ -1,16 +1,16 @@
 <?php
 
-use App\Models\Company;
-use App\Models\Customer;
-use App\Models\Expense;
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
-use App\Models\Tax;
-use App\Models\TaxType;
-use App\Models\User;
-use App\Services\Company\CompanyService;
-use App\Services\CustomerService;
+use App\Domains\Accounts\Application\CompanyService;
+use App\Domains\Accounts\Models\Company;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Contacts\Application\CustomerService;
+use App\Domains\Contacts\Models\Customer;
+use App\Domains\Purchases\Models\Expense;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Taxation\Models\Tax;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
@@ -73,7 +73,7 @@ test('company deletion removes receipt taxes through expense model events', func
         'tax_type_id' => $taxType->id,
     ]);
 
-    app(CompanyService::class)->delete($company, $user);
+    app(CompanyService::class)->delete($company);
 
     $this->assertDatabaseMissing('taxes', ['id' => $tax->id]);
 });
@@ -116,7 +116,7 @@ test('company deletion removes payment allocations before bulk payment deletion'
         'invoice_id' => $invoice->id,
     ]);
 
-    app(CompanyService::class)->delete($company, $user);
+    app(CompanyService::class)->delete($company);
 
     $this->assertDatabaseMissing('payment_allocations', ['id' => $allocation->id]);
 });
diff --git a/tests/Unit/FormatMoneyPdfTest.php b/tests/Unit/FormatMoneyPdfTest.php
index 18ffae2f..4aa014ad 100644
--- a/tests/Unit/FormatMoneyPdfTest.php
+++ b/tests/Unit/FormatMoneyPdfTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Currency;
+use App\Domains\Money\Models\Currency;
 
 /**
  * format_money_pdf() renders the amount that lands in a PDF, so the sign has to
diff --git a/tests/Unit/GotenbergCompanionViewTest.php b/tests/Unit/GotenbergCompanionViewTest.php
index 4c1d87a2..2e2240dd 100644
--- a/tests/Unit/GotenbergCompanionViewTest.php
+++ b/tests/Unit/GotenbergCompanionViewTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Support\Pdf\GotenbergPdfDriver;
+use App\Platform\Pdf\Rendering\GotenbergPdfDriver;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\View;
 
diff --git a/tests/Unit/GotenbergFontDeliveryTest.php b/tests/Unit/GotenbergFontDeliveryTest.php
index 4b99bf8d..b9b5e657 100644
--- a/tests/Unit/GotenbergFontDeliveryTest.php
+++ b/tests/Unit/GotenbergFontDeliveryTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Services\FontService;
-use App\Support\Pdf\GotenbergPdfDriver;
+use App\Platform\Pdf\Application\FontService;
+use App\Platform\Pdf\Rendering\GotenbergPdfDriver;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\View;
 
diff --git a/tests/Unit/GotenbergHostValidationTest.php b/tests/Unit/GotenbergHostValidationTest.php
index 3752dc71..120be1be 100644
--- a/tests/Unit/GotenbergHostValidationTest.php
+++ b/tests/Unit/GotenbergHostValidationTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Http\Requests\PDFConfigurationRequest;
-use App\Support\Pdf\GotenbergHostPolicy;
-use App\Support\Pdf\GotenbergPdfDriver;
+use App\Platform\Pdf\Http\Requests\PdfConfigurationRequest;
+use App\Platform\Pdf\Rendering\GotenbergHostPolicy;
+use App\Platform\Pdf\Rendering\GotenbergPdfDriver;
 use Illuminate\Support\Facades\Validator;
 
 /**
@@ -11,7 +11,7 @@ use Illuminate\Support\Facades\Validator;
  */
 function validateGotenbergHost(string $url): Illuminate\Validation\Validator
 {
-    $rules = PDFConfigurationRequest::create('/', 'POST', [
+    $rules = PdfConfigurationRequest::create('/', 'POST', [
         'pdf_driver' => 'gotenberg',
         'gotenberg_host' => $url,
     ])->rules();
diff --git a/tests/Unit/GotenbergPdfDriverTest.php b/tests/Unit/GotenbergPdfDriverTest.php
index d9a95213..217c3dd9 100644
--- a/tests/Unit/GotenbergPdfDriverTest.php
+++ b/tests/Unit/GotenbergPdfDriverTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Support\Pdf\GotenbergPdfDriver;
+use App\Platform\Pdf\Rendering\GotenbergPdfDriver;
 
 /**
  * These assert against buildRequest(), which assembles the Chromium multipart
diff --git a/tests/Unit/InvoiceItemTest.php b/tests/Unit/InvoiceItemTest.php
index eae41d04..4bc551df 100644
--- a/tests/Unit/InvoiceItemTest.php
+++ b/tests/Unit/InvoiceItemTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\Item;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index 22a28468..a79c1a3b 100644
--- a/tests/Unit/InvoiceTest.php
+++ b/tests/Unit/InvoiceTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use App\Http\Requests\InvoicesRequest;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\Payment;
-use App\Models\Tax;
-use App\Services\Document\DocumentItemService;
-use App\Services\Document\InvoiceService;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Sales\Application\DocumentItemService;
+use App\Domains\Sales\Application\InvoiceService;
+use App\Domains\Sales\Http\Requests\InvoicesRequest;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Taxation\Models\Tax;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
@@ -82,7 +82,11 @@ test('create invoice', function () {
     $invoice_number = explode('-', $invoice['invoice_number']);
     $number_attributes['invoice_number'] = $invoice_number[0].'-'.sprintf('%06d', intval($invoice_number[1]));
 
-    $response = app(InvoiceService::class)->create($request);
+    $response = app(InvoiceService::class)->create(
+        attributes: $request->getInvoicePayload(),
+        items: $request->input('items'),
+        taxes: $request->input('taxes'),
+    );
 
     $this->assertDatabaseHas('invoice_items', [
         'invoice_id' => $response->id,
@@ -130,7 +134,12 @@ test('update invoice', function () {
 
     $number_attributes['invoice_number'] = $invoice_number[0].'-'.sprintf('%06d', intval($invoice_number[1]));
 
-    $response = app(InvoiceService::class)->update($invoice, $request);
+    $response = app(InvoiceService::class)->update(
+        invoice: $invoice,
+        attributes: $request->getInvoicePayload(),
+        items: $request->input('items'),
+        taxes: $request->input('taxes'),
+    );
 
     $this->assertDatabaseHas('invoice_items', [
         'invoice_id' => $response->id,
diff --git a/tests/Unit/ItemTest.php b/tests/Unit/ItemTest.php
index 47dbaf6b..c7693514 100644
--- a/tests/Unit/ItemTest.php
+++ b/tests/Unit/ItemTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Models\Estimate;
-use App\Models\EstimateItem;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\Item;
+use App\Domains\Catalog\Models\Item;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\EstimateItem;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/OpenRouterDriverTest.php b/tests/Unit/OpenRouterDriverTest.php
index 87ed833f..6416072c 100644
--- a/tests/Unit/OpenRouterDriverTest.php
+++ b/tests/Unit/OpenRouterDriverTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Support\Ai\AiException;
-use App\Support\Ai\OpenRouterDriver;
+use App\Platform\Ai\Drivers\OpenRouterDriver;
+use App\Platform\Ai\Exceptions\AiException;
 
 /**
  * Runtime SSRF backstop: even if a private base URL slips past validation (e.g.
diff --git a/tests/Unit/PaymentMethodTest.php b/tests/Unit/PaymentMethodTest.php
index a0aa7b6c..da695fb6 100644
--- a/tests/Unit/PaymentMethodTest.php
+++ b/tests/Unit/PaymentMethodTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\PaymentMethod;
+use App\Domains\Receivables\Models\PaymentMethod;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/PaymentTest.php b/tests/Unit/PaymentTest.php
index 80e46661..13c9c5cb 100644
--- a/tests/Unit/PaymentTest.php
+++ b/tests/Unit/PaymentTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\Invoice;
-use App\Models\Payment;
-use App\Models\PaymentAllocation;
+use App\Domains\Receivables\Models\Payment;
+use App\Domains\Receivables\Models\PaymentAllocation;
+use App\Domains\Sales\Models\Invoice;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/PdfDriverContractTest.php b/tests/Unit/PdfDriverContractTest.php
index 7aef54c9..fe5859c0 100644
--- a/tests/Unit/PdfDriverContractTest.php
+++ b/tests/Unit/PdfDriverContractTest.php
@@ -1,12 +1,12 @@
 <?php
 
-use App\Support\Pdf\DompdfDriver;
-use App\Support\Pdf\DompdfResponse;
-use App\Support\Pdf\GotenbergPdfDriver;
-use App\Support\Pdf\GotenbergPdfResponse;
-use App\Support\Pdf\PdfDriver;
-use App\Support\Pdf\PdfDriverFactory;
-use App\Support\Pdf\ResponseStream;
+use App\Platform\Pdf\Rendering\DompdfDriver;
+use App\Platform\Pdf\Rendering\DompdfResponse;
+use App\Platform\Pdf\Rendering\GotenbergPdfDriver;
+use App\Platform\Pdf\Rendering\GotenbergPdfResponse;
+use App\Platform\Pdf\Rendering\PdfDriver;
+use App\Platform\Pdf\Rendering\PdfDriverFactory;
+use App\Platform\Pdf\Rendering\ResponseStream;
 
 /**
  * PdfDriver and ResponseStream existed but nothing implemented them, so the
diff --git a/tests/Unit/PdfDriverPageParityTest.php b/tests/Unit/PdfDriverPageParityTest.php
index e0d6d59a..c53af4fc 100644
--- a/tests/Unit/PdfDriverPageParityTest.php
+++ b/tests/Unit/PdfDriverPageParityTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Support\Pdf\DompdfDriver;
-use App\Support\Pdf\GotenbergPdfDriver;
-use App\Support\Pdf\PdfPageSetup;
+use App\Platform\Pdf\Rendering\DompdfDriver;
+use App\Platform\Pdf\Rendering\GotenbergPdfDriver;
+use App\Platform\Pdf\Rendering\PdfPageSetup;
 
 /**
  * The page setup is only worth anything if both drivers land on the same page.
diff --git a/tests/Unit/PdfHtmlSanitizerTest.php b/tests/Unit/PdfHtmlSanitizerTest.php
index 25b067f4..e6779f6c 100644
--- a/tests/Unit/PdfHtmlSanitizerTest.php
+++ b/tests/Unit/PdfHtmlSanitizerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Support\Pdf\PdfHtmlSanitizer;
+use App\Platform\Pdf\Rendering\PdfHtmlSanitizer;
 
 it('removes img tags that could trigger SSRF during PDF rendering', function () {
     $html = "<p>Hi</p><img src='http://example.com/x'>";
@@ -36,7 +36,7 @@ it('normalizes legacy closing-br markup so lines are not collapsed in PDF output
 });
 
 it('strips SSRF vectors injected via address-template placeholders', function () {
-    // Simulates the output of GeneratesPdfTrait::getFormattedString() after a
+    // Simulates the output of GeneratesPdf::getFormattedString() after a
     // malicious customer name like "Acme <img src='http://attacker/probe'>" has
     // been substituted into an address template via {BILLING_ADDRESS_NAME}.
     $html = "Acme <img src='http://attacker.test/probe'><br />123 Main St<br />Springfield";
diff --git a/tests/Unit/PdfMetadataTest.php b/tests/Unit/PdfMetadataTest.php
index 3c6f5f7c..cedc8e42 100644
--- a/tests/Unit/PdfMetadataTest.php
+++ b/tests/Unit/PdfMetadataTest.php
@@ -1,9 +1,9 @@
 <?php
 
-use App\Models\Company;
-use App\Support\Pdf\DompdfDriver;
-use App\Support\Pdf\GotenbergPdfDriver;
-use App\Support\Pdf\PdfMetadata;
+use App\Domains\Accounts\Models\Company;
+use App\Platform\Pdf\Rendering\DompdfDriver;
+use App\Platform\Pdf\Rendering\GotenbergPdfDriver;
+use App\Platform\Pdf\Rendering\PdfMetadata;
 
 /**
  * Generated files carried no document properties at all, so an archive of them
diff --git a/tests/Unit/PdfPageSetupTest.php b/tests/Unit/PdfPageSetupTest.php
index dc4a2a90..f6082972 100644
--- a/tests/Unit/PdfPageSetupTest.php
+++ b/tests/Unit/PdfPageSetupTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Support\Pdf\PdfPageSetup;
+use App\Platform\Pdf\Rendering\PdfPageSetup;
 
 /**
  * Page geometry is stored once and translated per driver. Gotenberg takes CSS
diff --git a/tests/Unit/PdfReportPageSetupTest.php b/tests/Unit/PdfReportPageSetupTest.php
index 76589efc..cba8dc69 100644
--- a/tests/Unit/PdfReportPageSetupTest.php
+++ b/tests/Unit/PdfReportPageSetupTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Support\Pdf\DompdfDriver;
-use App\Support\Pdf\GotenbergPdfDriver;
-use App\Support\Pdf\PdfPageSetup;
+use App\Platform\Pdf\Rendering\DompdfDriver;
+use App\Platform\Pdf\Rendering\GotenbergPdfDriver;
+use App\Platform\Pdf\Rendering\PdfPageSetup;
 use Barryvdh\DomPDF\PDF;
 
 /**
diff --git a/tests/Unit/PromptLoaderTest.php b/tests/Unit/PromptLoaderTest.php
index 2136fdb7..272b57c1 100644
--- a/tests/Unit/PromptLoaderTest.php
+++ b/tests/Unit/PromptLoaderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Support\Ai\PromptLoader;
+use App\Platform\Ai\Prompting\PromptLoader;
 
 test('load substitutes placeholders in the chat-system template', function () {
     $prompt = PromptLoader::load('chat-system', [
diff --git a/tests/Unit/RecurringInvoiceTest.php b/tests/Unit/RecurringInvoiceTest.php
index 64d34652..aeb2dee0 100644
--- a/tests/Unit/RecurringInvoiceTest.php
+++ b/tests/Unit/RecurringInvoiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\RecurringInvoice;
+use App\Domains\Sales\Models\RecurringInvoice;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/SettingTest.php b/tests/Unit/SettingTest.php
index c433d626..a7e21cb4 100644
--- a/tests/Unit/SettingTest.php
+++ b/tests/Unit/SettingTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\Setting;
+use App\Platform\Operations\Models\Setting;
 use Illuminate\Support\Facades\Artisan;
 
 use function Pest\Faker\fake;
diff --git a/tests/Unit/TaxTest.php b/tests/Unit/TaxTest.php
index 34db03b1..4d46f47e 100644
--- a/tests/Unit/TaxTest.php
+++ b/tests/Unit/TaxTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use App\Models\Estimate;
-use App\Models\EstimateItem;
-use App\Models\Invoice;
-use App\Models\InvoiceItem;
-use App\Models\Tax;
+use App\Domains\Sales\Models\Estimate;
+use App\Domains\Sales\Models\EstimateItem;
+use App\Domains\Sales\Models\Invoice;
+use App\Domains\Sales\Models\InvoiceItem;
+use App\Domains\Taxation\Models\Tax;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/TaxTypeTest.php b/tests/Unit/TaxTypeTest.php
index fdc1617b..64fb640c 100644
--- a/tests/Unit/TaxTypeTest.php
+++ b/tests/Unit/TaxTypeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\TaxType;
+use App\Domains\Taxation\Models\TaxType;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/UnitTest.php b/tests/Unit/UnitTest.php
index 88c77909..b2454207 100644
--- a/tests/Unit/UnitTest.php
+++ b/tests/Unit/UnitTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Models\Unit;
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
+use App\Domains\Catalog\Models\Unit;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Unit/UserTest.php b/tests/Unit/UserTest.php
index 37cb731f..9bcf91b6 100644
--- a/tests/Unit/UserTest.php
+++ b/tests/Unit/UserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Models\User;
+use App\Domains\Accounts\Models\User;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {