From 947d00a9f13cbe146f7fc7b1b6fdbd4de96e0715 Mon Sep 17 00:00:00 2001
From: Darko Gjorgjijoski <dg@darkog.com>
Date: Sat, 11 Apr 2026 11:30:00 +0200
Subject: [PATCH] =?UTF-8?q?refactor(services):=20Documents=E2=86=92Documen?=
 =?UTF-8?q?t=20+=20ExchangeRate=E2=86=92Integrations/ExchangeRate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two follow-ups to the Services reorg that landed in 6d1816bd.

**Documents → Document** (singular). Documents/ was the only plural subdir in app/Services/ — every other bucket (Company, Mail, Module, Pdf, Storage, Update, ExchangeRate) was singular. Renaming to Document/ normalizes the whole tree.

**ExchangeRate → Integrations/ExchangeRate**. Introduces Integrations/ as an umbrella for external-service adapter subsystems. Exchange rate providers move in first; AI providers, payment gateways, and any other driver-pattern integrations land as sibling subdirs (Integrations/Ai/, Integrations/Payment/) without another reorg. Integrations/ was chosen over Providers/ to avoid conceptual collision with Laravel's app/Providers/ — 'check the providers' shouldn't be ambiguous.

17 files moved, 21 consumer files rewritten to point at the new namespaces via literal-string replacement (same approach as the previous reorg). 350 tests pass, Pint clean.
---
 app/Http/Controllers/Admin/CurrenciesController.php       | 2 +-
 .../Controllers/Company/Estimate/EstimatesController.php  | 2 +-
 .../ExchangeRate/ExchangeRateProviderController.php       | 2 +-
 .../Controllers/Company/Expense/ExpensesController.php    | 2 +-
 .../Company/General/SerialNumberController.php            | 2 +-
 .../Controllers/Company/Invoice/InvoicesController.php    | 2 +-
 .../Controllers/Company/Payment/PaymentsController.php    | 2 +-
 .../RecurringInvoice/RecurringInvoiceController.php       | 2 +-
 app/Http/Controllers/Pdf/DocumentPdfController.php        | 4 ++--
 app/Models/Estimate.php                                   | 2 +-
 app/Models/Invoice.php                                    | 2 +-
 app/Models/Payment.php                                    | 2 +-
 app/Providers/DriverRegistryProvider.php                  | 8 ++++----
 app/Services/{Documents => Document}/CurrencyService.php  | 2 +-
 .../{Documents => Document}/DocumentItemService.php       | 2 +-
 app/Services/{Documents => Document}/EstimateService.php  | 2 +-
 app/Services/{Documents => Document}/ExpenseService.php   | 2 +-
 app/Services/{Documents => Document}/InvoiceService.php   | 2 +-
 app/Services/{Documents => Document}/PaymentService.php   | 2 +-
 .../{Documents => Document}/RecurringInvoiceService.php   | 2 +-
 .../{Documents => Document}/SerialNumberService.php       | 2 +-
 .../{Documents => Document}/TransactionService.php        | 2 +-
 .../ExchangeRate/CurrencyConverterDriver.php              | 2 +-
 .../ExchangeRate/CurrencyFreakDriver.php                  | 2 +-
 .../ExchangeRate/CurrencyLayerDriver.php                  | 2 +-
 .../ExchangeRate/ExchangeRateDriver.php                   | 2 +-
 .../ExchangeRate/ExchangeRateDriverFactory.php            | 2 +-
 .../ExchangeRate/ExchangeRateException.php                | 2 +-
 .../ExchangeRate/ExchangeRateProviderService.php          | 6 +++---
 .../ExchangeRate/OpenExchangeRateDriver.php               | 2 +-
 database/factories/EstimateFactory.php                    | 2 +-
 database/factories/InvoiceFactory.php                     | 2 +-
 database/factories/PaymentFactory.php                     | 2 +-
 routes/console.php                                        | 2 +-
 tests/Unit/EstimateTest.php                               | 4 ++--
 tests/Unit/ExchangeRateDriverFactoryTest.php              | 6 +++---
 tests/Unit/InvoiceTest.php                                | 4 ++--
 37 files changed, 47 insertions(+), 47 deletions(-)
 rename app/Services/{Documents => Document}/CurrencyService.php (95%)
 rename app/Services/{Documents => Document}/DocumentItemService.php (98%)
 rename app/Services/{Documents => Document}/EstimateService.php (99%)
 rename app/Services/{Documents => Document}/ExpenseService.php (98%)
 rename app/Services/{Documents => Document}/InvoiceService.php (99%)
 rename app/Services/{Documents => Document}/PaymentService.php (99%)
 rename app/Services/{Documents => Document}/RecurringInvoiceService.php (99%)
 rename app/Services/{Documents => Document}/SerialNumberService.php (99%)
 rename app/Services/{Documents => Document}/TransactionService.php (95%)
 rename app/Services/{ => Integrations}/ExchangeRate/CurrencyConverterDriver.php (97%)
 rename app/Services/{ => Integrations}/ExchangeRate/CurrencyFreakDriver.php (97%)
 rename app/Services/{ => Integrations}/ExchangeRate/CurrencyLayerDriver.php (97%)
 rename app/Services/{ => Integrations}/ExchangeRate/ExchangeRateDriver.php (94%)
 rename app/Services/{ => Integrations}/ExchangeRate/ExchangeRateDriverFactory.php (98%)
 rename app/Services/{ => Integrations}/ExchangeRate/ExchangeRateException.php (81%)
 rename app/Services/{ => Integrations}/ExchangeRate/ExchangeRateProviderService.php (95%)
 rename app/Services/{ => Integrations}/ExchangeRate/OpenExchangeRateDriver.php (96%)

diff --git a/app/Http/Controllers/Admin/CurrenciesController.php b/app/Http/Controllers/Admin/CurrenciesController.php
index 5d3ed760..00c8a051 100644
--- a/app/Http/Controllers/Admin/CurrenciesController.php
+++ b/app/Http/Controllers/Admin/CurrenciesController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\CurrencyResource;
-use App\Services\Documents\CurrencyService;
+use App\Services\Document\CurrencyService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 
diff --git a/app/Http/Controllers/Company/Estimate/EstimatesController.php b/app/Http/Controllers/Company/Estimate/EstimatesController.php
index cf26d882..5ac5a3f7 100644
--- a/app/Http/Controllers/Company/Estimate/EstimatesController.php
+++ b/app/Http/Controllers/Company/Estimate/EstimatesController.php
@@ -11,7 +11,7 @@ use App\Http\Resources\InvoiceResource;
 use App\Jobs\GenerateEstimatePdfJob;
 use App\Models\Estimate;
 use App\Models\Invoice;
-use App\Services\Documents\EstimateService;
+use App\Services\Document\EstimateService;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Markdown;
 
diff --git a/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php b/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php
index c55ca669..436c3e4d 100644
--- a/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php
+++ b/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php
@@ -14,7 +14,7 @@ use App\Models\ExchangeRateProvider;
 use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\Tax;
-use App\Services\ExchangeRate\ExchangeRateProviderService;
+use App\Services\Integrations\ExchangeRate\ExchangeRateProviderService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Arr;
diff --git a/app/Http/Controllers/Company/Expense/ExpensesController.php b/app/Http/Controllers/Company/Expense/ExpensesController.php
index 27e692da..0a9ca30b 100644
--- a/app/Http/Controllers/Company/Expense/ExpensesController.php
+++ b/app/Http/Controllers/Company/Expense/ExpensesController.php
@@ -8,7 +8,7 @@ use App\Http\Requests\ExpenseRequest;
 use App\Http\Requests\UploadExpenseReceiptRequest;
 use App\Http\Resources\ExpenseResource;
 use App\Models\Expense;
-use App\Services\Documents\ExpenseService;
+use App\Services\Document\ExpenseService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Company/General/SerialNumberController.php b/app/Http/Controllers/Company/General/SerialNumberController.php
index 4731c9a0..61dc98b0 100644
--- a/app/Http/Controllers/Company/General/SerialNumberController.php
+++ b/app/Http/Controllers/Company/General/SerialNumberController.php
@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Models\Estimate;
 use App\Models\Invoice;
 use App\Models\Payment;
-use App\Services\Documents\SerialNumberService;
+use App\Services\Document\SerialNumberService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Company/Invoice/InvoicesController.php b/app/Http/Controllers/Company/Invoice/InvoicesController.php
index 51fa9df1..abe48b2a 100644
--- a/app/Http/Controllers/Company/Invoice/InvoicesController.php
+++ b/app/Http/Controllers/Company/Invoice/InvoicesController.php
@@ -11,7 +11,7 @@ use App\Http\Resources\InvoiceResource;
 use App\Jobs\GenerateInvoicePdfJob;
 use App\Models\Estimate;
 use App\Models\Invoice;
-use App\Services\Documents\InvoiceService;
+use App\Services\Document\InvoiceService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Markdown;
diff --git a/app/Http/Controllers/Company/Payment/PaymentsController.php b/app/Http/Controllers/Company/Payment/PaymentsController.php
index 0ad4b1d3..473ef6ca 100644
--- a/app/Http/Controllers/Company/Payment/PaymentsController.php
+++ b/app/Http/Controllers/Company/Payment/PaymentsController.php
@@ -8,7 +8,7 @@ use App\Http\Requests\PaymentRequest;
 use App\Http\Requests\SendPaymentRequest;
 use App\Http\Resources\PaymentResource;
 use App\Models\Payment;
-use App\Services\Documents\PaymentService;
+use App\Services\Document\PaymentService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Mail\Markdown;
diff --git a/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php b/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php
index 4aeac0ba..05121b2f 100644
--- a/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php
+++ b/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php
@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\RecurringInvoiceRequest;
 use App\Http\Resources\RecurringInvoiceResource;
 use App\Models\RecurringInvoice;
-use App\Services\Documents\RecurringInvoiceService;
+use App\Services\Document\RecurringInvoiceService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
diff --git a/app/Http/Controllers/Pdf/DocumentPdfController.php b/app/Http/Controllers/Pdf/DocumentPdfController.php
index c9a44357..4c97ab2d 100644
--- a/app/Http/Controllers/Pdf/DocumentPdfController.php
+++ b/app/Http/Controllers/Pdf/DocumentPdfController.php
@@ -6,8 +6,8 @@ use App\Http\Controllers\Controller;
 use App\Models\Estimate;
 use App\Models\Invoice;
 use App\Models\Payment;
-use App\Services\Documents\EstimateService;
-use App\Services\Documents\InvoiceService;
+use App\Services\Document\EstimateService;
+use App\Services\Document\InvoiceService;
 use Illuminate\Http\Request;
 
 class DocumentPdfController extends Controller
diff --git a/app/Models/Estimate.php b/app/Models/Estimate.php
index 40c190b7..2b05c54b 100644
--- a/app/Models/Estimate.php
+++ b/app/Models/Estimate.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use App\Services\Documents\EstimateService;
+use App\Services\Document\EstimateService;
 use App\Support\Pdf\PdfHtmlSanitizer;
 use App\Support\Pdf\PdfTemplateUtils;
 use App\Traits\GeneratesPdfTrait;
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index a723e1bf..48089932 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use App\Services\Documents\InvoiceService;
+use App\Services\Document\InvoiceService;
 use App\Support\Pdf\PdfHtmlSanitizer;
 use App\Support\Pdf\PdfTemplateUtils;
 use App\Traits\GeneratesPdfTrait;
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 9f716751..30c4aaa9 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -3,7 +3,7 @@
 namespace App\Models;
 
 use App\Jobs\GeneratePaymentPdfJob;
-use App\Services\Documents\PaymentService;
+use App\Services\Document\PaymentService;
 use App\Support\Pdf\PdfHtmlSanitizer;
 use App\Traits\GeneratesPdfTrait;
 use App\Traits\HasCustomFieldsTrait;
diff --git a/app/Providers/DriverRegistryProvider.php b/app/Providers/DriverRegistryProvider.php
index aecc4d8e..dda68f4b 100644
--- a/app/Providers/DriverRegistryProvider.php
+++ b/app/Providers/DriverRegistryProvider.php
@@ -2,10 +2,10 @@
 
 namespace App\Providers;
 
-use App\Services\ExchangeRate\CurrencyConverterDriver;
-use App\Services\ExchangeRate\CurrencyFreakDriver;
-use App\Services\ExchangeRate\CurrencyLayerDriver;
-use App\Services\ExchangeRate\OpenExchangeRateDriver;
+use App\Services\Integrations\ExchangeRate\CurrencyConverterDriver;
+use App\Services\Integrations\ExchangeRate\CurrencyFreakDriver;
+use App\Services\Integrations\ExchangeRate\CurrencyLayerDriver;
+use App\Services\Integrations\ExchangeRate\OpenExchangeRateDriver;
 use Illuminate\Support\ServiceProvider;
 use InvoiceShelf\Modules\Registry;
 
diff --git a/app/Services/Documents/CurrencyService.php b/app/Services/Document/CurrencyService.php
similarity index 95%
rename from app/Services/Documents/CurrencyService.php
rename to app/Services/Document/CurrencyService.php
index f47e6e22..583e7fd8 100644
--- a/app/Services/Documents/CurrencyService.php
+++ b/app/Services/Document/CurrencyService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Documents;
+namespace App\Services\Document;
 
 use App\Models\Currency;
 use Illuminate\Database\Eloquent\Collection;
diff --git a/app/Services/Documents/DocumentItemService.php b/app/Services/Document/DocumentItemService.php
similarity index 98%
rename from app/Services/Documents/DocumentItemService.php
rename to app/Services/Document/DocumentItemService.php
index 734ec7ae..b578a2ab 100644
--- a/app/Services/Documents/DocumentItemService.php
+++ b/app/Services/Document/DocumentItemService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Documents;
+namespace App\Services\Document;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Services/Documents/EstimateService.php b/app/Services/Document/EstimateService.php
similarity index 99%
rename from app/Services/Documents/EstimateService.php
rename to app/Services/Document/EstimateService.php
index b1da6a70..f7fb5d7d 100644
--- a/app/Services/Documents/EstimateService.php
+++ b/app/Services/Document/EstimateService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Documents;
+namespace App\Services\Document;
 
 use App;
 use App\Facades\Hashids;
diff --git a/app/Services/Documents/ExpenseService.php b/app/Services/Document/ExpenseService.php
similarity index 98%
rename from app/Services/Documents/ExpenseService.php
rename to app/Services/Document/ExpenseService.php
index bf772e5f..6a20406e 100644
--- a/app/Services/Documents/ExpenseService.php
+++ b/app/Services/Document/ExpenseService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Documents;
+namespace App\Services\Document;
 
 use App\Models\CompanySetting;
 use App\Models\ExchangeRateLog;
diff --git a/app/Services/Documents/InvoiceService.php b/app/Services/Document/InvoiceService.php
similarity index 99%
rename from app/Services/Documents/InvoiceService.php
rename to app/Services/Document/InvoiceService.php
index 09a7a4b7..63f63310 100644
--- a/app/Services/Documents/InvoiceService.php
+++ b/app/Services/Document/InvoiceService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Documents;
+namespace App\Services\Document;
 
 use App;
 use App\Facades\Hashids;
diff --git a/app/Services/Documents/PaymentService.php b/app/Services/Document/PaymentService.php
similarity index 99%
rename from app/Services/Documents/PaymentService.php
rename to app/Services/Document/PaymentService.php
index 14587ba5..9cac268a 100644
--- a/app/Services/Documents/PaymentService.php
+++ b/app/Services/Document/PaymentService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Documents;
+namespace App\Services\Document;
 
 use App\Facades\Hashids;
 use App\Facades\Pdf;
diff --git a/app/Services/Documents/RecurringInvoiceService.php b/app/Services/Document/RecurringInvoiceService.php
similarity index 99%
rename from app/Services/Documents/RecurringInvoiceService.php
rename to app/Services/Document/RecurringInvoiceService.php
index 49c5c73f..14cff702 100644
--- a/app/Services/Documents/RecurringInvoiceService.php
+++ b/app/Services/Document/RecurringInvoiceService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Documents;
+namespace App\Services\Document;
 
 use App\Facades\Hashids;
 use App\Http\Requests\RecurringInvoiceRequest;
diff --git a/app/Services/Documents/SerialNumberService.php b/app/Services/Document/SerialNumberService.php
similarity index 99%
rename from app/Services/Documents/SerialNumberService.php
rename to app/Services/Document/SerialNumberService.php
index 967c2da5..226b45ca 100644
--- a/app/Services/Documents/SerialNumberService.php
+++ b/app/Services/Document/SerialNumberService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Documents;
+namespace App\Services\Document;
 
 use App\Models\CompanySetting;
 use App\Models\Customer;
diff --git a/app/Services/Documents/TransactionService.php b/app/Services/Document/TransactionService.php
similarity index 95%
rename from app/Services/Documents/TransactionService.php
rename to app/Services/Document/TransactionService.php
index 3f83d29b..1af10d11 100644
--- a/app/Services/Documents/TransactionService.php
+++ b/app/Services/Document/TransactionService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Documents;
+namespace App\Services\Document;
 
 use App\Facades\Hashids;
 use App\Models\Transaction;
diff --git a/app/Services/ExchangeRate/CurrencyConverterDriver.php b/app/Services/Integrations/ExchangeRate/CurrencyConverterDriver.php
similarity index 97%
rename from app/Services/ExchangeRate/CurrencyConverterDriver.php
rename to app/Services/Integrations/ExchangeRate/CurrencyConverterDriver.php
index cdd9fb36..e2d59c71 100644
--- a/app/Services/ExchangeRate/CurrencyConverterDriver.php
+++ b/app/Services/Integrations/ExchangeRate/CurrencyConverterDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\ExchangeRate;
+namespace App\Services\Integrations\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Services/ExchangeRate/CurrencyFreakDriver.php b/app/Services/Integrations/ExchangeRate/CurrencyFreakDriver.php
similarity index 97%
rename from app/Services/ExchangeRate/CurrencyFreakDriver.php
rename to app/Services/Integrations/ExchangeRate/CurrencyFreakDriver.php
index 4d5db7b7..b646bd32 100644
--- a/app/Services/ExchangeRate/CurrencyFreakDriver.php
+++ b/app/Services/Integrations/ExchangeRate/CurrencyFreakDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\ExchangeRate;
+namespace App\Services\Integrations\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Services/ExchangeRate/CurrencyLayerDriver.php b/app/Services/Integrations/ExchangeRate/CurrencyLayerDriver.php
similarity index 97%
rename from app/Services/ExchangeRate/CurrencyLayerDriver.php
rename to app/Services/Integrations/ExchangeRate/CurrencyLayerDriver.php
index 89785e5f..88075097 100644
--- a/app/Services/ExchangeRate/CurrencyLayerDriver.php
+++ b/app/Services/Integrations/ExchangeRate/CurrencyLayerDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\ExchangeRate;
+namespace App\Services\Integrations\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Services/ExchangeRate/ExchangeRateDriver.php b/app/Services/Integrations/ExchangeRate/ExchangeRateDriver.php
similarity index 94%
rename from app/Services/ExchangeRate/ExchangeRateDriver.php
rename to app/Services/Integrations/ExchangeRate/ExchangeRateDriver.php
index 737648c7..89641554 100644
--- a/app/Services/ExchangeRate/ExchangeRateDriver.php
+++ b/app/Services/Integrations/ExchangeRate/ExchangeRateDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\ExchangeRate;
+namespace App\Services\Integrations\ExchangeRate;
 
 abstract class ExchangeRateDriver
 {
diff --git a/app/Services/ExchangeRate/ExchangeRateDriverFactory.php b/app/Services/Integrations/ExchangeRate/ExchangeRateDriverFactory.php
similarity index 98%
rename from app/Services/ExchangeRate/ExchangeRateDriverFactory.php
rename to app/Services/Integrations/ExchangeRate/ExchangeRateDriverFactory.php
index 265cde40..55dc8966 100644
--- a/app/Services/ExchangeRate/ExchangeRateDriverFactory.php
+++ b/app/Services/Integrations/ExchangeRate/ExchangeRateDriverFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\ExchangeRate;
+namespace App\Services\Integrations\ExchangeRate;
 
 use InvalidArgumentException;
 use InvoiceShelf\Modules\Registry;
diff --git a/app/Services/ExchangeRate/ExchangeRateException.php b/app/Services/Integrations/ExchangeRate/ExchangeRateException.php
similarity index 81%
rename from app/Services/ExchangeRate/ExchangeRateException.php
rename to app/Services/Integrations/ExchangeRate/ExchangeRateException.php
index 595e8e11..c5179e65 100644
--- a/app/Services/ExchangeRate/ExchangeRateException.php
+++ b/app/Services/Integrations/ExchangeRate/ExchangeRateException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\ExchangeRate;
+namespace App\Services\Integrations\ExchangeRate;
 
 class ExchangeRateException extends \RuntimeException
 {
diff --git a/app/Services/ExchangeRate/ExchangeRateProviderService.php b/app/Services/Integrations/ExchangeRate/ExchangeRateProviderService.php
similarity index 95%
rename from app/Services/ExchangeRate/ExchangeRateProviderService.php
rename to app/Services/Integrations/ExchangeRate/ExchangeRateProviderService.php
index c4718edd..ae52a8e4 100644
--- a/app/Services/ExchangeRate/ExchangeRateProviderService.php
+++ b/app/Services/Integrations/ExchangeRate/ExchangeRateProviderService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Services\ExchangeRate;
+namespace App\Services\Integrations\ExchangeRate;
 
 use App\Http\Requests\ExchangeRateProviderRequest;
 use App\Models\CompanySetting;
 use App\Models\ExchangeRateLog;
 use App\Models\ExchangeRateProvider;
-use App\Services\ExchangeRate\ExchangeRateDriverFactory;
-use App\Services\ExchangeRate\ExchangeRateException;
+use App\Services\Integrations\ExchangeRate\ExchangeRateDriverFactory;
+use App\Services\Integrations\ExchangeRate\ExchangeRateException;
 
 class ExchangeRateProviderService
 {
diff --git a/app/Services/ExchangeRate/OpenExchangeRateDriver.php b/app/Services/Integrations/ExchangeRate/OpenExchangeRateDriver.php
similarity index 96%
rename from app/Services/ExchangeRate/OpenExchangeRateDriver.php
rename to app/Services/Integrations/ExchangeRate/OpenExchangeRateDriver.php
index 5239685f..046320a5 100644
--- a/app/Services/ExchangeRate/OpenExchangeRateDriver.php
+++ b/app/Services/Integrations/ExchangeRate/OpenExchangeRateDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\ExchangeRate;
+namespace App\Services\Integrations\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/database/factories/EstimateFactory.php b/database/factories/EstimateFactory.php
index aaa1cff7..851c966c 100644
--- a/database/factories/EstimateFactory.php
+++ b/database/factories/EstimateFactory.php
@@ -6,7 +6,7 @@ use App\Models\Currency;
 use App\Models\Customer;
 use App\Models\Estimate;
 use App\Models\User;
-use App\Services\Documents\SerialNumberService;
+use App\Services\Document\SerialNumberService;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class EstimateFactory extends Factory
diff --git a/database/factories/InvoiceFactory.php b/database/factories/InvoiceFactory.php
index 8f5bf884..97e7f26e 100644
--- a/database/factories/InvoiceFactory.php
+++ b/database/factories/InvoiceFactory.php
@@ -7,7 +7,7 @@ use App\Models\Customer;
 use App\Models\Invoice;
 use App\Models\RecurringInvoice;
 use App\Models\User;
-use App\Services\Documents\SerialNumberService;
+use App\Services\Document\SerialNumberService;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class InvoiceFactory extends Factory
diff --git a/database/factories/PaymentFactory.php b/database/factories/PaymentFactory.php
index e11cac5e..c7e8b723 100644
--- a/database/factories/PaymentFactory.php
+++ b/database/factories/PaymentFactory.php
@@ -7,7 +7,7 @@ use App\Models\Customer;
 use App\Models\Payment;
 use App\Models\PaymentMethod;
 use App\Models\User;
-use App\Services\Documents\SerialNumberService;
+use App\Services\Document\SerialNumberService;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class PaymentFactory extends Factory
diff --git a/routes/console.php b/routes/console.php
index d63d60f6..f7571995 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -2,7 +2,7 @@
 
 use App\Models\CompanySetting;
 use App\Models\RecurringInvoice;
-use App\Services\Documents\RecurringInvoiceService;
+use App\Services\Document\RecurringInvoiceService;
 use App\Support\Setup\InstallUtils;
 use Illuminate\Support\Facades\Schedule;
 
diff --git a/tests/Unit/EstimateTest.php b/tests/Unit/EstimateTest.php
index 1f7299bb..41ec2f19 100644
--- a/tests/Unit/EstimateTest.php
+++ b/tests/Unit/EstimateTest.php
@@ -4,8 +4,8 @@ use App\Http\Requests\EstimatesRequest;
 use App\Models\Estimate;
 use App\Models\EstimateItem;
 use App\Models\Tax;
-use App\Services\Documents\DocumentItemService;
-use App\Services\Documents\EstimateService;
+use App\Services\Document\DocumentItemService;
+use App\Services\Document\EstimateService;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/ExchangeRateDriverFactoryTest.php b/tests/Unit/ExchangeRateDriverFactoryTest.php
index 7a57507b..4e5c3b36 100644
--- a/tests/Unit/ExchangeRateDriverFactoryTest.php
+++ b/tests/Unit/ExchangeRateDriverFactoryTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Services\ExchangeRate\CurrencyFreakDriver;
-use App\Services\ExchangeRate\ExchangeRateDriver;
-use App\Services\ExchangeRate\ExchangeRateDriverFactory;
+use App\Services\Integrations\ExchangeRate\CurrencyFreakDriver;
+use App\Services\Integrations\ExchangeRate\ExchangeRateDriver;
+use App\Services\Integrations\ExchangeRate\ExchangeRateDriverFactory;
 use InvoiceShelf\Modules\Registry;
 
 test('make resolves built-in drivers from the factory map', function () {
diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index 13cc781f..2cad77ae 100644
--- a/tests/Unit/InvoiceTest.php
+++ b/tests/Unit/InvoiceTest.php
@@ -4,8 +4,8 @@ use App\Http\Requests\InvoicesRequest;
 use App\Models\Invoice;
 use App\Models\InvoiceItem;
 use App\Models\Tax;
-use App\Services\Documents\DocumentItemService;
-use App\Services\Documents\InvoiceService;
+use App\Services\Document\DocumentItemService;
+use App\Services\Document\InvoiceService;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {