diff --git a/app/Console/Commands/CreateTemplateCommand.php b/app/Console/Commands/CreateTemplateCommand.php
index 487865a7..a47c60db 100644
--- a/app/Console/Commands/CreateTemplateCommand.php
+++ b/app/Console/Commands/CreateTemplateCommand.php
@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Services\Pdf\PdfTemplateUtils;
+use App\Support\Pdf\PdfTemplateUtils;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
diff --git a/app/Console/Commands/MigrateMediaToPrivateDisk.php b/app/Console/Commands/MigrateMediaToPrivateDisk.php
index c3547c0d..573a48aa 100644
--- a/app/Console/Commands/MigrateMediaToPrivateDisk.php
+++ b/app/Console/Commands/MigrateMediaToPrivateDisk.php
@@ -4,7 +4,7 @@ namespace App\Console\Commands;
 
 use App\Models\FileDisk;
 use App\Models\Setting;
-use App\Services\FileDiskService;
+use App\Services\Storage\FileDiskService;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
diff --git a/app/Http/Controllers/Admin/BackupsController.php b/app/Http/Controllers/Admin/BackupsController.php
index a1eaec3f..b1bb9c51 100644
--- a/app/Http/Controllers/Admin/BackupsController.php
+++ b/app/Http/Controllers/Admin/BackupsController.php
@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use App\Jobs\CreateBackupJob;
 use App\Rules\Backup\PathToZip;
-use App\Services\Backup\BackupService;
+use App\Services\Storage\BackupService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
diff --git a/app/Http/Controllers/Admin/CompaniesController.php b/app/Http/Controllers/Admin/CompaniesController.php
index aa05fe5f..db48052f 100644
--- a/app/Http/Controllers/Admin/CompaniesController.php
+++ b/app/Http/Controllers/Admin/CompaniesController.php
@@ -8,7 +8,7 @@ use App\Http\Requests\AdminCompanyUpdateRequest;
 use App\Http\Requests\CompaniesRequest;
 use App\Http\Resources\CompanyResource;
 use App\Models\Company;
-use App\Services\CompanyService;
+use App\Services\Company\CompanyService;
 use Illuminate\Http\Request;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/app/Http/Controllers/Admin/CurrenciesController.php b/app/Http/Controllers/Admin/CurrenciesController.php
index 61f39fbb..5d3ed760 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\CurrencyService;
+use App\Services\Documents\CurrencyService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 
diff --git a/app/Http/Controllers/Admin/FontController.php b/app/Http/Controllers/Admin/FontController.php
index 1791649b..ffbc1f71 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\FontService;
+use App\Services\Pdf\FontService;
 use Illuminate\Http\JsonResponse;
 
 class FontController extends Controller
diff --git a/app/Http/Controllers/Admin/Settings/DiskController.php b/app/Http/Controllers/Admin/Settings/DiskController.php
index 30d3312f..96f1de45 100644
--- a/app/Http/Controllers/Admin/Settings/DiskController.php
+++ b/app/Http/Controllers/Admin/Settings/DiskController.php
@@ -7,7 +7,7 @@ use App\Http\Requests\DiskEnvironmentRequest;
 use App\Http\Resources\FileDiskResource;
 use App\Models\FileDisk;
 use App\Models\Setting;
-use App\Services\FileDiskService;
+use App\Services\Storage\FileDiskService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Admin/Settings/MailConfigurationController.php b/app/Http/Controllers/Admin/Settings/MailConfigurationController.php
index 7aca9f6a..0abd988e 100755
--- a/app/Http/Controllers/Admin/Settings/MailConfigurationController.php
+++ b/app/Http/Controllers/Admin/Settings/MailConfigurationController.php
@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\MailEnvironmentRequest;
 use App\Mail\TestMail;
 use App\Models\Setting;
-use App\Services\MailConfigurationService;
+use App\Services\Mail\MailConfigurationService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php b/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php
index 078f2b96..0ebb68cd 100644
--- a/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php
+++ b/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php
@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin\Settings;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\PDFConfigurationRequest;
 use App\Models\Setting;
-use App\Services\Setup\EnvironmentManager;
+use App\Support\Setup\EnvironmentManager;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 
diff --git a/app/Http/Controllers/Company/Auth/AuthController.php b/app/Http/Controllers/Company/Auth/AuthController.php
index f1f4c307..29c6dd40 100644
--- a/app/Http/Controllers/Company/Auth/AuthController.php
+++ b/app/Http/Controllers/Company/Auth/AuthController.php
@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\LoginRequest;
 use App\Models\CompanyInvitation;
 use App\Models\User;
-use App\Services\InvitationService;
+use App\Services\Company\InvitationService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
diff --git a/app/Http/Controllers/Company/Auth/InvitationRegistrationController.php b/app/Http/Controllers/Company/Auth/InvitationRegistrationController.php
index f8e9ddc7..610b5f7c 100644
--- a/app/Http/Controllers/Company/Auth/InvitationRegistrationController.php
+++ b/app/Http/Controllers/Company/Auth/InvitationRegistrationController.php
@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Company\Auth;
 use App\Http\Controllers\Controller;
 use App\Models\CompanyInvitation;
 use App\Models\User;
-use App\Services\InvitationService;
+use App\Services\Company\InvitationService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
diff --git a/app/Http/Controllers/Company/Estimate/EstimateTemplatesController.php b/app/Http/Controllers/Company/Estimate/EstimateTemplatesController.php
index 3c46ae93..4b5df455 100644
--- a/app/Http/Controllers/Company/Estimate/EstimateTemplatesController.php
+++ b/app/Http/Controllers/Company/Estimate/EstimateTemplatesController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Company\Estimate;
 
 use App\Http\Controllers\Controller;
 use App\Models\Estimate;
-use App\Services\Pdf\PdfTemplateUtils;
+use App\Support\Pdf\PdfTemplateUtils;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Company/Estimate/EstimatesController.php b/app/Http/Controllers/Company/Estimate/EstimatesController.php
index 18322075..cf26d882 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\EstimateService;
+use App\Services\Documents\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 c78f0086..c55ca669 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\ExchangeRateProviderService;
+use App\Services\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 85ead680..27e692da 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\ExpenseService;
+use App\Services\Documents\ExpenseService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Company/General/InvitationResponseController.php b/app/Http/Controllers/Company/General/InvitationResponseController.php
index 70cec8e2..e4c21148 100644
--- a/app/Http/Controllers/Company/General/InvitationResponseController.php
+++ b/app/Http/Controllers/Company/General/InvitationResponseController.php
@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Company\General;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\CompanyInvitationResource;
 use App\Models\CompanyInvitation;
-use App\Services\InvitationService;
+use App\Services\Company\InvitationService;
 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 3ad47b44..4731c9a0 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\SerialNumberService;
+use App\Services\Documents\SerialNumberService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Company/Invoice/InvoiceTemplatesController.php b/app/Http/Controllers/Company/Invoice/InvoiceTemplatesController.php
index 5c2042f7..8332afb5 100644
--- a/app/Http/Controllers/Company/Invoice/InvoiceTemplatesController.php
+++ b/app/Http/Controllers/Company/Invoice/InvoiceTemplatesController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Company\Invoice;
 
 use App\Http\Controllers\Controller;
 use App\Models\Invoice;
-use App\Services\Pdf\PdfTemplateUtils;
+use App\Support\Pdf\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/Http/Controllers/Company/Invoice/InvoicesController.php
index 6ac7b6c0..51fa9df1 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\InvoiceService;
+use App\Services\Documents\InvoiceService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Mail\Markdown;
diff --git a/app/Http/Controllers/Company/Members/MembersController.php b/app/Http/Controllers/Company/Members/MembersController.php
index b7c72ea4..cb2e3bea 100644
--- a/app/Http/Controllers/Company/Members/MembersController.php
+++ b/app/Http/Controllers/Company/Members/MembersController.php
@@ -7,7 +7,7 @@ use App\Http\Requests\DeleteMemberRequest;
 use App\Http\Requests\MemberRequest;
 use App\Http\Resources\UserResource;
 use App\Models\User;
-use App\Services\MemberService;
+use App\Services\Company\MemberService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Company/Payment/PaymentsController.php b/app/Http/Controllers/Company/Payment/PaymentsController.php
index a69b9245..0ad4b1d3 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\PaymentService;
+use App\Services\Documents\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 38cfdc6d..4aeac0ba 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\RecurringInvoiceService;
+use App\Services\Documents\RecurringInvoiceService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
diff --git a/app/Http/Controllers/Company/Settings/CompanyMailConfigurationController.php b/app/Http/Controllers/Company/Settings/CompanyMailConfigurationController.php
index 69f3e49e..3eca1fbf 100644
--- a/app/Http/Controllers/Company/Settings/CompanyMailConfigurationController.php
+++ b/app/Http/Controllers/Company/Settings/CompanyMailConfigurationController.php
@@ -5,8 +5,8 @@ namespace App\Http\Controllers\Company\Settings;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\CompanyMailConfigurationRequest;
 use App\Mail\TestMail;
-use App\Services\CompanyMailConfigService;
-use App\Services\MailConfigurationService;
+use App\Services\Mail\CompanyMailConfigService;
+use App\Services\Mail\MailConfigurationService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
diff --git a/app/Http/Controllers/Company/Settings/InvitationController.php b/app/Http/Controllers/Company/Settings/InvitationController.php
index 203ee0af..041ba587 100644
--- a/app/Http/Controllers/Company/Settings/InvitationController.php
+++ b/app/Http/Controllers/Company/Settings/InvitationController.php
@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Resources\CompanyInvitationResource;
 use App\Models\Company;
 use App\Models\CompanyInvitation;
-use App\Services\InvitationService;
+use App\Services\Company\InvitationService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Pdf/DocumentPdfController.php b/app/Http/Controllers/Pdf/DocumentPdfController.php
index 81cd6d78..c9a44357 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\EstimateService;
-use App\Services\InvoiceService;
+use App\Services\Documents\EstimateService;
+use App\Services\Documents\InvoiceService;
 use Illuminate\Http\Request;
 
 class DocumentPdfController extends Controller
diff --git a/app/Http/Controllers/Setup/AppDomainController.php b/app/Http/Controllers/Setup/AppDomainController.php
index 6a6b7ce7..e0eca00c 100644
--- a/app/Http/Controllers/Setup/AppDomainController.php
+++ b/app/Http/Controllers/Setup/AppDomainController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DomainEnvironmentRequest;
-use App\Services\Setup\EnvironmentManager;
+use App\Support\Setup\EnvironmentManager;
 use Illuminate\Support\Facades\Artisan;
 
 class AppDomainController extends Controller
diff --git a/app/Http/Controllers/Setup/DatabaseConfigurationController.php b/app/Http/Controllers/Setup/DatabaseConfigurationController.php
index 497237bc..cccb0c47 100644
--- a/app/Http/Controllers/Setup/DatabaseConfigurationController.php
+++ b/app/Http/Controllers/Setup/DatabaseConfigurationController.php
@@ -4,8 +4,8 @@ namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DatabaseEnvironmentRequest;
-use App\Services\Setup\EnvironmentManager;
-use App\Services\Setup\InstallUtils;
+use App\Support\Setup\EnvironmentManager;
+use App\Support\Setup\InstallUtils;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
 
diff --git a/app/Http/Controllers/Setup/FilePermissionsController.php b/app/Http/Controllers/Setup/FilePermissionsController.php
index c75b37f7..1db0787e 100644
--- a/app/Http/Controllers/Setup/FilePermissionsController.php
+++ b/app/Http/Controllers/Setup/FilePermissionsController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
-use App\Services\Setup\FilePermissionChecker;
+use App\Support\Setup\FilePermissionChecker;
 use Illuminate\Http\JsonResponse;
 
 class FilePermissionsController extends Controller
diff --git a/app/Http/Controllers/Setup/OnboardingWizardController.php b/app/Http/Controllers/Setup/OnboardingWizardController.php
index c2e62191..54ce4926 100644
--- a/app/Http/Controllers/Setup/OnboardingWizardController.php
+++ b/app/Http/Controllers/Setup/OnboardingWizardController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Models\Setting;
-use App\Services\Setup\InstallUtils;
+use App\Support\Setup\InstallUtils;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Setup/RequirementsController.php b/app/Http/Controllers/Setup/RequirementsController.php
index 5eeaf502..6f96d581 100755
--- a/app/Http/Controllers/Setup/RequirementsController.php
+++ b/app/Http/Controllers/Setup/RequirementsController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
-use App\Services\Setup\RequirementsChecker;
+use App\Support\Setup\RequirementsChecker;
 use Illuminate\Http\JsonResponse;
 
 class RequirementsController extends Controller
diff --git a/app/Http/Middleware/ConfigMiddleware.php b/app/Http/Middleware/ConfigMiddleware.php
index 42e6e687..e95d7fec 100644
--- a/app/Http/Middleware/ConfigMiddleware.php
+++ b/app/Http/Middleware/ConfigMiddleware.php
@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Models\FileDisk;
-use App\Services\Setup\InstallUtils;
+use App\Support\Setup\InstallUtils;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/app/Http/Middleware/InstallationMiddleware.php b/app/Http/Middleware/InstallationMiddleware.php
index 48ea6cfa..8abd3e58 100644
--- a/app/Http/Middleware/InstallationMiddleware.php
+++ b/app/Http/Middleware/InstallationMiddleware.php
@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Models\Setting;
-use App\Services\Setup\InstallUtils;
+use App\Support\Setup\InstallUtils;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/app/Http/Middleware/RedirectIfInstalled.php b/app/Http/Middleware/RedirectIfInstalled.php
index 1ac820f1..6b973f94 100644
--- a/app/Http/Middleware/RedirectIfInstalled.php
+++ b/app/Http/Middleware/RedirectIfInstalled.php
@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Models\Setting;
-use App\Services\Setup\InstallUtils;
+use App\Support\Setup\InstallUtils;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/app/Http/Middleware/UseInstallWizardTokenAuth.php b/app/Http/Middleware/UseInstallWizardTokenAuth.php
index a700e95a..1b1891dc 100644
--- a/app/Http/Middleware/UseInstallWizardTokenAuth.php
+++ b/app/Http/Middleware/UseInstallWizardTokenAuth.php
@@ -3,8 +3,8 @@
 namespace App\Http\Middleware;
 
 use App\Models\Setting;
-use App\Services\Setup\InstallUtils;
 use App\Support\InstallWizardAuth;
+use App\Support\Setup\InstallUtils;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/app/Http/Requests/CompanyMailConfigurationRequest.php b/app/Http/Requests/CompanyMailConfigurationRequest.php
index 01d3ce81..44c4a3ff 100644
--- a/app/Http/Requests/CompanyMailConfigurationRequest.php
+++ b/app/Http/Requests/CompanyMailConfigurationRequest.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Requests;
 
-use App\Services\MailConfigurationService;
+use App\Services\Mail\MailConfigurationService;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Http/Requests/MailEnvironmentRequest.php b/app/Http/Requests/MailEnvironmentRequest.php
index 51194e93..9c560303 100644
--- a/app/Http/Requests/MailEnvironmentRequest.php
+++ b/app/Http/Requests/MailEnvironmentRequest.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Requests;
 
-use App\Services\MailConfigurationService;
+use App\Services\Mail\MailConfigurationService;
 use Illuminate\Foundation\Http\FormRequest;
 
 class MailEnvironmentRequest extends FormRequest
diff --git a/app/Jobs/CreateBackupJob.php b/app/Jobs/CreateBackupJob.php
index 131bbe5f..ec958487 100644
--- a/app/Jobs/CreateBackupJob.php
+++ b/app/Jobs/CreateBackupJob.php
@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Services\Backup\BackupConfigurationFactory;
+use App\Services\Storage\BackupConfigurationFactory;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Models/Estimate.php b/app/Models/Estimate.php
index 6702e110..40c190b7 100644
--- a/app/Models/Estimate.php
+++ b/app/Models/Estimate.php
@@ -2,9 +2,9 @@
 
 namespace App\Models;
 
-use App\Services\EstimateService;
-use App\Services\Pdf\PdfTemplateUtils;
-use App\Support\PdfHtmlSanitizer;
+use App\Services\Documents\EstimateService;
+use App\Support\Pdf\PdfHtmlSanitizer;
+use App\Support\Pdf\PdfTemplateUtils;
 use App\Traits\GeneratesPdfTrait;
 use App\Traits\HasCustomFieldsTrait;
 use Carbon\Carbon;
diff --git a/app/Models/FileDisk.php b/app/Models/FileDisk.php
index 545d7e91..653c9500 100644
--- a/app/Models/FileDisk.php
+++ b/app/Models/FileDisk.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use App\Services\FileDiskService;
+use App\Services\Storage\FileDiskService;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 6c9f9a89..a723e1bf 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -2,9 +2,9 @@
 
 namespace App\Models;
 
-use App\Services\InvoiceService;
-use App\Services\Pdf\PdfTemplateUtils;
-use App\Support\PdfHtmlSanitizer;
+use App\Services\Documents\InvoiceService;
+use App\Support\Pdf\PdfHtmlSanitizer;
+use App\Support\Pdf\PdfTemplateUtils;
 use App\Traits\GeneratesPdfTrait;
 use App\Traits\HasCustomFieldsTrait;
 use Carbon\Carbon;
diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 139d80bd..9f716751 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -3,8 +3,8 @@
 namespace App\Models;
 
 use App\Jobs\GeneratePaymentPdfJob;
-use App\Services\PaymentService;
-use App\Support\PdfHtmlSanitizer;
+use App\Services\Documents\PaymentService;
+use App\Support\Pdf\PdfHtmlSanitizer;
 use App\Traits\GeneratesPdfTrait;
 use App\Traits\HasCustomFieldsTrait;
 use Carbon\Carbon;
diff --git a/app/Providers/AppConfigProvider.php b/app/Providers/AppConfigProvider.php
index 8a69dbdc..071f9600 100644
--- a/app/Providers/AppConfigProvider.php
+++ b/app/Providers/AppConfigProvider.php
@@ -4,9 +4,9 @@ namespace App\Providers;
 
 use App\Models\FileDisk;
 use App\Models\Setting;
-use App\Services\FileDiskService;
-use App\Services\MailConfigurationService;
-use App\Services\Setup\InstallUtils;
+use App\Services\Mail\MailConfigurationService;
+use App\Services\Storage\FileDiskService;
+use App\Support\Setup\InstallUtils;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 531bcb1d..911653ee 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -18,9 +18,9 @@ use App\Policies\ReportPolicy;
 use App\Policies\RolePolicy;
 use App\Policies\SettingsPolicy;
 use App\Policies\UserPolicy;
-use App\Services\Setup\InstallUtils;
 use App\Support\BouncerDefaultScope;
 use App\Support\InstallWizardAuth;
+use App\Support\Setup\InstallUtils;
 use Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Broadcast;
diff --git a/app/Services/CompanyService.php b/app/Services/Company/CompanyService.php
similarity index 99%
rename from app/Services/CompanyService.php
rename to app/Services/Company/CompanyService.php
index d58619ce..c96b6e4b 100644
--- a/app/Services/CompanyService.php
+++ b/app/Services/Company/CompanyService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Company;
 
 use App\Models\Company;
 use App\Models\CompanySetting;
diff --git a/app/Services/InvitationService.php b/app/Services/Company/InvitationService.php
similarity index 99%
rename from app/Services/InvitationService.php
rename to app/Services/Company/InvitationService.php
index 00877ea9..cf7eac7f 100644
--- a/app/Services/InvitationService.php
+++ b/app/Services/Company/InvitationService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Company;
 
 use App\Mail\CompanyInvitationMail;
 use App\Models\Company;
diff --git a/app/Services/MemberService.php b/app/Services/Company/MemberService.php
similarity index 98%
rename from app/Services/MemberService.php
rename to app/Services/Company/MemberService.php
index 22d76af7..1089194a 100644
--- a/app/Services/MemberService.php
+++ b/app/Services/Company/MemberService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Company;
 
 use App\Http\Requests\MemberRequest;
 use App\Models\User;
diff --git a/app/Services/CurrencyService.php b/app/Services/Documents/CurrencyService.php
similarity index 95%
rename from app/Services/CurrencyService.php
rename to app/Services/Documents/CurrencyService.php
index c3a800b5..f47e6e22 100644
--- a/app/Services/CurrencyService.php
+++ b/app/Services/Documents/CurrencyService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Documents;
 
 use App\Models\Currency;
 use Illuminate\Database\Eloquent\Collection;
diff --git a/app/Services/DocumentItemService.php b/app/Services/Documents/DocumentItemService.php
similarity index 98%
rename from app/Services/DocumentItemService.php
rename to app/Services/Documents/DocumentItemService.php
index 4e6703d9..734ec7ae 100644
--- a/app/Services/DocumentItemService.php
+++ b/app/Services/Documents/DocumentItemService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Documents;
 
 use Illuminate\Database\Eloquent\Model;
 
diff --git a/app/Services/EstimateService.php b/app/Services/Documents/EstimateService.php
similarity index 99%
rename from app/Services/EstimateService.php
rename to app/Services/Documents/EstimateService.php
index f39b12f6..b1da6a70 100644
--- a/app/Services/EstimateService.php
+++ b/app/Services/Documents/EstimateService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Documents;
 
 use App;
 use App\Facades\Hashids;
@@ -12,7 +12,8 @@ use App\Models\CustomField;
 use App\Models\Estimate;
 use App\Models\ExchangeRateLog;
 use App\Models\Invoice;
-use App\Services\Pdf\PdfTemplateUtils;
+use App\Services\Mail\CompanyMailConfigService;
+use App\Support\Pdf\PdfTemplateUtils;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
diff --git a/app/Services/ExpenseService.php b/app/Services/Documents/ExpenseService.php
similarity index 98%
rename from app/Services/ExpenseService.php
rename to app/Services/Documents/ExpenseService.php
index 603df4ff..bf772e5f 100644
--- a/app/Services/ExpenseService.php
+++ b/app/Services/Documents/ExpenseService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Documents;
 
 use App\Models\CompanySetting;
 use App\Models\ExchangeRateLog;
diff --git a/app/Services/InvoiceService.php b/app/Services/Documents/InvoiceService.php
similarity index 99%
rename from app/Services/InvoiceService.php
rename to app/Services/Documents/InvoiceService.php
index b4cdf864..09a7a4b7 100644
--- a/app/Services/InvoiceService.php
+++ b/app/Services/Documents/InvoiceService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Documents;
 
 use App;
 use App\Facades\Hashids;
@@ -12,7 +12,8 @@ use App\Models\CustomField;
 use App\Models\Estimate;
 use App\Models\ExchangeRateLog;
 use App\Models\Invoice;
-use App\Services\Pdf\PdfTemplateUtils;
+use App\Services\Mail\CompanyMailConfigService;
+use App\Support\Pdf\PdfTemplateUtils;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
diff --git a/app/Services/PaymentService.php b/app/Services/Documents/PaymentService.php
similarity index 98%
rename from app/Services/PaymentService.php
rename to app/Services/Documents/PaymentService.php
index 0a1e3565..14587ba5 100644
--- a/app/Services/PaymentService.php
+++ b/app/Services/Documents/PaymentService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Documents;
 
 use App\Facades\Hashids;
 use App\Facades\Pdf;
@@ -10,6 +10,7 @@ use App\Models\CompanySetting;
 use App\Models\ExchangeRateLog;
 use App\Models\Invoice;
 use App\Models\Payment;
+use App\Services\Mail\CompanyMailConfigService;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
diff --git a/app/Services/RecurringInvoiceService.php b/app/Services/Documents/RecurringInvoiceService.php
similarity index 99%
rename from app/Services/RecurringInvoiceService.php
rename to app/Services/Documents/RecurringInvoiceService.php
index 97459329..49c5c73f 100644
--- a/app/Services/RecurringInvoiceService.php
+++ b/app/Services/Documents/RecurringInvoiceService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Documents;
 
 use App\Facades\Hashids;
 use App\Http\Requests\RecurringInvoiceRequest;
diff --git a/app/Services/SerialNumberService.php b/app/Services/Documents/SerialNumberService.php
similarity index 99%
rename from app/Services/SerialNumberService.php
rename to app/Services/Documents/SerialNumberService.php
index 8b0b6d5b..967c2da5 100644
--- a/app/Services/SerialNumberService.php
+++ b/app/Services/Documents/SerialNumberService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Documents;
 
 use App\Models\CompanySetting;
 use App\Models\Customer;
diff --git a/app/Services/TransactionService.php b/app/Services/Documents/TransactionService.php
similarity index 95%
rename from app/Services/TransactionService.php
rename to app/Services/Documents/TransactionService.php
index 5922eda9..3f83d29b 100644
--- a/app/Services/TransactionService.php
+++ b/app/Services/Documents/TransactionService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Documents;
 
 use App\Facades\Hashids;
 use App\Models\Transaction;
diff --git a/app/Services/ExchangeRateProviderService.php b/app/Services/ExchangeRate/ExchangeRateProviderService.php
similarity index 99%
rename from app/Services/ExchangeRateProviderService.php
rename to app/Services/ExchangeRate/ExchangeRateProviderService.php
index b1caf77c..c4718edd 100644
--- a/app/Services/ExchangeRateProviderService.php
+++ b/app/Services/ExchangeRate/ExchangeRateProviderService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\ExchangeRate;
 
 use App\Http\Requests\ExchangeRateProviderRequest;
 use App\Models\CompanySetting;
diff --git a/app/Services/CompanyMailConfigService.php b/app/Services/Mail/CompanyMailConfigService.php
similarity index 86%
rename from app/Services/CompanyMailConfigService.php
rename to app/Services/Mail/CompanyMailConfigService.php
index e62e8474..4adb61ad 100644
--- a/app/Services/CompanyMailConfigService.php
+++ b/app/Services/Mail/CompanyMailConfigService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Mail;
 
 class CompanyMailConfigService
 {
diff --git a/app/Services/MailConfigurationService.php b/app/Services/Mail/MailConfigurationService.php
similarity index 99%
rename from app/Services/MailConfigurationService.php
rename to app/Services/Mail/MailConfigurationService.php
index 4049dfa5..3a4db7c7 100644
--- a/app/Services/MailConfigurationService.php
+++ b/app/Services/Mail/MailConfigurationService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Mail;
 
 use App\Models\CompanySetting;
 use App\Models\Setting;
diff --git a/app/Services/FontService.php b/app/Services/Pdf/FontService.php
similarity index 99%
rename from app/Services/FontService.php
rename to app/Services/Pdf/FontService.php
index 1572fbdb..4de9c689 100644
--- a/app/Services/FontService.php
+++ b/app/Services/Pdf/FontService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Pdf;
 
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Http;
diff --git a/app/Services/Backup/BackupConfigurationFactory.php b/app/Services/Storage/BackupConfigurationFactory.php
similarity index 88%
rename from app/Services/Backup/BackupConfigurationFactory.php
rename to app/Services/Storage/BackupConfigurationFactory.php
index 8d742224..769ecc30 100644
--- a/app/Services/Backup/BackupConfigurationFactory.php
+++ b/app/Services/Storage/BackupConfigurationFactory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Services\Backup;
+namespace App\Services\Storage;
 
 use App\Models\FileDisk;
-use App\Services\FileDiskService;
+use App\Services\Storage\FileDiskService;
 use Exception;
 use Spatie\Backup\Config\Config;
 
diff --git a/app/Services/Backup/BackupService.php b/app/Services/Storage/BackupService.php
similarity index 94%
rename from app/Services/Backup/BackupService.php
rename to app/Services/Storage/BackupService.php
index 41a95fc3..83bcced6 100644
--- a/app/Services/Backup/BackupService.php
+++ b/app/Services/Storage/BackupService.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Services\Backup;
+namespace App\Services\Storage;
 
 use App\Models\FileDisk;
 use App\Models\Setting;
-use App\Services\FileDiskService;
+use App\Services\Storage\FileDiskService;
 use Spatie\Backup\BackupDestination\BackupDestination;
 
 class BackupService
diff --git a/app/Services/FileDiskService.php b/app/Services/Storage/FileDiskService.php
similarity index 99%
rename from app/Services/FileDiskService.php
rename to app/Services/Storage/FileDiskService.php
index af2ac4bf..420ccf4d 100644
--- a/app/Services/FileDiskService.php
+++ b/app/Services/Storage/FileDiskService.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services;
+namespace App\Services\Storage;
 
 use App\Models\FileDisk;
 use Illuminate\Http\Request;
diff --git a/app/Services/Hashids/HashidsFactory.php b/app/Support/Hashids/HashidsFactory.php
similarity index 96%
rename from app/Services/Hashids/HashidsFactory.php
rename to app/Support/Hashids/HashidsFactory.php
index 495dd0a9..f5833d3b 100644
--- a/app/Services/Hashids/HashidsFactory.php
+++ b/app/Support/Hashids/HashidsFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services\Hashids;
+namespace App\Support\Hashids;
 
 use Hashids\Hashids;
 use Illuminate\Support\Arr;
diff --git a/app/Services/Hashids/HashidsManager.php b/app/Support/Hashids/HashidsManager.php
similarity index 98%
rename from app/Services/Hashids/HashidsManager.php
rename to app/Support/Hashids/HashidsManager.php
index 0d09219f..51f245b1 100644
--- a/app/Services/Hashids/HashidsManager.php
+++ b/app/Support/Hashids/HashidsManager.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services\Hashids;
+namespace App\Support\Hashids;
 
 use Hashids\Hashids;
 use Illuminate\Contracts\Config\Repository;
diff --git a/app/Services/Hashids/HashidsServiceProvider.php b/app/Support/Hashids/HashidsServiceProvider.php
similarity index 97%
rename from app/Services/Hashids/HashidsServiceProvider.php
rename to app/Support/Hashids/HashidsServiceProvider.php
index 10445ef5..febbd9e6 100644
--- a/app/Services/Hashids/HashidsServiceProvider.php
+++ b/app/Support/Hashids/HashidsServiceProvider.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Services\Hashids;
+namespace App\Support\Hashids;
 
 use Hashids\Hashids as HashidsClient;
 use Illuminate\Contracts\Container\Container;
diff --git a/app/Services/Pdf/ImageUtils.php b/app/Support/Pdf/ImageUtils.php
similarity index 92%
rename from app/Services/Pdf/ImageUtils.php
rename to app/Support/Pdf/ImageUtils.php
index 3fe99cfb..8f138d83 100644
--- a/app/Services/Pdf/ImageUtils.php
+++ b/app/Support/Pdf/ImageUtils.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Pdf;
+namespace App\Support\Pdf;
 
 use Illuminate\Support\Facades\File;
 
diff --git a/app/Support/PdfHtmlSanitizer.php b/app/Support/Pdf/PdfHtmlSanitizer.php
similarity index 98%
rename from app/Support/PdfHtmlSanitizer.php
rename to app/Support/Pdf/PdfHtmlSanitizer.php
index 464eaa3b..13788161 100644
--- a/app/Support/PdfHtmlSanitizer.php
+++ b/app/Support/Pdf/PdfHtmlSanitizer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Support;
+namespace App\Support\Pdf;
 
 use DOMDocument;
 use DOMElement;
diff --git a/app/Services/Pdf/PdfTemplateUtils.php b/app/Support/Pdf/PdfTemplateUtils.php
similarity index 99%
rename from app/Services/Pdf/PdfTemplateUtils.php
rename to app/Support/Pdf/PdfTemplateUtils.php
index 0d0fc3a0..5ced6df1 100644
--- a/app/Services/Pdf/PdfTemplateUtils.php
+++ b/app/Support/Pdf/PdfTemplateUtils.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Pdf;
+namespace App\Support\Pdf;
 
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
diff --git a/app/Services/Setup/EnvironmentManager.php b/app/Support/Setup/EnvironmentManager.php
similarity index 99%
rename from app/Services/Setup/EnvironmentManager.php
rename to app/Support/Setup/EnvironmentManager.php
index 167a6f31..1b6170e8 100755
--- a/app/Services/Setup/EnvironmentManager.php
+++ b/app/Support/Setup/EnvironmentManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Setup;
+namespace App\Support\Setup;
 
 use App\Http\Requests\DatabaseEnvironmentRequest;
 use App\Http\Requests\DomainEnvironmentRequest;
diff --git a/app/Services/Setup/FilePermissionChecker.php b/app/Support/Setup/FilePermissionChecker.php
similarity index 98%
rename from app/Services/Setup/FilePermissionChecker.php
rename to app/Support/Setup/FilePermissionChecker.php
index f79e4efb..d8a8295b 100644
--- a/app/Services/Setup/FilePermissionChecker.php
+++ b/app/Support/Setup/FilePermissionChecker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Setup;
+namespace App\Support\Setup;
 
 class FilePermissionChecker
 {
diff --git a/app/Services/Setup/InstallUtils.php b/app/Support/Setup/InstallUtils.php
similarity index 97%
rename from app/Services/Setup/InstallUtils.php
rename to app/Support/Setup/InstallUtils.php
index 9eb1ccaf..e70cd84e 100644
--- a/app/Services/Setup/InstallUtils.php
+++ b/app/Support/Setup/InstallUtils.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Setup;
+namespace App\Support\Setup;
 
 use App\Models\Setting;
 use Illuminate\Database\QueryException;
diff --git a/app/Services/Setup/RequirementsChecker.php b/app/Support/Setup/RequirementsChecker.php
similarity index 99%
rename from app/Services/Setup/RequirementsChecker.php
rename to app/Support/Setup/RequirementsChecker.php
index e5202d9e..a415bfd7 100755
--- a/app/Services/Setup/RequirementsChecker.php
+++ b/app/Support/Setup/RequirementsChecker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Setup;
+namespace App\Support\Setup;
 
 use Illuminate\Support\Str;
 use PDO;
diff --git a/app/Support/helpers.php b/app/Support/helpers.php
index 9ccfc1ec..51c5b121 100644
--- a/app/Support/helpers.php
+++ b/app/Support/helpers.php
@@ -4,7 +4,7 @@ use App\Models\CompanySetting;
 use App\Models\Currency;
 use App\Models\CustomField;
 use App\Models\Setting;
-use App\Services\Setup\InstallUtils;
+use App\Support\Setup\InstallUtils;
 use Illuminate\Support\Str;
 
 /**
diff --git a/app/Traits/GeneratesPdfTrait.php b/app/Traits/GeneratesPdfTrait.php
index 051e6683..927d0969 100644
--- a/app/Traits/GeneratesPdfTrait.php
+++ b/app/Traits/GeneratesPdfTrait.php
@@ -6,8 +6,8 @@ use App\Models\Address;
 use App\Models\CompanySetting;
 use App\Models\FileDisk;
 use App\Models\Setting;
-use App\Services\FontService;
-use App\Support\PdfHtmlSanitizer;
+use App\Services\Pdf\FontService;
+use App\Support\Pdf\PdfHtmlSanitizer;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\App;
 
diff --git a/bootstrap/providers.php b/bootstrap/providers.php
index 13cbe3c7..93e1ed79 100644
--- a/bootstrap/providers.php
+++ b/bootstrap/providers.php
@@ -7,7 +7,7 @@ use App\Providers\DropboxServiceProvider;
 use App\Providers\PdfServiceProvider;
 use App\Providers\RouteServiceProvider;
 use App\Providers\ViewServiceProvider;
-use App\Services\Hashids\HashidsServiceProvider;
+use App\Support\Hashids\HashidsServiceProvider;
 
 return [
     HashidsServiceProvider::class,
diff --git a/config/hashids.php b/config/hashids.php
index 6c53f690..0e661a28 100644
--- a/config/hashids.php
+++ b/config/hashids.php
@@ -3,7 +3,7 @@
 /**
  * Hashids connection config (per model class).
  *
- * Wired by App\Services\Hashids\HashidsServiceProvider using the hashids/hashids package.
+ * Wired by App\Support\Hashids\HashidsServiceProvider using the hashids/hashids package.
  */
 
 use App\Models\Company;
diff --git a/database/factories/EstimateFactory.php b/database/factories/EstimateFactory.php
index 77a164ec..aaa1cff7 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\SerialNumberService;
+use App\Services\Documents\SerialNumberService;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class EstimateFactory extends Factory
diff --git a/database/factories/InvoiceFactory.php b/database/factories/InvoiceFactory.php
index cea7f4fa..8f5bf884 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\SerialNumberService;
+use App\Services\Documents\SerialNumberService;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class InvoiceFactory extends Factory
diff --git a/database/factories/PaymentFactory.php b/database/factories/PaymentFactory.php
index acb70374..e11cac5e 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\SerialNumberService;
+use App\Services\Documents\SerialNumberService;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class PaymentFactory extends Factory
diff --git a/database/seeders/DemoSeeder.php b/database/seeders/DemoSeeder.php
index 4a508f5c..e80c95a1 100644
--- a/database/seeders/DemoSeeder.php
+++ b/database/seeders/DemoSeeder.php
@@ -8,7 +8,7 @@ use App\Models\CompanySetting;
 use App\Models\Customer;
 use App\Models\Setting;
 use App\Models\User;
-use App\Services\CompanyService;
+use App\Services\Company\CompanyService;
 use Illuminate\Database\Seeder;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php
index 90e1ebd4..f414459e 100644
--- a/database/seeders/UsersTableSeeder.php
+++ b/database/seeders/UsersTableSeeder.php
@@ -6,8 +6,8 @@ use App\Facades\Hashids;
 use App\Models\Company;
 use App\Models\Setting;
 use App\Models\User;
-use App\Services\CompanyService;
-use App\Services\Setup\InstallUtils;
+use App\Services\Company\CompanyService;
+use App\Support\Setup\InstallUtils;
 use Illuminate\Database\Seeder;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/routes/console.php b/routes/console.php
index 7a83d2fb..d63d60f6 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -2,8 +2,8 @@
 
 use App\Models\CompanySetting;
 use App\Models\RecurringInvoice;
-use App\Services\RecurringInvoiceService;
-use App\Services\Setup\InstallUtils;
+use App\Services\Documents\RecurringInvoiceService;
+use App\Support\Setup\InstallUtils;
 use Illuminate\Support\Facades\Schedule;
 
 // Only run in demo environment
diff --git a/tests/Feature/Admin/BackupGlobalTest.php b/tests/Feature/Admin/BackupGlobalTest.php
index 2e204ea1..07ef1db9 100644
--- a/tests/Feature/Admin/BackupGlobalTest.php
+++ b/tests/Feature/Admin/BackupGlobalTest.php
@@ -3,7 +3,7 @@
 use App\Jobs\CreateBackupJob;
 use App\Models\FileDisk;
 use App\Models\User;
-use App\Services\Backup\BackupConfigurationFactory;
+use App\Services\Storage\BackupConfigurationFactory;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Queue;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Company/CompanyMailConfigurationControllerTest.php b/tests/Feature/Company/CompanyMailConfigurationControllerTest.php
index 0a993954..ef2bf60a 100644
--- a/tests/Feature/Company/CompanyMailConfigurationControllerTest.php
+++ b/tests/Feature/Company/CompanyMailConfigurationControllerTest.php
@@ -3,8 +3,8 @@
 use App\Models\CompanySetting;
 use App\Models\Setting;
 use App\Models\User;
-use App\Services\CompanyMailConfigService;
-use App\Services\MailConfigurationService;
+use App\Services\Mail\CompanyMailConfigService;
+use App\Services\Mail\MailConfigurationService;
 use Illuminate\Support\Facades\Artisan;
 use Laravel\Sanctum\Sanctum;
 
diff --git a/tests/Unit/EstimateTest.php b/tests/Unit/EstimateTest.php
index b337df84..1f7299bb 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\DocumentItemService;
-use App\Services\EstimateService;
+use App\Services\Documents\DocumentItemService;
+use App\Services\Documents\EstimateService;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/InvoiceTest.php b/tests/Unit/InvoiceTest.php
index 32967f84..13cc781f 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\DocumentItemService;
-use App\Services\InvoiceService;
+use App\Services\Documents\DocumentItemService;
+use App\Services\Documents\InvoiceService;
 use Illuminate\Support\Facades\Artisan;
 
 beforeEach(function () {
diff --git a/tests/Unit/PdfHtmlSanitizerTest.php b/tests/Unit/PdfHtmlSanitizerTest.php
index 12f8f152..25b067f4 100644
--- a/tests/Unit/PdfHtmlSanitizerTest.php
+++ b/tests/Unit/PdfHtmlSanitizerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Support\PdfHtmlSanitizer;
+use App\Support\Pdf\PdfHtmlSanitizer;
 
 it('removes img tags that could trigger SSRF during PDF rendering', function () {
     $html = "<p>Hi</p><img src='http://example.com/x'>";