diff --git a/app/Http/Controllers/Admin/FontController.php b/app/Http/Controllers/Admin/FontController.php
index ffbc1f71..1791649b 100644
--- a/app/Http/Controllers/Admin/FontController.php
+++ b/app/Http/Controllers/Admin/FontController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use App\Services\Pdf\FontService;
+use App\Services\FontService;
 use Illuminate\Http\JsonResponse;
 
 class FontController extends Controller
diff --git a/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php b/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php
index 436c3e4d..c78f0086 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\Integrations\ExchangeRate\ExchangeRateProviderService;
+use App\Services\ExchangeRateProviderService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Arr;
diff --git a/app/Providers/DriverRegistryProvider.php b/app/Providers/DriverRegistryProvider.php
index dda68f4b..90b12aa4 100644
--- a/app/Providers/DriverRegistryProvider.php
+++ b/app/Providers/DriverRegistryProvider.php
@@ -2,10 +2,10 @@
 
 namespace App\Providers;
 
-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 App\Support\Integrations\ExchangeRate\CurrencyConverterDriver;
+use App\Support\Integrations\ExchangeRate\CurrencyFreakDriver;
+use App\Support\Integrations\ExchangeRate\CurrencyLayerDriver;
+use App\Support\Integrations\ExchangeRate\OpenExchangeRateDriver;
 use Illuminate\Support\ServiceProvider;
 use InvoiceShelf\Modules\Registry;
 
diff --git a/app/Providers/PdfServiceProvider.php b/app/Providers/PdfServiceProvider.php
index acb852b0..05d075ea 100644
--- a/app/Providers/PdfServiceProvider.php
+++ b/app/Providers/PdfServiceProvider.php
@@ -2,7 +2,7 @@
 
 namespace App\Providers;
 
-use App\Services\Pdf\PdfService;
+use App\Support\Pdf\PdfService;
 use Illuminate\Support\ServiceProvider;
 
 class PdfServiceProvider extends ServiceProvider
diff --git a/app/Services/Integrations/ExchangeRate/ExchangeRateProviderService.php b/app/Services/ExchangeRateProviderService.php
similarity index 95%
rename from app/Services/Integrations/ExchangeRate/ExchangeRateProviderService.php
rename to app/Services/ExchangeRateProviderService.php
index ae52a8e4..e9d06684 100644
--- a/app/Services/Integrations/ExchangeRate/ExchangeRateProviderService.php
+++ b/app/Services/ExchangeRateProviderService.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Services\Integrations\ExchangeRate;
+namespace App\Services;
 
 use App\Http\Requests\ExchangeRateProviderRequest;
 use App\Models\CompanySetting;
 use App\Models\ExchangeRateLog;
 use App\Models\ExchangeRateProvider;
-use App\Services\Integrations\ExchangeRate\ExchangeRateDriverFactory;
-use App\Services\Integrations\ExchangeRate\ExchangeRateException;
+use App\Support\Integrations\ExchangeRate\ExchangeRateDriverFactory;
+use App\Support\Integrations\ExchangeRate\ExchangeRateException;
 
 class ExchangeRateProviderService
 {
diff --git a/app/Services/Pdf/FontService.php b/app/Services/FontService.php
similarity index 99%
rename from app/Services/Pdf/FontService.php
rename to app/Services/FontService.php
index 4de9c689..1572fbdb 100644
--- a/app/Services/Pdf/FontService.php
+++ b/app/Services/FontService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Pdf;
+namespace App\Services;
 
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
diff --git a/app/Services/Integrations/ExchangeRate/CurrencyConverterDriver.php b/app/Support/Integrations/ExchangeRate/CurrencyConverterDriver.php
similarity index 97%
rename from app/Services/Integrations/ExchangeRate/CurrencyConverterDriver.php
rename to app/Support/Integrations/ExchangeRate/CurrencyConverterDriver.php
index e2d59c71..ac9a1ef8 100644
--- a/app/Services/Integrations/ExchangeRate/CurrencyConverterDriver.php
+++ b/app/Support/Integrations/ExchangeRate/CurrencyConverterDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Integrations\ExchangeRate;
+namespace App\Support\Integrations\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Services/Integrations/ExchangeRate/CurrencyFreakDriver.php b/app/Support/Integrations/ExchangeRate/CurrencyFreakDriver.php
similarity index 97%
rename from app/Services/Integrations/ExchangeRate/CurrencyFreakDriver.php
rename to app/Support/Integrations/ExchangeRate/CurrencyFreakDriver.php
index b646bd32..1fe4a8ea 100644
--- a/app/Services/Integrations/ExchangeRate/CurrencyFreakDriver.php
+++ b/app/Support/Integrations/ExchangeRate/CurrencyFreakDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Integrations\ExchangeRate;
+namespace App\Support\Integrations\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Services/Integrations/ExchangeRate/CurrencyLayerDriver.php b/app/Support/Integrations/ExchangeRate/CurrencyLayerDriver.php
similarity index 97%
rename from app/Services/Integrations/ExchangeRate/CurrencyLayerDriver.php
rename to app/Support/Integrations/ExchangeRate/CurrencyLayerDriver.php
index 88075097..4a496eb7 100644
--- a/app/Services/Integrations/ExchangeRate/CurrencyLayerDriver.php
+++ b/app/Support/Integrations/ExchangeRate/CurrencyLayerDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Integrations\ExchangeRate;
+namespace App\Support\Integrations\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Services/Integrations/ExchangeRate/ExchangeRateDriver.php b/app/Support/Integrations/ExchangeRate/ExchangeRateDriver.php
similarity index 94%
rename from app/Services/Integrations/ExchangeRate/ExchangeRateDriver.php
rename to app/Support/Integrations/ExchangeRate/ExchangeRateDriver.php
index 89641554..3fb62ffe 100644
--- a/app/Services/Integrations/ExchangeRate/ExchangeRateDriver.php
+++ b/app/Support/Integrations/ExchangeRate/ExchangeRateDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Integrations\ExchangeRate;
+namespace App\Support\Integrations\ExchangeRate;
 
 abstract class ExchangeRateDriver
 {
diff --git a/app/Services/Integrations/ExchangeRate/ExchangeRateDriverFactory.php b/app/Support/Integrations/ExchangeRate/ExchangeRateDriverFactory.php
similarity index 98%
rename from app/Services/Integrations/ExchangeRate/ExchangeRateDriverFactory.php
rename to app/Support/Integrations/ExchangeRate/ExchangeRateDriverFactory.php
index 55dc8966..60b7daed 100644
--- a/app/Services/Integrations/ExchangeRate/ExchangeRateDriverFactory.php
+++ b/app/Support/Integrations/ExchangeRate/ExchangeRateDriverFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Integrations\ExchangeRate;
+namespace App\Support\Integrations\ExchangeRate;
 
 use InvalidArgumentException;
 use InvoiceShelf\Modules\Registry;
diff --git a/app/Services/Integrations/ExchangeRate/ExchangeRateException.php b/app/Support/Integrations/ExchangeRate/ExchangeRateException.php
similarity index 81%
rename from app/Services/Integrations/ExchangeRate/ExchangeRateException.php
rename to app/Support/Integrations/ExchangeRate/ExchangeRateException.php
index c5179e65..5e8dfb20 100644
--- a/app/Services/Integrations/ExchangeRate/ExchangeRateException.php
+++ b/app/Support/Integrations/ExchangeRate/ExchangeRateException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Integrations\ExchangeRate;
+namespace App\Support\Integrations\ExchangeRate;
 
 class ExchangeRateException extends \RuntimeException
 {
diff --git a/app/Services/Integrations/ExchangeRate/OpenExchangeRateDriver.php b/app/Support/Integrations/ExchangeRate/OpenExchangeRateDriver.php
similarity index 96%
rename from app/Services/Integrations/ExchangeRate/OpenExchangeRateDriver.php
rename to app/Support/Integrations/ExchangeRate/OpenExchangeRateDriver.php
index 046320a5..728ed37d 100644
--- a/app/Services/Integrations/ExchangeRate/OpenExchangeRateDriver.php
+++ b/app/Support/Integrations/ExchangeRate/OpenExchangeRateDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Integrations\ExchangeRate;
+namespace App\Support\Integrations\ExchangeRate;
 
 use Illuminate\Support\Facades\Http;
 
diff --git a/app/Services/Pdf/GotenbergPdfDriver.php b/app/Support/Pdf/GotenbergPdfDriver.php
similarity index 96%
rename from app/Services/Pdf/GotenbergPdfDriver.php
rename to app/Support/Pdf/GotenbergPdfDriver.php
index c7db051a..0099d69a 100644
--- a/app/Services/Pdf/GotenbergPdfDriver.php
+++ b/app/Support/Pdf/GotenbergPdfDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Pdf;
+namespace App\Support\Pdf;
 
 use Gotenberg\Gotenberg;
 use Gotenberg\Stream;
diff --git a/app/Services/Pdf/GotenbergPdfResponse.php b/app/Support/Pdf/GotenbergPdfResponse.php
similarity index 95%
rename from app/Services/Pdf/GotenbergPdfResponse.php
rename to app/Support/Pdf/GotenbergPdfResponse.php
index 49a3f1e4..58524cca 100644
--- a/app/Services/Pdf/GotenbergPdfResponse.php
+++ b/app/Support/Pdf/GotenbergPdfResponse.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Pdf;
+namespace App\Support\Pdf;
 
 use Illuminate\Http\Response;
 use Psr\Http\Message\ResponseInterface;
diff --git a/app/Services/Pdf/PdfDriver.php b/app/Support/Pdf/PdfDriver.php
similarity index 77%
rename from app/Services/Pdf/PdfDriver.php
rename to app/Support/Pdf/PdfDriver.php
index 4bb4926e..3dbe06c7 100644
--- a/app/Services/Pdf/PdfDriver.php
+++ b/app/Support/Pdf/PdfDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Pdf;
+namespace App\Support\Pdf;
 
 interface PdfDriver
 {
diff --git a/app/Services/Pdf/PdfDriverFactory.php b/app/Support/Pdf/PdfDriverFactory.php
similarity index 92%
rename from app/Services/Pdf/PdfDriverFactory.php
rename to app/Support/Pdf/PdfDriverFactory.php
index 922d7f89..91389ed7 100644
--- a/app/Services/Pdf/PdfDriverFactory.php
+++ b/app/Support/Pdf/PdfDriverFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Pdf;
+namespace App\Support\Pdf;
 
 use App;
 
diff --git a/app/Services/Pdf/PdfService.php b/app/Support/Pdf/PdfService.php
similarity index 88%
rename from app/Services/Pdf/PdfService.php
rename to app/Support/Pdf/PdfService.php
index e174a22a..dd45ad8d 100644
--- a/app/Services/Pdf/PdfService.php
+++ b/app/Support/Pdf/PdfService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Pdf;
+namespace App\Support\Pdf;
 
 class PdfService
 {
diff --git a/app/Services/Pdf/ResponseStream.php b/app/Support/Pdf/ResponseStream.php
similarity index 85%
rename from app/Services/Pdf/ResponseStream.php
rename to app/Support/Pdf/ResponseStream.php
index cbb7b73a..046b15ee 100644
--- a/app/Services/Pdf/ResponseStream.php
+++ b/app/Support/Pdf/ResponseStream.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Pdf;
+namespace App\Support\Pdf;
 
 use Illuminate\Http\Response;
 
diff --git a/app/Traits/GeneratesPdfTrait.php b/app/Traits/GeneratesPdfTrait.php
index 927d0969..1b8871be 100644
--- a/app/Traits/GeneratesPdfTrait.php
+++ b/app/Traits/GeneratesPdfTrait.php
@@ -6,7 +6,7 @@ use App\Models\Address;
 use App\Models\CompanySetting;
 use App\Models\FileDisk;
 use App\Models\Setting;
-use App\Services\Pdf\FontService;
+use App\Services\FontService;
 use App\Support\Pdf\PdfHtmlSanitizer;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\App;
diff --git a/tests/Unit/ExchangeRateDriverFactoryTest.php b/tests/Unit/ExchangeRateDriverFactoryTest.php
index 4e5c3b36..5c682b39 100644
--- a/tests/Unit/ExchangeRateDriverFactoryTest.php
+++ b/tests/Unit/ExchangeRateDriverFactoryTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Services\Integrations\ExchangeRate\CurrencyFreakDriver;
-use App\Services\Integrations\ExchangeRate\ExchangeRateDriver;
-use App\Services\Integrations\ExchangeRate\ExchangeRateDriverFactory;
+use App\Support\Integrations\ExchangeRate\CurrencyFreakDriver;
+use App\Support\Integrations\ExchangeRate\ExchangeRateDriver;
+use App\Support\Integrations\ExchangeRate\ExchangeRateDriverFactory;
 use InvoiceShelf\Modules\Registry;
 
 test('make resolves built-in drivers from the factory map', function () {