From 64c481e9638485a2e5e01f42e44b5bfd7f0f2c1d Mon Sep 17 00:00:00 2001
From: Darko Gjorgjijoski <dg@darkog.com>
Date: Fri, 3 Apr 2026 19:15:20 +0200
Subject: [PATCH] Rename controller namespaces: drop V1 prefix, clarify roles

V1/Admin     -> Company       (company-scoped controllers)
V1/SuperAdmin -> Admin        (platform-wide admin controllers)
V1/Customer  -> CustomerPortal (customer-facing portal)
V1/Installation -> Setup      (installation wizard)
V1/PDF       -> Pdf           (consistent casing)
V1/Modules   -> Modules       (drop V1 prefix)
V1/Webhook   -> Webhook       (drop V1 prefix)

The V1 prefix served no purpose - API versioning is in the route prefix
(/api/v1/), not the controller namespace. "Admin" was misleading for
company-scoped controllers. "SuperAdmin" is now simply "Admin" for
platform administration.
---
 .../Backup/ApiController.php                  |   2 +-
 .../Backup/BackupsController.php              |   2 +-
 .../Backup/DownloadBackupController.php       |   2 +-
 .../CompaniesController.php                   |   2 +-
 .../CountriesController.php                   |   2 +-
 .../CurrenciesController.php                  |   2 +-
 .../Modules/ApiTokenController.php            |   2 +-
 .../CompleteModuleInstallationController.php  |   2 +-
 .../Modules/CopyModuleController.php          |   2 +-
 .../Modules/DisableModuleController.php       |   2 +-
 .../Modules/DownloadModuleController.php      |   2 +-
 .../Modules/EnableModuleController.php        |   2 +-
 .../Modules/ModuleController.php              |   2 +-
 .../Modules/ModulesController.php             |   2 +-
 .../Modules/UnzipModuleController.php         |   2 +-
 .../Modules/UploadModuleController.php        |   2 +-
 .../Settings/DiskController.php               |   2 +-
 .../Settings/GetSettingsController.php        |   2 +-
 .../Settings/MailConfigurationController.php  |   2 +-
 .../Settings/PDFConfigurationController.php   |   2 +-
 .../Settings/UpdateSettingsController.php     |   2 +-
 .../Update/CheckVersionController.php         |   2 +-
 .../Update/CopyFilesController.php            |   2 +-
 .../Update/DeleteFilesController.php          |   2 +-
 .../Update/DownloadUpdateController.php       |   2 +-
 .../Update/FinishUpdateController.php         |   2 +-
 .../Update/MigrateUpdateController.php        |   2 +-
 .../Update/UnzipUpdateController.php          |   2 +-
 .../Update/UpdateController.php               |   2 +-
 .../SuperAdmin => Admin}/UsersController.php  |   2 +-
 .../Auth/ConfirmPasswordController.php        |   2 +-
 .../Auth/ForgotPasswordController.php         |   2 +-
 .../Auth/LoginController.php                  |   2 +-
 .../Auth/RegisterController.php               |   2 +-
 .../Auth/ResetPasswordController.php          |   2 +-
 .../Auth/VerificationController.php           |   2 +-
 .../Company/CompaniesController.php           |   2 +-
 .../Config/FiscalYearsController.php          |   2 +-
 .../Config/LanguagesController.php            |   2 +-
 .../Config/RetrospectiveEditsController.php   |   2 +-
 .../CustomField/CustomFieldsController.php    |   2 +-
 .../Customer/CustomerStatsController.php      |   2 +-
 .../Customer/CustomersController.php          |   2 +-
 .../Dashboard/DashboardController.php         |   2 +-
 .../Estimate/EstimateTemplatesController.php  |   2 +-
 .../Estimate/EstimatesController.php          |   2 +-
 .../ExchangeRateProviderController.php        |   2 +-
 .../Expense/ExpenseCategoriesController.php   |   2 +-
 .../Expense/ExpensesController.php            |   2 +-
 .../General/BootstrapController.php           |   2 +-
 .../General/ConfigController.php              |   2 +-
 .../General/FormatsController.php             |   2 +-
 .../General/NotesController.php               |   2 +-
 .../General/SearchController.php              |   2 +-
 .../General/SerialNumberController.php        |   2 +-
 .../Invoice/InvoiceTemplatesController.php    |   2 +-
 .../Invoice/InvoicesController.php            |   2 +-
 .../Item/ItemsController.php                  |   2 +-
 .../Item/UnitsController.php                  |   2 +-
 .../Mobile/AuthController.php                 |   2 +-
 .../Payment/PaymentMethodsController.php      |   2 +-
 .../Payment/PaymentsController.php            |   2 +-
 .../RecurringInvoiceController.php            |   2 +-
 .../RecurringInvoiceFrequencyController.php   |   2 +-
 .../Report/CustomerSalesReportController.php  |   2 +-
 .../Report/ExpensesReportController.php       |   2 +-
 .../Report/ItemSalesReportController.php      |   2 +-
 .../Report/ProfitLossReportController.php     |   2 +-
 .../Report/TaxSummaryReportController.php     |   2 +-
 .../Role/AbilitiesController.php              |   2 +-
 .../Role/RolesController.php                  |   2 +-
 .../Settings/CompanyController.php            |   2 +-
 ...anyCurrencyCheckTransactionsController.php |   2 +-
 .../CompanyMailConfigurationController.php    |   2 +-
 .../Settings/CompanySettingsController.php    |   2 +-
 .../Settings/TaxTypesController.php           |   2 +-
 .../Settings/UserProfileController.php        |   2 +-
 .../Settings/UserSettingsController.php       |   2 +-
 .../Users/UsersController.php                 |   2 +-
 .../Auth/ForgotPasswordController.php         |   2 +-
 .../Auth/LoginController.php                  |   2 +-
 .../Auth/ResetPasswordController.php          |   2 +-
 .../Estimate/AcceptEstimateController.php     |   2 +-
 .../Estimate/EstimatesController.php          |   2 +-
 .../EstimatePdfController.php                 |   2 +-
 .../Expense/ExpensesController.php            |   2 +-
 .../General/BootstrapController.php           |   2 +-
 .../General/DashboardController.php           |   2 +-
 .../General/ProfileController.php             |   2 +-
 .../Invoice/InvoicesController.php            |   2 +-
 .../InvoicePdfController.php                  |   2 +-
 .../Payment/PaymentMethodController.php       |   2 +-
 .../Payment/PaymentsController.php            |   2 +-
 .../PaymentPdfController.php                  |   2 +-
 .../{V1 => }/Modules/ScriptController.php     |   2 +-
 .../{V1 => }/Modules/StyleController.php      |   2 +-
 .../DownloadInvoicePdfController.php          |   2 +-
 .../DownloadPaymentPdfController.php          |   2 +-
 .../PDF => Pdf}/DownloadReceiptController.php |   2 +-
 .../{V1/PDF => Pdf}/EstimatePdfController.php |   2 +-
 .../{V1/PDF => Pdf}/InvoicePdfController.php  |   2 +-
 .../{V1/PDF => Pdf}/PaymentPdfController.php  |   2 +-
 .../AppDomainController.php                   |   2 +-
 .../DatabaseConfigurationController.php       |   2 +-
 .../FilePermissionsController.php             |   2 +-
 .../FinishController.php                      |   2 +-
 .../LanguagesController.php                   |   2 +-
 .../LoginController.php                       |   2 +-
 .../OnboardingWizardController.php            |   2 +-
 .../RequirementsController.php                |   2 +-
 .../{V1 => }/Webhook/CronJobController.php    |   2 +-
 routes/api.php                                | 182 +++++++++---------
 routes/web.php                                |  34 ++--
 tests/Feature/Admin/CompanySettingTest.php    |   4 +-
 tests/Feature/Admin/CompanyTest.php           |   2 +-
 tests/Feature/Admin/CustomFieldTest.php       |   2 +-
 tests/Feature/Admin/CustomerTest.php          |   2 +-
 tests/Feature/Admin/EstimateTest.php          |   2 +-
 tests/Feature/Admin/ExpenseCategoryTest.php   |   2 +-
 tests/Feature/Admin/ExpenseTest.php           |   2 +-
 tests/Feature/Admin/InvoiceTest.php           |   2 +-
 tests/Feature/Admin/ItemTest.php              |   2 +-
 tests/Feature/Admin/PaymentMethodTest.php     |   2 +-
 tests/Feature/Admin/PaymentTest.php           |   2 +-
 tests/Feature/Admin/RecurringInvoiceTest.php  |   2 +-
 tests/Feature/Admin/TaxTypeTest.php           |   2 +-
 tests/Feature/Admin/UnitTest.php              |   2 +-
 tests/Feature/Admin/UserTest.php              |   2 +-
 tests/Feature/Customer/ProfileTest.php        |   2 +-
 129 files changed, 236 insertions(+), 236 deletions(-)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Backup/ApiController.php (87%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Backup/BackupsController.php (98%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Backup/DownloadBackupController.php (97%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/CompaniesController.php (97%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/CountriesController.php (90%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/CurrenciesController.php (91%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Modules/ApiTokenController.php (89%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Modules/CompleteModuleInstallationController.php (91%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Modules/CopyModuleController.php (91%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Modules/DisableModuleController.php (93%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Modules/DownloadModuleController.php (90%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Modules/EnableModuleController.php (93%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Modules/ModuleController.php (93%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Modules/ModulesController.php (89%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Modules/UnzipModuleController.php (91%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Modules/UploadModuleController.php (90%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Settings/DiskController.php (98%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Settings/GetSettingsController.php (91%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Settings/MailConfigurationController.php (99%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Settings/PDFConfigurationController.php (98%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Settings/UpdateSettingsController.php (91%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Update/CheckVersionController.php (94%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Update/CopyFilesController.php (93%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Update/DeleteFilesController.php (93%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Update/DownloadUpdateController.php (93%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Update/FinishUpdateController.php (93%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Update/MigrateUpdateController.php (92%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Update/UnzipUpdateController.php (95%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/Update/UpdateController.php (97%)
 rename app/Http/Controllers/{V1/SuperAdmin => Admin}/UsersController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Auth/ConfirmPasswordController.php (95%)
 rename app/Http/Controllers/{V1/Admin => Company}/Auth/ForgotPasswordController.php (97%)
 rename app/Http/Controllers/{V1/Admin => Company}/Auth/LoginController.php (95%)
 rename app/Http/Controllers/{V1/Admin => Company}/Auth/RegisterController.php (97%)
 rename app/Http/Controllers/{V1/Admin => Company}/Auth/ResetPasswordController.php (97%)
 rename app/Http/Controllers/{V1/Admin => Company}/Auth/VerificationController.php (95%)
 rename app/Http/Controllers/{V1/Admin => Company}/Company/CompaniesController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Config/FiscalYearsController.php (89%)
 rename app/Http/Controllers/{V1/Admin => Company}/Config/LanguagesController.php (89%)
 rename app/Http/Controllers/{V1/Admin => Company}/Config/RetrospectiveEditsController.php (90%)
 rename app/Http/Controllers/{V1/Admin => Company}/CustomField/CustomFieldsController.php (97%)
 rename app/Http/Controllers/{V1/Admin => Company}/Customer/CustomerStatsController.php (94%)
 rename app/Http/Controllers/{V1/Admin => Company}/Customer/CustomersController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Dashboard/DashboardController.php (99%)
 rename app/Http/Controllers/{V1/Admin => Company}/Estimate/EstimateTemplatesController.php (92%)
 rename app/Http/Controllers/{V1/Admin => Company}/Estimate/EstimatesController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/ExchangeRate/ExchangeRateProviderController.php (99%)
 rename app/Http/Controllers/{V1/Admin => Company}/Expense/ExpenseCategoriesController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Expense/ExpensesController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/General/BootstrapController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/General/ConfigController.php (89%)
 rename app/Http/Controllers/{V1/Admin => Company}/General/FormatsController.php (93%)
 rename app/Http/Controllers/{V1/Admin => Company}/General/NotesController.php (97%)
 rename app/Http/Controllers/{V1/Admin => Company}/General/SearchController.php (95%)
 rename app/Http/Controllers/{V1/Admin => Company}/General/SerialNumberController.php (97%)
 rename app/Http/Controllers/{V1/Admin => Company}/Invoice/InvoiceTemplatesController.php (93%)
 rename app/Http/Controllers/{V1/Admin => Company}/Invoice/InvoicesController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Item/ItemsController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Item/UnitsController.php (97%)
 rename app/Http/Controllers/{V1/Admin => Company}/Mobile/AuthController.php (95%)
 rename app/Http/Controllers/{V1/Admin => Company}/Payment/PaymentMethodsController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Payment/PaymentsController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/RecurringInvoice/RecurringInvoiceController.php (97%)
 rename app/Http/Controllers/{V1/Admin => Company}/RecurringInvoice/RecurringInvoiceFrequencyController.php (88%)
 rename app/Http/Controllers/{V1/Admin => Company}/Report/CustomerSalesReportController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Report/ExpensesReportController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Report/ItemSalesReportController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Report/ProfitLossReportController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Report/TaxSummaryReportController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Role/AbilitiesController.php (89%)
 rename app/Http/Controllers/{V1/Admin => Company}/Role/RolesController.php (98%)
 rename app/Http/Controllers/{V1/Admin => Company}/Settings/CompanyController.php (96%)
 rename app/Http/Controllers/{V1/Admin => Company}/Settings/CompanyCurrencyCheckTransactionsController.php (91%)
 rename app/Http/Controllers/{V1/Admin => Company}/Settings/CompanyMailConfigurationController.php (99%)
 rename app/Http/Controllers/{V1/Admin => Company}/Settings/CompanySettingsController.php (96%)
 rename app/Http/Controllers/{V1/Admin => Company}/Settings/TaxTypesController.php (97%)
 rename app/Http/Controllers/{V1/Admin => Company}/Settings/UserProfileController.php (96%)
 rename app/Http/Controllers/{V1/Admin => Company}/Settings/UserSettingsController.php (92%)
 rename app/Http/Controllers/{V1/Admin => Company}/Users/UsersController.php (98%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/Auth/ForgotPasswordController.php (96%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/Auth/LoginController.php (95%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/Auth/ResetPasswordController.php (97%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/Estimate/AcceptEstimateController.php (93%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/Estimate/EstimatesController.php (96%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/EstimatePdfController.php (97%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/Expense/ExpensesController.php (96%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/General/BootstrapController.php (95%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/General/DashboardController.php (96%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/General/ProfileController.php (96%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/Invoice/InvoicesController.php (96%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/InvoicePdfController.php (97%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/Payment/PaymentMethodController.php (90%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/Payment/PaymentsController.php (96%)
 rename app/Http/Controllers/{V1/Customer => CustomerPortal}/PaymentPdfController.php (92%)
 rename app/Http/Controllers/{V1 => }/Modules/ScriptController.php (95%)
 rename app/Http/Controllers/{V1 => }/Modules/StyleController.php (95%)
 rename app/Http/Controllers/{V1/PDF => Pdf}/DownloadInvoicePdfController.php (92%)
 rename app/Http/Controllers/{V1/PDF => Pdf}/DownloadPaymentPdfController.php (92%)
 rename app/Http/Controllers/{V1/PDF => Pdf}/DownloadReceiptController.php (95%)
 rename app/Http/Controllers/{V1/PDF => Pdf}/EstimatePdfController.php (94%)
 rename app/Http/Controllers/{V1/PDF => Pdf}/InvoicePdfController.php (94%)
 rename app/Http/Controllers/{V1/PDF => Pdf}/PaymentPdfController.php (92%)
 rename app/Http/Controllers/{V1/Installation => Setup}/AppDomainController.php (93%)
 rename app/Http/Controllers/{V1/Installation => Setup}/DatabaseConfigurationController.php (98%)
 rename app/Http/Controllers/{V1/Installation => Setup}/FilePermissionsController.php (94%)
 rename app/Http/Controllers/{V1/Installation => Setup}/FinishController.php (88%)
 rename app/Http/Controllers/{V1/Installation => Setup}/LanguagesController.php (88%)
 rename app/Http/Controllers/{V1/Installation => Setup}/LoginController.php (92%)
 rename app/Http/Controllers/{V1/Installation => Setup}/OnboardingWizardController.php (96%)
 rename app/Http/Controllers/{V1/Installation => Setup}/RequirementsController.php (94%)
 rename app/Http/Controllers/{V1 => }/Webhook/CronJobController.php (90%)

diff --git a/app/Http/Controllers/V1/SuperAdmin/Backup/ApiController.php b/app/Http/Controllers/Admin/Backup/ApiController.php
similarity index 87%
rename from app/Http/Controllers/V1/SuperAdmin/Backup/ApiController.php
rename to app/Http/Controllers/Admin/Backup/ApiController.php
index 5d65e6c7..d052dd08 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Backup/ApiController.php
+++ b/app/Http/Controllers/Admin/Backup/ApiController.php
@@ -2,7 +2,7 @@
 
 // Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
 
-namespace App\Http\Controllers\V1\SuperAdmin\Backup;
+namespace App\Http\Controllers\Admin\Backup;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Backup/BackupsController.php b/app/Http/Controllers/Admin/Backup/BackupsController.php
similarity index 98%
rename from app/Http/Controllers/V1/SuperAdmin/Backup/BackupsController.php
rename to app/Http/Controllers/Admin/Backup/BackupsController.php
index 2db8a625..24749a41 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Backup/BackupsController.php
+++ b/app/Http/Controllers/Admin/Backup/BackupsController.php
@@ -2,7 +2,7 @@
 
 // Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
 
-namespace App\Http\Controllers\V1\SuperAdmin\Backup;
+namespace App\Http\Controllers\Admin\Backup;
 
 use App\Jobs\CreateBackupJob;
 use App\Models\FileDisk;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Backup/DownloadBackupController.php b/app/Http/Controllers/Admin/Backup/DownloadBackupController.php
similarity index 97%
rename from app/Http/Controllers/V1/SuperAdmin/Backup/DownloadBackupController.php
rename to app/Http/Controllers/Admin/Backup/DownloadBackupController.php
index 3e86258e..e8dee0f8 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Backup/DownloadBackupController.php
+++ b/app/Http/Controllers/Admin/Backup/DownloadBackupController.php
@@ -2,7 +2,7 @@
 
 // Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
 
-namespace App\Http\Controllers\V1\SuperAdmin\Backup;
+namespace App\Http\Controllers\Admin\Backup;
 
 use App\Rules\Backup\PathToZip;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/V1/SuperAdmin/CompaniesController.php b/app/Http/Controllers/Admin/CompaniesController.php
similarity index 97%
rename from app/Http/Controllers/V1/SuperAdmin/CompaniesController.php
rename to app/Http/Controllers/Admin/CompaniesController.php
index fc301aab..6e628832 100644
--- a/app/Http/Controllers/V1/SuperAdmin/CompaniesController.php
+++ b/app/Http/Controllers/Admin/CompaniesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin;
+namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\AdminCompanyUpdateRequest;
diff --git a/app/Http/Controllers/V1/SuperAdmin/CountriesController.php b/app/Http/Controllers/Admin/CountriesController.php
similarity index 90%
rename from app/Http/Controllers/V1/SuperAdmin/CountriesController.php
rename to app/Http/Controllers/Admin/CountriesController.php
index d1bfa82c..c01da8c9 100644
--- a/app/Http/Controllers/V1/SuperAdmin/CountriesController.php
+++ b/app/Http/Controllers/Admin/CountriesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin;
+namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\CountryResource;
diff --git a/app/Http/Controllers/V1/SuperAdmin/CurrenciesController.php b/app/Http/Controllers/Admin/CurrenciesController.php
similarity index 91%
rename from app/Http/Controllers/V1/SuperAdmin/CurrenciesController.php
rename to app/Http/Controllers/Admin/CurrenciesController.php
index 39b989d9..cecf41e1 100644
--- a/app/Http/Controllers/V1/SuperAdmin/CurrenciesController.php
+++ b/app/Http/Controllers/Admin/CurrenciesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin;
+namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\CurrencyResource;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Modules/ApiTokenController.php b/app/Http/Controllers/Admin/Modules/ApiTokenController.php
similarity index 89%
rename from app/Http/Controllers/V1/SuperAdmin/Modules/ApiTokenController.php
rename to app/Http/Controllers/Admin/Modules/ApiTokenController.php
index a4832a38..7d0122be 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Modules/ApiTokenController.php
+++ b/app/Http/Controllers/Admin/Modules/ApiTokenController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Modules;
+namespace App\Http\Controllers\Admin\Modules;
 
 use App\Http\Controllers\Controller;
 use App\Services\Module\ModuleInstaller;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Modules/CompleteModuleInstallationController.php b/app/Http/Controllers/Admin/Modules/CompleteModuleInstallationController.php
similarity index 91%
rename from app/Http/Controllers/V1/SuperAdmin/Modules/CompleteModuleInstallationController.php
rename to app/Http/Controllers/Admin/Modules/CompleteModuleInstallationController.php
index 48729666..ddcc6bf7 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Modules/CompleteModuleInstallationController.php
+++ b/app/Http/Controllers/Admin/Modules/CompleteModuleInstallationController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Modules;
+namespace App\Http\Controllers\Admin\Modules;
 
 use App\Http\Controllers\Controller;
 use App\Services\Module\ModuleInstaller;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Modules/CopyModuleController.php b/app/Http/Controllers/Admin/Modules/CopyModuleController.php
similarity index 91%
rename from app/Http/Controllers/V1/SuperAdmin/Modules/CopyModuleController.php
rename to app/Http/Controllers/Admin/Modules/CopyModuleController.php
index 697a78d9..32498beb 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Modules/CopyModuleController.php
+++ b/app/Http/Controllers/Admin/Modules/CopyModuleController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Modules;
+namespace App\Http\Controllers\Admin\Modules;
 
 use App\Http\Controllers\Controller;
 use App\Services\Module\ModuleInstaller;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Modules/DisableModuleController.php b/app/Http/Controllers/Admin/Modules/DisableModuleController.php
similarity index 93%
rename from app/Http/Controllers/V1/SuperAdmin/Modules/DisableModuleController.php
rename to app/Http/Controllers/Admin/Modules/DisableModuleController.php
index c4398329..280d628b 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Modules/DisableModuleController.php
+++ b/app/Http/Controllers/Admin/Modules/DisableModuleController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Modules;
+namespace App\Http\Controllers\Admin\Modules;
 
 use App\Events\ModuleDisabledEvent;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Modules/DownloadModuleController.php b/app/Http/Controllers/Admin/Modules/DownloadModuleController.php
similarity index 90%
rename from app/Http/Controllers/V1/SuperAdmin/Modules/DownloadModuleController.php
rename to app/Http/Controllers/Admin/Modules/DownloadModuleController.php
index a7fe4f38..f3e0e6a1 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Modules/DownloadModuleController.php
+++ b/app/Http/Controllers/Admin/Modules/DownloadModuleController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Modules;
+namespace App\Http\Controllers\Admin\Modules;
 
 use App\Http\Controllers\Controller;
 use App\Services\Module\ModuleInstaller;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Modules/EnableModuleController.php b/app/Http/Controllers/Admin/Modules/EnableModuleController.php
similarity index 93%
rename from app/Http/Controllers/V1/SuperAdmin/Modules/EnableModuleController.php
rename to app/Http/Controllers/Admin/Modules/EnableModuleController.php
index 0a068396..559b97e8 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Modules/EnableModuleController.php
+++ b/app/Http/Controllers/Admin/Modules/EnableModuleController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Modules;
+namespace App\Http\Controllers\Admin\Modules;
 
 use App\Events\ModuleEnabledEvent;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Modules/ModuleController.php b/app/Http/Controllers/Admin/Modules/ModuleController.php
similarity index 93%
rename from app/Http/Controllers/V1/SuperAdmin/Modules/ModuleController.php
rename to app/Http/Controllers/Admin/Modules/ModuleController.php
index c993a62a..4b0e529c 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Modules/ModuleController.php
+++ b/app/Http/Controllers/Admin/Modules/ModuleController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Modules;
+namespace App\Http\Controllers\Admin\Modules;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\ModuleResource;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Modules/ModulesController.php b/app/Http/Controllers/Admin/Modules/ModulesController.php
similarity index 89%
rename from app/Http/Controllers/V1/SuperAdmin/Modules/ModulesController.php
rename to app/Http/Controllers/Admin/Modules/ModulesController.php
index 8a45881f..ca4a5401 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Modules/ModulesController.php
+++ b/app/Http/Controllers/Admin/Modules/ModulesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Modules;
+namespace App\Http\Controllers\Admin\Modules;
 
 use App\Http\Controllers\Controller;
 use App\Services\Module\ModuleInstaller;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Modules/UnzipModuleController.php b/app/Http/Controllers/Admin/Modules/UnzipModuleController.php
similarity index 91%
rename from app/Http/Controllers/V1/SuperAdmin/Modules/UnzipModuleController.php
rename to app/Http/Controllers/Admin/Modules/UnzipModuleController.php
index 99704d44..32d46ae8 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Modules/UnzipModuleController.php
+++ b/app/Http/Controllers/Admin/Modules/UnzipModuleController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Modules;
+namespace App\Http\Controllers\Admin\Modules;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\UnzipUpdateRequest;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Modules/UploadModuleController.php b/app/Http/Controllers/Admin/Modules/UploadModuleController.php
similarity index 90%
rename from app/Http/Controllers/V1/SuperAdmin/Modules/UploadModuleController.php
rename to app/Http/Controllers/Admin/Modules/UploadModuleController.php
index 777ebde4..fcf3a3d4 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Modules/UploadModuleController.php
+++ b/app/Http/Controllers/Admin/Modules/UploadModuleController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Modules;
+namespace App\Http\Controllers\Admin\Modules;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\UploadModuleRequest;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Settings/DiskController.php b/app/Http/Controllers/Admin/Settings/DiskController.php
similarity index 98%
rename from app/Http/Controllers/V1/SuperAdmin/Settings/DiskController.php
rename to app/Http/Controllers/Admin/Settings/DiskController.php
index f653f172..a45925be 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Settings/DiskController.php
+++ b/app/Http/Controllers/Admin/Settings/DiskController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Settings;
+namespace App\Http\Controllers\Admin\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DiskEnvironmentRequest;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Settings/GetSettingsController.php b/app/Http/Controllers/Admin/Settings/GetSettingsController.php
similarity index 91%
rename from app/Http/Controllers/V1/SuperAdmin/Settings/GetSettingsController.php
rename to app/Http/Controllers/Admin/Settings/GetSettingsController.php
index abeefdb6..3555b467 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Settings/GetSettingsController.php
+++ b/app/Http/Controllers/Admin/Settings/GetSettingsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Settings;
+namespace App\Http\Controllers\Admin\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\GetSettingRequest;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Settings/MailConfigurationController.php b/app/Http/Controllers/Admin/Settings/MailConfigurationController.php
similarity index 99%
rename from app/Http/Controllers/V1/SuperAdmin/Settings/MailConfigurationController.php
rename to app/Http/Controllers/Admin/Settings/MailConfigurationController.php
index 13ea5e10..310ed3d6 100755
--- a/app/Http/Controllers/V1/SuperAdmin/Settings/MailConfigurationController.php
+++ b/app/Http/Controllers/Admin/Settings/MailConfigurationController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Settings;
+namespace App\Http\Controllers\Admin\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\MailEnvironmentRequest;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Settings/PDFConfigurationController.php b/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php
similarity index 98%
rename from app/Http/Controllers/V1/SuperAdmin/Settings/PDFConfigurationController.php
rename to app/Http/Controllers/Admin/Settings/PDFConfigurationController.php
index d84414ce..26735922 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Settings/PDFConfigurationController.php
+++ b/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Settings;
+namespace App\Http\Controllers\Admin\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\PDFConfigurationRequest;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Settings/UpdateSettingsController.php b/app/Http/Controllers/Admin/Settings/UpdateSettingsController.php
similarity index 91%
rename from app/Http/Controllers/V1/SuperAdmin/Settings/UpdateSettingsController.php
rename to app/Http/Controllers/Admin/Settings/UpdateSettingsController.php
index 667552a2..47c4bd09 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Settings/UpdateSettingsController.php
+++ b/app/Http/Controllers/Admin/Settings/UpdateSettingsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Settings;
+namespace App\Http\Controllers\Admin\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\SettingRequest;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Update/CheckVersionController.php b/app/Http/Controllers/Admin/Update/CheckVersionController.php
similarity index 94%
rename from app/Http/Controllers/V1/SuperAdmin/Update/CheckVersionController.php
rename to app/Http/Controllers/Admin/Update/CheckVersionController.php
index 20fea25d..06ed80cb 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Update/CheckVersionController.php
+++ b/app/Http/Controllers/Admin/Update/CheckVersionController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Update;
+namespace App\Http\Controllers\Admin\Update;
 
 use App\Http\Controllers\Controller;
 use App\Services\Update\Updater;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Update/CopyFilesController.php b/app/Http/Controllers/Admin/Update/CopyFilesController.php
similarity index 93%
rename from app/Http/Controllers/V1/SuperAdmin/Update/CopyFilesController.php
rename to app/Http/Controllers/Admin/Update/CopyFilesController.php
index 486391e8..bde6b54b 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Update/CopyFilesController.php
+++ b/app/Http/Controllers/Admin/Update/CopyFilesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Update;
+namespace App\Http\Controllers\Admin\Update;
 
 use App\Http\Controllers\Controller;
 use App\Services\Update\Updater;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Update/DeleteFilesController.php b/app/Http/Controllers/Admin/Update/DeleteFilesController.php
similarity index 93%
rename from app/Http/Controllers/V1/SuperAdmin/Update/DeleteFilesController.php
rename to app/Http/Controllers/Admin/Update/DeleteFilesController.php
index d45be160..ca37a9e3 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Update/DeleteFilesController.php
+++ b/app/Http/Controllers/Admin/Update/DeleteFilesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Update;
+namespace App\Http\Controllers\Admin\Update;
 
 use App\Http\Controllers\Controller;
 use App\Services\Update\Updater;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Update/DownloadUpdateController.php b/app/Http/Controllers/Admin/Update/DownloadUpdateController.php
similarity index 93%
rename from app/Http/Controllers/V1/SuperAdmin/Update/DownloadUpdateController.php
rename to app/Http/Controllers/Admin/Update/DownloadUpdateController.php
index bb137b47..7ce1185f 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Update/DownloadUpdateController.php
+++ b/app/Http/Controllers/Admin/Update/DownloadUpdateController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Update;
+namespace App\Http\Controllers\Admin\Update;
 
 use App\Http\Controllers\Controller;
 use App\Services\Update\Updater;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Update/FinishUpdateController.php b/app/Http/Controllers/Admin/Update/FinishUpdateController.php
similarity index 93%
rename from app/Http/Controllers/V1/SuperAdmin/Update/FinishUpdateController.php
rename to app/Http/Controllers/Admin/Update/FinishUpdateController.php
index c709fd51..3d3935b4 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Update/FinishUpdateController.php
+++ b/app/Http/Controllers/Admin/Update/FinishUpdateController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Update;
+namespace App\Http\Controllers\Admin\Update;
 
 use App\Http\Controllers\Controller;
 use App\Services\Update\Updater;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Update/MigrateUpdateController.php b/app/Http/Controllers/Admin/Update/MigrateUpdateController.php
similarity index 92%
rename from app/Http/Controllers/V1/SuperAdmin/Update/MigrateUpdateController.php
rename to app/Http/Controllers/Admin/Update/MigrateUpdateController.php
index c8c9a7d2..380a0152 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Update/MigrateUpdateController.php
+++ b/app/Http/Controllers/Admin/Update/MigrateUpdateController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Update;
+namespace App\Http\Controllers\Admin\Update;
 
 use App\Http\Controllers\Controller;
 use App\Services\Update\Updater;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Update/UnzipUpdateController.php b/app/Http/Controllers/Admin/Update/UnzipUpdateController.php
similarity index 95%
rename from app/Http/Controllers/V1/SuperAdmin/Update/UnzipUpdateController.php
rename to app/Http/Controllers/Admin/Update/UnzipUpdateController.php
index e022acac..649158de 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Update/UnzipUpdateController.php
+++ b/app/Http/Controllers/Admin/Update/UnzipUpdateController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Update;
+namespace App\Http\Controllers\Admin\Update;
 
 use App\Http\Controllers\Controller;
 use App\Services\Update\Updater;
diff --git a/app/Http/Controllers/V1/SuperAdmin/Update/UpdateController.php b/app/Http/Controllers/Admin/Update/UpdateController.php
similarity index 97%
rename from app/Http/Controllers/V1/SuperAdmin/Update/UpdateController.php
rename to app/Http/Controllers/Admin/Update/UpdateController.php
index 64d1e3ee..c71cf202 100644
--- a/app/Http/Controllers/V1/SuperAdmin/Update/UpdateController.php
+++ b/app/Http/Controllers/Admin/Update/UpdateController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin\Update;
+namespace App\Http\Controllers\Admin\Update;
 
 use App\Http\Controllers\Controller;
 use App\Models\Setting;
diff --git a/app/Http/Controllers/V1/SuperAdmin/UsersController.php b/app/Http/Controllers/Admin/UsersController.php
similarity index 98%
rename from app/Http/Controllers/V1/SuperAdmin/UsersController.php
rename to app/Http/Controllers/Admin/UsersController.php
index 57b122e6..396a3109 100644
--- a/app/Http/Controllers/V1/SuperAdmin/UsersController.php
+++ b/app/Http/Controllers/Admin/UsersController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\SuperAdmin;
+namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\AdminUserUpdateRequest;
diff --git a/app/Http/Controllers/V1/Admin/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Company/Auth/ConfirmPasswordController.php
similarity index 95%
rename from app/Http/Controllers/V1/Admin/Auth/ConfirmPasswordController.php
rename to app/Http/Controllers/Company/Auth/ConfirmPasswordController.php
index 18651248..ac26a4f1 100644
--- a/app/Http/Controllers/V1/Admin/Auth/ConfirmPasswordController.php
+++ b/app/Http/Controllers/Company/Auth/ConfirmPasswordController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\Company\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Providers\AppServiceProvider;
diff --git a/app/Http/Controllers/V1/Admin/Auth/ForgotPasswordController.php b/app/Http/Controllers/Company/Auth/ForgotPasswordController.php
similarity index 97%
rename from app/Http/Controllers/V1/Admin/Auth/ForgotPasswordController.php
rename to app/Http/Controllers/Company/Auth/ForgotPasswordController.php
index 47fce4ef..991225e7 100644
--- a/app/Http/Controllers/V1/Admin/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Company/Auth/ForgotPasswordController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\Company\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
diff --git a/app/Http/Controllers/V1/Admin/Auth/LoginController.php b/app/Http/Controllers/Company/Auth/LoginController.php
similarity index 95%
rename from app/Http/Controllers/V1/Admin/Auth/LoginController.php
rename to app/Http/Controllers/Company/Auth/LoginController.php
index baf457bd..3d68f837 100644
--- a/app/Http/Controllers/V1/Admin/Auth/LoginController.php
+++ b/app/Http/Controllers/Company/Auth/LoginController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\Company\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Providers\AppServiceProvider;
diff --git a/app/Http/Controllers/V1/Admin/Auth/RegisterController.php b/app/Http/Controllers/Company/Auth/RegisterController.php
similarity index 97%
rename from app/Http/Controllers/V1/Admin/Auth/RegisterController.php
rename to app/Http/Controllers/Company/Auth/RegisterController.php
index 0231e1c3..b5969155 100644
--- a/app/Http/Controllers/V1/Admin/Auth/RegisterController.php
+++ b/app/Http/Controllers/Company/Auth/RegisterController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\Company\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Models\User;
diff --git a/app/Http/Controllers/V1/Admin/Auth/ResetPasswordController.php b/app/Http/Controllers/Company/Auth/ResetPasswordController.php
similarity index 97%
rename from app/Http/Controllers/V1/Admin/Auth/ResetPasswordController.php
rename to app/Http/Controllers/Company/Auth/ResetPasswordController.php
index 9d9ee057..cb5bdc83 100644
--- a/app/Http/Controllers/V1/Admin/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Company/Auth/ResetPasswordController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\Company\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Providers\AppServiceProvider;
diff --git a/app/Http/Controllers/V1/Admin/Auth/VerificationController.php b/app/Http/Controllers/Company/Auth/VerificationController.php
similarity index 95%
rename from app/Http/Controllers/V1/Admin/Auth/VerificationController.php
rename to app/Http/Controllers/Company/Auth/VerificationController.php
index 320b75a1..68ea2302 100644
--- a/app/Http/Controllers/V1/Admin/Auth/VerificationController.php
+++ b/app/Http/Controllers/Company/Auth/VerificationController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Auth;
+namespace App\Http\Controllers\Company\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Providers\AppServiceProvider;
diff --git a/app/Http/Controllers/V1/Admin/Company/CompaniesController.php b/app/Http/Controllers/Company/Company/CompaniesController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Company/CompaniesController.php
rename to app/Http/Controllers/Company/Company/CompaniesController.php
index d3ae5fd9..7c4481a6 100644
--- a/app/Http/Controllers/V1/Admin/Company/CompaniesController.php
+++ b/app/Http/Controllers/Company/Company/CompaniesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Company;
+namespace App\Http\Controllers\Company\Company;
 
 use App\Facades\Hashids;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/V1/Admin/Config/FiscalYearsController.php b/app/Http/Controllers/Company/Config/FiscalYearsController.php
similarity index 89%
rename from app/Http/Controllers/V1/Admin/Config/FiscalYearsController.php
rename to app/Http/Controllers/Company/Config/FiscalYearsController.php
index c56fdda3..b2f0f8ad 100644
--- a/app/Http/Controllers/V1/Admin/Config/FiscalYearsController.php
+++ b/app/Http/Controllers/Company/Config/FiscalYearsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Config;
+namespace App\Http\Controllers\Company\Config;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/V1/Admin/Config/LanguagesController.php b/app/Http/Controllers/Company/Config/LanguagesController.php
similarity index 89%
rename from app/Http/Controllers/V1/Admin/Config/LanguagesController.php
rename to app/Http/Controllers/Company/Config/LanguagesController.php
index 2ea2f4d9..6bcaa1bd 100644
--- a/app/Http/Controllers/V1/Admin/Config/LanguagesController.php
+++ b/app/Http/Controllers/Company/Config/LanguagesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Config;
+namespace App\Http\Controllers\Company\Config;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/V1/Admin/Config/RetrospectiveEditsController.php b/app/Http/Controllers/Company/Config/RetrospectiveEditsController.php
similarity index 90%
rename from app/Http/Controllers/V1/Admin/Config/RetrospectiveEditsController.php
rename to app/Http/Controllers/Company/Config/RetrospectiveEditsController.php
index 15f6313d..fa2795c3 100644
--- a/app/Http/Controllers/V1/Admin/Config/RetrospectiveEditsController.php
+++ b/app/Http/Controllers/Company/Config/RetrospectiveEditsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Config;
+namespace App\Http\Controllers\Company\Config;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/V1/Admin/CustomField/CustomFieldsController.php b/app/Http/Controllers/Company/CustomField/CustomFieldsController.php
similarity index 97%
rename from app/Http/Controllers/V1/Admin/CustomField/CustomFieldsController.php
rename to app/Http/Controllers/Company/CustomField/CustomFieldsController.php
index ef3b3d72..1643e1fb 100644
--- a/app/Http/Controllers/V1/Admin/CustomField/CustomFieldsController.php
+++ b/app/Http/Controllers/Company/CustomField/CustomFieldsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\CustomField;
+namespace App\Http\Controllers\Company\CustomField;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\CustomFieldRequest;
diff --git a/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php b/app/Http/Controllers/Company/Customer/CustomerStatsController.php
similarity index 94%
rename from app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php
rename to app/Http/Controllers/Company/Customer/CustomerStatsController.php
index b4d6691d..10b8e2f6 100644
--- a/app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php
+++ b/app/Http/Controllers/Company/Customer/CustomerStatsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Customer;
+namespace App\Http\Controllers\Company\Customer;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\CustomerResource;
diff --git a/app/Http/Controllers/V1/Admin/Customer/CustomersController.php b/app/Http/Controllers/Company/Customer/CustomersController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Customer/CustomersController.php
rename to app/Http/Controllers/Company/Customer/CustomersController.php
index 1a3bb8a6..9b010d3b 100644
--- a/app/Http/Controllers/V1/Admin/Customer/CustomersController.php
+++ b/app/Http/Controllers/Company/Customer/CustomersController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Customer;
+namespace App\Http\Controllers\Company\Customer;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests;
diff --git a/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php b/app/Http/Controllers/Company/Dashboard/DashboardController.php
similarity index 99%
rename from app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php
rename to app/Http/Controllers/Company/Dashboard/DashboardController.php
index 667dd326..72cf790d 100644
--- a/app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php
+++ b/app/Http/Controllers/Company/Dashboard/DashboardController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Dashboard;
+namespace App\Http\Controllers\Company\Dashboard;
 
 use App\Http\Controllers\Controller;
 use App\Models\Company;
diff --git a/app/Http/Controllers/V1/Admin/Estimate/EstimateTemplatesController.php b/app/Http/Controllers/Company/Estimate/EstimateTemplatesController.php
similarity index 92%
rename from app/Http/Controllers/V1/Admin/Estimate/EstimateTemplatesController.php
rename to app/Http/Controllers/Company/Estimate/EstimateTemplatesController.php
index 230fcc43..3c46ae93 100644
--- a/app/Http/Controllers/V1/Admin/Estimate/EstimateTemplatesController.php
+++ b/app/Http/Controllers/Company/Estimate/EstimateTemplatesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Estimate;
+namespace App\Http\Controllers\Company\Estimate;
 
 use App\Http\Controllers\Controller;
 use App\Models\Estimate;
diff --git a/app/Http/Controllers/V1/Admin/Estimate/EstimatesController.php b/app/Http/Controllers/Company/Estimate/EstimatesController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Estimate/EstimatesController.php
rename to app/Http/Controllers/Company/Estimate/EstimatesController.php
index 9e40c23a..18322075 100644
--- a/app/Http/Controllers/V1/Admin/Estimate/EstimatesController.php
+++ b/app/Http/Controllers/Company/Estimate/EstimatesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Estimate;
+namespace App\Http\Controllers\Company\Estimate;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DeleteEstimatesRequest;
diff --git a/app/Http/Controllers/V1/Admin/ExchangeRate/ExchangeRateProviderController.php b/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php
similarity index 99%
rename from app/Http/Controllers/V1/Admin/ExchangeRate/ExchangeRateProviderController.php
rename to app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php
index c2547465..a2074c68 100644
--- a/app/Http/Controllers/V1/Admin/ExchangeRate/ExchangeRateProviderController.php
+++ b/app/Http/Controllers/Company/ExchangeRate/ExchangeRateProviderController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\ExchangeRate;
+namespace App\Http\Controllers\Company\ExchangeRate;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\BulkExchangeRateRequest;
diff --git a/app/Http/Controllers/V1/Admin/Expense/ExpenseCategoriesController.php b/app/Http/Controllers/Company/Expense/ExpenseCategoriesController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Expense/ExpenseCategoriesController.php
rename to app/Http/Controllers/Company/Expense/ExpenseCategoriesController.php
index fa0beaaa..ed8ccda1 100644
--- a/app/Http/Controllers/V1/Admin/Expense/ExpenseCategoriesController.php
+++ b/app/Http/Controllers/Company/Expense/ExpenseCategoriesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Expense;
+namespace App\Http\Controllers\Company\Expense;
 
 use App\ExpensesCategory;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/V1/Admin/Expense/ExpensesController.php b/app/Http/Controllers/Company/Expense/ExpensesController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Expense/ExpensesController.php
rename to app/Http/Controllers/Company/Expense/ExpensesController.php
index 8b9e32f7..4395f378 100644
--- a/app/Http/Controllers/V1/Admin/Expense/ExpensesController.php
+++ b/app/Http/Controllers/Company/Expense/ExpensesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Expense;
+namespace App\Http\Controllers\Company\Expense;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DeleteExpensesRequest;
diff --git a/app/Http/Controllers/V1/Admin/General/BootstrapController.php b/app/Http/Controllers/Company/General/BootstrapController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/General/BootstrapController.php
rename to app/Http/Controllers/Company/General/BootstrapController.php
index 38965275..45bad5f7 100644
--- a/app/Http/Controllers/V1/Admin/General/BootstrapController.php
+++ b/app/Http/Controllers/Company/General/BootstrapController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\Company\General;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\CompanyResource;
diff --git a/app/Http/Controllers/V1/Admin/General/ConfigController.php b/app/Http/Controllers/Company/General/ConfigController.php
similarity index 89%
rename from app/Http/Controllers/V1/Admin/General/ConfigController.php
rename to app/Http/Controllers/Company/General/ConfigController.php
index e606f74c..c813d686 100644
--- a/app/Http/Controllers/V1/Admin/General/ConfigController.php
+++ b/app/Http/Controllers/Company/General/ConfigController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\Company\General;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/V1/Admin/General/FormatsController.php b/app/Http/Controllers/Company/General/FormatsController.php
similarity index 93%
rename from app/Http/Controllers/V1/Admin/General/FormatsController.php
rename to app/Http/Controllers/Company/General/FormatsController.php
index 44362ba2..9708c26a 100644
--- a/app/Http/Controllers/V1/Admin/General/FormatsController.php
+++ b/app/Http/Controllers/Company/General/FormatsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\Company\General;
 
 use App\Http\Controllers\Controller;
 use App\Support\Formatters\DateFormatter;
diff --git a/app/Http/Controllers/V1/Admin/General/NotesController.php b/app/Http/Controllers/Company/General/NotesController.php
similarity index 97%
rename from app/Http/Controllers/V1/Admin/General/NotesController.php
rename to app/Http/Controllers/Company/General/NotesController.php
index 5cb0a2e8..25239a01 100644
--- a/app/Http/Controllers/V1/Admin/General/NotesController.php
+++ b/app/Http/Controllers/Company/General/NotesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\Company\General;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\NotesRequest;
diff --git a/app/Http/Controllers/V1/Admin/General/SearchController.php b/app/Http/Controllers/Company/General/SearchController.php
similarity index 95%
rename from app/Http/Controllers/V1/Admin/General/SearchController.php
rename to app/Http/Controllers/Company/General/SearchController.php
index 37f99b7a..20b8db17 100644
--- a/app/Http/Controllers/V1/Admin/General/SearchController.php
+++ b/app/Http/Controllers/Company/General/SearchController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\Company\General;
 
 use App\Http\Controllers\Controller;
 use App\Models\Customer;
diff --git a/app/Http/Controllers/V1/Admin/General/SerialNumberController.php b/app/Http/Controllers/Company/General/SerialNumberController.php
similarity index 97%
rename from app/Http/Controllers/V1/Admin/General/SerialNumberController.php
rename to app/Http/Controllers/Company/General/SerialNumberController.php
index d4362ba2..64b87c4b 100644
--- a/app/Http/Controllers/V1/Admin/General/SerialNumberController.php
+++ b/app/Http/Controllers/Company/General/SerialNumberController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\General;
+namespace App\Http\Controllers\Company\General;
 
 use App\Http\Controllers\Controller;
 use App\Models\Estimate;
diff --git a/app/Http/Controllers/V1/Admin/Invoice/InvoiceTemplatesController.php b/app/Http/Controllers/Company/Invoice/InvoiceTemplatesController.php
similarity index 93%
rename from app/Http/Controllers/V1/Admin/Invoice/InvoiceTemplatesController.php
rename to app/Http/Controllers/Company/Invoice/InvoiceTemplatesController.php
index 6ed4b97b..5c2042f7 100644
--- a/app/Http/Controllers/V1/Admin/Invoice/InvoiceTemplatesController.php
+++ b/app/Http/Controllers/Company/Invoice/InvoiceTemplatesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Invoice;
+namespace App\Http\Controllers\Company\Invoice;
 
 use App\Http\Controllers\Controller;
 use App\Models\Invoice;
diff --git a/app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php b/app/Http/Controllers/Company/Invoice/InvoicesController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php
rename to app/Http/Controllers/Company/Invoice/InvoicesController.php
index 2ccad148..669b63f8 100644
--- a/app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php
+++ b/app/Http/Controllers/Company/Invoice/InvoicesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Invoice;
+namespace App\Http\Controllers\Company\Invoice;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests;
diff --git a/app/Http/Controllers/V1/Admin/Item/ItemsController.php b/app/Http/Controllers/Company/Item/ItemsController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Item/ItemsController.php
rename to app/Http/Controllers/Company/Item/ItemsController.php
index 7c63a61a..d348e72a 100644
--- a/app/Http/Controllers/V1/Admin/Item/ItemsController.php
+++ b/app/Http/Controllers/Company/Item/ItemsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Item;
+namespace App\Http\Controllers\Company\Item;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests;
diff --git a/app/Http/Controllers/V1/Admin/Item/UnitsController.php b/app/Http/Controllers/Company/Item/UnitsController.php
similarity index 97%
rename from app/Http/Controllers/V1/Admin/Item/UnitsController.php
rename to app/Http/Controllers/Company/Item/UnitsController.php
index c6166fe2..8fb3c762 100644
--- a/app/Http/Controllers/V1/Admin/Item/UnitsController.php
+++ b/app/Http/Controllers/Company/Item/UnitsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Item;
+namespace App\Http\Controllers\Company\Item;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\UnitRequest;
diff --git a/app/Http/Controllers/V1/Admin/Mobile/AuthController.php b/app/Http/Controllers/Company/Mobile/AuthController.php
similarity index 95%
rename from app/Http/Controllers/V1/Admin/Mobile/AuthController.php
rename to app/Http/Controllers/Company/Mobile/AuthController.php
index ea800fb2..e72fcea6 100644
--- a/app/Http/Controllers/V1/Admin/Mobile/AuthController.php
+++ b/app/Http/Controllers/Company/Mobile/AuthController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Mobile;
+namespace App\Http\Controllers\Company\Mobile;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\LoginRequest;
diff --git a/app/Http/Controllers/V1/Admin/Payment/PaymentMethodsController.php b/app/Http/Controllers/Company/Payment/PaymentMethodsController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Payment/PaymentMethodsController.php
rename to app/Http/Controllers/Company/Payment/PaymentMethodsController.php
index 1f47ad4c..bd21d89f 100644
--- a/app/Http/Controllers/V1/Admin/Payment/PaymentMethodsController.php
+++ b/app/Http/Controllers/Company/Payment/PaymentMethodsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Payment;
+namespace App\Http\Controllers\Company\Payment;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\PaymentMethodRequest;
diff --git a/app/Http/Controllers/V1/Admin/Payment/PaymentsController.php b/app/Http/Controllers/Company/Payment/PaymentsController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Payment/PaymentsController.php
rename to app/Http/Controllers/Company/Payment/PaymentsController.php
index 2eab09f8..a69b9245 100644
--- a/app/Http/Controllers/V1/Admin/Payment/PaymentsController.php
+++ b/app/Http/Controllers/Company/Payment/PaymentsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Payment;
+namespace App\Http\Controllers\Company\Payment;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DeletePaymentsRequest;
diff --git a/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceController.php b/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php
similarity index 97%
rename from app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceController.php
rename to app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php
index 7a7f18ca..38cfdc6d 100644
--- a/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceController.php
+++ b/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\RecurringInvoice;
+namespace App\Http\Controllers\Company\RecurringInvoice;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\RecurringInvoiceRequest;
diff --git a/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceFrequencyController.php b/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceFrequencyController.php
similarity index 88%
rename from app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceFrequencyController.php
rename to app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceFrequencyController.php
index db8fcff1..b98fea63 100644
--- a/app/Http/Controllers/V1/Admin/RecurringInvoice/RecurringInvoiceFrequencyController.php
+++ b/app/Http/Controllers/Company/RecurringInvoice/RecurringInvoiceFrequencyController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\RecurringInvoice;
+namespace App\Http\Controllers\Company\RecurringInvoice;
 
 use App\Http\Controllers\Controller;
 use App\Models\RecurringInvoice;
diff --git a/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php b/app/Http/Controllers/Company/Report/CustomerSalesReportController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php
rename to app/Http/Controllers/Company/Report/CustomerSalesReportController.php
index 2230c33d..b9100f80 100644
--- a/app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php
+++ b/app/Http/Controllers/Company/Report/CustomerSalesReportController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Report;
+namespace App\Http\Controllers\Company\Report;
 
 use App\Facades\Pdf;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php b/app/Http/Controllers/Company/Report/ExpensesReportController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php
rename to app/Http/Controllers/Company/Report/ExpensesReportController.php
index f2e4b51e..a20bac06 100644
--- a/app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php
+++ b/app/Http/Controllers/Company/Report/ExpensesReportController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Report;
+namespace App\Http\Controllers\Company\Report;
 
 use App\Facades\Pdf;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php b/app/Http/Controllers/Company/Report/ItemSalesReportController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php
rename to app/Http/Controllers/Company/Report/ItemSalesReportController.php
index 870b9cb0..dc7b91dd 100644
--- a/app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php
+++ b/app/Http/Controllers/Company/Report/ItemSalesReportController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Report;
+namespace App\Http\Controllers\Company\Report;
 
 use App\Facades\Pdf;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php b/app/Http/Controllers/Company/Report/ProfitLossReportController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php
rename to app/Http/Controllers/Company/Report/ProfitLossReportController.php
index e16cde9c..ebe42538 100644
--- a/app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php
+++ b/app/Http/Controllers/Company/Report/ProfitLossReportController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Report;
+namespace App\Http\Controllers\Company\Report;
 
 use App\Facades\Pdf;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php b/app/Http/Controllers/Company/Report/TaxSummaryReportController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php
rename to app/Http/Controllers/Company/Report/TaxSummaryReportController.php
index 8f5af38b..a8b1e0a1 100644
--- a/app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php
+++ b/app/Http/Controllers/Company/Report/TaxSummaryReportController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Report;
+namespace App\Http\Controllers\Company\Report;
 
 use App\Facades\Pdf;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/V1/Admin/Role/AbilitiesController.php b/app/Http/Controllers/Company/Role/AbilitiesController.php
similarity index 89%
rename from app/Http/Controllers/V1/Admin/Role/AbilitiesController.php
rename to app/Http/Controllers/Company/Role/AbilitiesController.php
index 01f9a2b8..7f8b087f 100644
--- a/app/Http/Controllers/V1/Admin/Role/AbilitiesController.php
+++ b/app/Http/Controllers/Company/Role/AbilitiesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Role;
+namespace App\Http\Controllers\Company\Role;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/V1/Admin/Role/RolesController.php b/app/Http/Controllers/Company/Role/RolesController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Role/RolesController.php
rename to app/Http/Controllers/Company/Role/RolesController.php
index e9bc9d6f..ba88e418 100644
--- a/app/Http/Controllers/V1/Admin/Role/RolesController.php
+++ b/app/Http/Controllers/Company/Role/RolesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Role;
+namespace App\Http\Controllers\Company\Role;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\RoleRequest;
diff --git a/app/Http/Controllers/V1/Admin/Settings/CompanyController.php b/app/Http/Controllers/Company/Settings/CompanyController.php
similarity index 96%
rename from app/Http/Controllers/V1/Admin/Settings/CompanyController.php
rename to app/Http/Controllers/Company/Settings/CompanyController.php
index 5be1269e..781082f9 100644
--- a/app/Http/Controllers/V1/Admin/Settings/CompanyController.php
+++ b/app/Http/Controllers/Company/Settings/CompanyController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\Company\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\CompanyLogoRequest;
diff --git a/app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php b/app/Http/Controllers/Company/Settings/CompanyCurrencyCheckTransactionsController.php
similarity index 91%
rename from app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php
rename to app/Http/Controllers/Company/Settings/CompanyCurrencyCheckTransactionsController.php
index 69e38c8c..05b2c1d8 100644
--- a/app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php
+++ b/app/Http/Controllers/Company/Settings/CompanyCurrencyCheckTransactionsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\Company\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Models\Company;
diff --git a/app/Http/Controllers/V1/Admin/Settings/CompanyMailConfigurationController.php b/app/Http/Controllers/Company/Settings/CompanyMailConfigurationController.php
similarity index 99%
rename from app/Http/Controllers/V1/Admin/Settings/CompanyMailConfigurationController.php
rename to app/Http/Controllers/Company/Settings/CompanyMailConfigurationController.php
index c1413a3e..34a426e5 100644
--- a/app/Http/Controllers/V1/Admin/Settings/CompanyMailConfigurationController.php
+++ b/app/Http/Controllers/Company/Settings/CompanyMailConfigurationController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\Company\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Mail\TestMail;
diff --git a/app/Http/Controllers/V1/Admin/Settings/CompanySettingsController.php b/app/Http/Controllers/Company/Settings/CompanySettingsController.php
similarity index 96%
rename from app/Http/Controllers/V1/Admin/Settings/CompanySettingsController.php
rename to app/Http/Controllers/Company/Settings/CompanySettingsController.php
index 6b346968..d23d4dcc 100644
--- a/app/Http/Controllers/V1/Admin/Settings/CompanySettingsController.php
+++ b/app/Http/Controllers/Company/Settings/CompanySettingsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\Company\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\GetSettingsRequest;
diff --git a/app/Http/Controllers/V1/Admin/Settings/TaxTypesController.php b/app/Http/Controllers/Company/Settings/TaxTypesController.php
similarity index 97%
rename from app/Http/Controllers/V1/Admin/Settings/TaxTypesController.php
rename to app/Http/Controllers/Company/Settings/TaxTypesController.php
index 3124a963..0615dbdd 100644
--- a/app/Http/Controllers/V1/Admin/Settings/TaxTypesController.php
+++ b/app/Http/Controllers/Company/Settings/TaxTypesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\Company\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\TaxTypeRequest;
diff --git a/app/Http/Controllers/V1/Admin/Settings/UserProfileController.php b/app/Http/Controllers/Company/Settings/UserProfileController.php
similarity index 96%
rename from app/Http/Controllers/V1/Admin/Settings/UserProfileController.php
rename to app/Http/Controllers/Company/Settings/UserProfileController.php
index a5329963..f85e2482 100644
--- a/app/Http/Controllers/V1/Admin/Settings/UserProfileController.php
+++ b/app/Http/Controllers/Company/Settings/UserProfileController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\Company\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\AvatarRequest;
diff --git a/app/Http/Controllers/V1/Admin/Settings/UserSettingsController.php b/app/Http/Controllers/Company/Settings/UserSettingsController.php
similarity index 92%
rename from app/Http/Controllers/V1/Admin/Settings/UserSettingsController.php
rename to app/Http/Controllers/Company/Settings/UserSettingsController.php
index 6fc0cad0..e0cf5618 100644
--- a/app/Http/Controllers/V1/Admin/Settings/UserSettingsController.php
+++ b/app/Http/Controllers/Company/Settings/UserSettingsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Settings;
+namespace App\Http\Controllers\Company\Settings;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\GetSettingsRequest;
diff --git a/app/Http/Controllers/V1/Admin/Users/UsersController.php b/app/Http/Controllers/Company/Users/UsersController.php
similarity index 98%
rename from app/Http/Controllers/V1/Admin/Users/UsersController.php
rename to app/Http/Controllers/Company/Users/UsersController.php
index 94f814d2..7f185f4f 100644
--- a/app/Http/Controllers/V1/Admin/Users/UsersController.php
+++ b/app/Http/Controllers/Company/Users/UsersController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Admin\Users;
+namespace App\Http\Controllers\Company\Users;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DeleteUserRequest;
diff --git a/app/Http/Controllers/V1/Customer/Auth/ForgotPasswordController.php b/app/Http/Controllers/CustomerPortal/Auth/ForgotPasswordController.php
similarity index 96%
rename from app/Http/Controllers/V1/Customer/Auth/ForgotPasswordController.php
rename to app/Http/Controllers/CustomerPortal/Auth/ForgotPasswordController.php
index 3860e3d7..63c98921 100644
--- a/app/Http/Controllers/V1/Customer/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/CustomerPortal/Auth/ForgotPasswordController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\Auth;
+namespace App\Http\Controllers\CustomerPortal\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
diff --git a/app/Http/Controllers/V1/Customer/Auth/LoginController.php b/app/Http/Controllers/CustomerPortal/Auth/LoginController.php
similarity index 95%
rename from app/Http/Controllers/V1/Customer/Auth/LoginController.php
rename to app/Http/Controllers/CustomerPortal/Auth/LoginController.php
index ffdb0e22..45b8dfb7 100644
--- a/app/Http/Controllers/V1/Customer/Auth/LoginController.php
+++ b/app/Http/Controllers/CustomerPortal/Auth/LoginController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\Auth;
+namespace App\Http\Controllers\CustomerPortal\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Customer\CustomerLoginRequest;
diff --git a/app/Http/Controllers/V1/Customer/Auth/ResetPasswordController.php b/app/Http/Controllers/CustomerPortal/Auth/ResetPasswordController.php
similarity index 97%
rename from app/Http/Controllers/V1/Customer/Auth/ResetPasswordController.php
rename to app/Http/Controllers/CustomerPortal/Auth/ResetPasswordController.php
index d644cabf..787d988c 100644
--- a/app/Http/Controllers/V1/Customer/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/CustomerPortal/Auth/ResetPasswordController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\Auth;
+namespace App\Http\Controllers\CustomerPortal\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;
diff --git a/app/Http/Controllers/V1/Customer/Estimate/AcceptEstimateController.php b/app/Http/Controllers/CustomerPortal/Estimate/AcceptEstimateController.php
similarity index 93%
rename from app/Http/Controllers/V1/Customer/Estimate/AcceptEstimateController.php
rename to app/Http/Controllers/CustomerPortal/Estimate/AcceptEstimateController.php
index 34e7ba37..72dbf789 100644
--- a/app/Http/Controllers/V1/Customer/Estimate/AcceptEstimateController.php
+++ b/app/Http/Controllers/CustomerPortal/Estimate/AcceptEstimateController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\Estimate;
+namespace App\Http\Controllers\CustomerPortal\Estimate;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Customer\EstimateResource;
diff --git a/app/Http/Controllers/V1/Customer/Estimate/EstimatesController.php b/app/Http/Controllers/CustomerPortal/Estimate/EstimatesController.php
similarity index 96%
rename from app/Http/Controllers/V1/Customer/Estimate/EstimatesController.php
rename to app/Http/Controllers/CustomerPortal/Estimate/EstimatesController.php
index cce72981..1259f11b 100644
--- a/app/Http/Controllers/V1/Customer/Estimate/EstimatesController.php
+++ b/app/Http/Controllers/CustomerPortal/Estimate/EstimatesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\Estimate;
+namespace App\Http\Controllers\CustomerPortal\Estimate;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Customer\EstimateResource;
diff --git a/app/Http/Controllers/V1/Customer/EstimatePdfController.php b/app/Http/Controllers/CustomerPortal/EstimatePdfController.php
similarity index 97%
rename from app/Http/Controllers/V1/Customer/EstimatePdfController.php
rename to app/Http/Controllers/CustomerPortal/EstimatePdfController.php
index be2b59ed..4428a512 100644
--- a/app/Http/Controllers/V1/Customer/EstimatePdfController.php
+++ b/app/Http/Controllers/CustomerPortal/EstimatePdfController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer;
+namespace App\Http\Controllers\CustomerPortal;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\EstimateResource;
diff --git a/app/Http/Controllers/V1/Customer/Expense/ExpensesController.php b/app/Http/Controllers/CustomerPortal/Expense/ExpensesController.php
similarity index 96%
rename from app/Http/Controllers/V1/Customer/Expense/ExpensesController.php
rename to app/Http/Controllers/CustomerPortal/Expense/ExpensesController.php
index 6c8f2173..6863c601 100644
--- a/app/Http/Controllers/V1/Customer/Expense/ExpensesController.php
+++ b/app/Http/Controllers/CustomerPortal/Expense/ExpensesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\Expense;
+namespace App\Http\Controllers\CustomerPortal\Expense;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Customer\ExpenseResource;
diff --git a/app/Http/Controllers/V1/Customer/General/BootstrapController.php b/app/Http/Controllers/CustomerPortal/General/BootstrapController.php
similarity index 95%
rename from app/Http/Controllers/V1/Customer/General/BootstrapController.php
rename to app/Http/Controllers/CustomerPortal/General/BootstrapController.php
index 5be27f9d..115b5d0b 100644
--- a/app/Http/Controllers/V1/Customer/General/BootstrapController.php
+++ b/app/Http/Controllers/CustomerPortal/General/BootstrapController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\General;
+namespace App\Http\Controllers\CustomerPortal\General;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Customer\CustomerResource;
diff --git a/app/Http/Controllers/V1/Customer/General/DashboardController.php b/app/Http/Controllers/CustomerPortal/General/DashboardController.php
similarity index 96%
rename from app/Http/Controllers/V1/Customer/General/DashboardController.php
rename to app/Http/Controllers/CustomerPortal/General/DashboardController.php
index 08d62df8..40f558cf 100644
--- a/app/Http/Controllers/V1/Customer/General/DashboardController.php
+++ b/app/Http/Controllers/CustomerPortal/General/DashboardController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\General;
+namespace App\Http\Controllers\CustomerPortal\General;
 
 use App\Http\Controllers\Controller;
 use App\Models\Estimate;
diff --git a/app/Http/Controllers/V1/Customer/General/ProfileController.php b/app/Http/Controllers/CustomerPortal/General/ProfileController.php
similarity index 96%
rename from app/Http/Controllers/V1/Customer/General/ProfileController.php
rename to app/Http/Controllers/CustomerPortal/General/ProfileController.php
index 2f0debee..56d8aab6 100644
--- a/app/Http/Controllers/V1/Customer/General/ProfileController.php
+++ b/app/Http/Controllers/CustomerPortal/General/ProfileController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\General;
+namespace App\Http\Controllers\CustomerPortal\General;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Customer\CustomerProfileRequest;
diff --git a/app/Http/Controllers/V1/Customer/Invoice/InvoicesController.php b/app/Http/Controllers/CustomerPortal/Invoice/InvoicesController.php
similarity index 96%
rename from app/Http/Controllers/V1/Customer/Invoice/InvoicesController.php
rename to app/Http/Controllers/CustomerPortal/Invoice/InvoicesController.php
index ffc0d268..8e8d4335 100644
--- a/app/Http/Controllers/V1/Customer/Invoice/InvoicesController.php
+++ b/app/Http/Controllers/CustomerPortal/Invoice/InvoicesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\Invoice;
+namespace App\Http\Controllers\CustomerPortal\Invoice;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Customer\InvoiceResource;
diff --git a/app/Http/Controllers/V1/Customer/InvoicePdfController.php b/app/Http/Controllers/CustomerPortal/InvoicePdfController.php
similarity index 97%
rename from app/Http/Controllers/V1/Customer/InvoicePdfController.php
rename to app/Http/Controllers/CustomerPortal/InvoicePdfController.php
index 329d3565..bfd89f96 100644
--- a/app/Http/Controllers/V1/Customer/InvoicePdfController.php
+++ b/app/Http/Controllers/CustomerPortal/InvoicePdfController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer;
+namespace App\Http\Controllers\CustomerPortal;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Customer\InvoiceResource as CustomerInvoiceResource;
diff --git a/app/Http/Controllers/V1/Customer/Payment/PaymentMethodController.php b/app/Http/Controllers/CustomerPortal/Payment/PaymentMethodController.php
similarity index 90%
rename from app/Http/Controllers/V1/Customer/Payment/PaymentMethodController.php
rename to app/Http/Controllers/CustomerPortal/Payment/PaymentMethodController.php
index 63833e82..e1bc8675 100644
--- a/app/Http/Controllers/V1/Customer/Payment/PaymentMethodController.php
+++ b/app/Http/Controllers/CustomerPortal/Payment/PaymentMethodController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\Payment;
+namespace App\Http\Controllers\CustomerPortal\Payment;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Customer\PaymentMethodResource;
diff --git a/app/Http/Controllers/V1/Customer/Payment/PaymentsController.php b/app/Http/Controllers/CustomerPortal/Payment/PaymentsController.php
similarity index 96%
rename from app/Http/Controllers/V1/Customer/Payment/PaymentsController.php
rename to app/Http/Controllers/CustomerPortal/Payment/PaymentsController.php
index c4a44048..4ba36cc3 100644
--- a/app/Http/Controllers/V1/Customer/Payment/PaymentsController.php
+++ b/app/Http/Controllers/CustomerPortal/Payment/PaymentsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer\Payment;
+namespace App\Http\Controllers\CustomerPortal\Payment;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\Customer\PaymentResource;
diff --git a/app/Http/Controllers/V1/Customer/PaymentPdfController.php b/app/Http/Controllers/CustomerPortal/PaymentPdfController.php
similarity index 92%
rename from app/Http/Controllers/V1/Customer/PaymentPdfController.php
rename to app/Http/Controllers/CustomerPortal/PaymentPdfController.php
index bf6ea7d5..6d1dfba9 100644
--- a/app/Http/Controllers/V1/Customer/PaymentPdfController.php
+++ b/app/Http/Controllers/CustomerPortal/PaymentPdfController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Customer;
+namespace App\Http\Controllers\CustomerPortal;
 
 use App\Http\Controllers\Controller;
 use App\Http\Resources\PaymentResource;
diff --git a/app/Http/Controllers/V1/Modules/ScriptController.php b/app/Http/Controllers/Modules/ScriptController.php
similarity index 95%
rename from app/Http/Controllers/V1/Modules/ScriptController.php
rename to app/Http/Controllers/Modules/ScriptController.php
index ef95c3bc..86ab6640 100644
--- a/app/Http/Controllers/V1/Modules/ScriptController.php
+++ b/app/Http/Controllers/Modules/ScriptController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Modules;
+namespace App\Http\Controllers\Modules;
 
 use App\Http\Controllers\Controller;
 use App\Services\Module\ModuleFacade;
diff --git a/app/Http/Controllers/V1/Modules/StyleController.php b/app/Http/Controllers/Modules/StyleController.php
similarity index 95%
rename from app/Http/Controllers/V1/Modules/StyleController.php
rename to app/Http/Controllers/Modules/StyleController.php
index d6376a25..3c2544d1 100644
--- a/app/Http/Controllers/V1/Modules/StyleController.php
+++ b/app/Http/Controllers/Modules/StyleController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Modules;
+namespace App\Http\Controllers\Modules;
 
 use App\Http\Controllers\Controller;
 use App\Services\Module\ModuleFacade;
diff --git a/app/Http/Controllers/V1/PDF/DownloadInvoicePdfController.php b/app/Http/Controllers/Pdf/DownloadInvoicePdfController.php
similarity index 92%
rename from app/Http/Controllers/V1/PDF/DownloadInvoicePdfController.php
rename to app/Http/Controllers/Pdf/DownloadInvoicePdfController.php
index 044b469d..d97bc963 100644
--- a/app/Http/Controllers/V1/PDF/DownloadInvoicePdfController.php
+++ b/app/Http/Controllers/Pdf/DownloadInvoicePdfController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\PDF;
+namespace App\Http\Controllers\Pdf;
 
 use App\Http\Controllers\Controller;
 use App\Models\Invoice;
diff --git a/app/Http/Controllers/V1/PDF/DownloadPaymentPdfController.php b/app/Http/Controllers/Pdf/DownloadPaymentPdfController.php
similarity index 92%
rename from app/Http/Controllers/V1/PDF/DownloadPaymentPdfController.php
rename to app/Http/Controllers/Pdf/DownloadPaymentPdfController.php
index ac7970f6..97c81b92 100644
--- a/app/Http/Controllers/V1/PDF/DownloadPaymentPdfController.php
+++ b/app/Http/Controllers/Pdf/DownloadPaymentPdfController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\PDF;
+namespace App\Http\Controllers\Pdf;
 
 use App\Http\Controllers\Controller;
 use App\Models\Payment;
diff --git a/app/Http/Controllers/V1/PDF/DownloadReceiptController.php b/app/Http/Controllers/Pdf/DownloadReceiptController.php
similarity index 95%
rename from app/Http/Controllers/V1/PDF/DownloadReceiptController.php
rename to app/Http/Controllers/Pdf/DownloadReceiptController.php
index 3934012e..e3d4d928 100644
--- a/app/Http/Controllers/V1/PDF/DownloadReceiptController.php
+++ b/app/Http/Controllers/Pdf/DownloadReceiptController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\PDF;
+namespace App\Http\Controllers\Pdf;
 
 use App\Http\Controllers\Controller;
 use App\Models\Expense;
diff --git a/app/Http/Controllers/V1/PDF/EstimatePdfController.php b/app/Http/Controllers/Pdf/EstimatePdfController.php
similarity index 94%
rename from app/Http/Controllers/V1/PDF/EstimatePdfController.php
rename to app/Http/Controllers/Pdf/EstimatePdfController.php
index 3a08e25b..f0c335e5 100644
--- a/app/Http/Controllers/V1/PDF/EstimatePdfController.php
+++ b/app/Http/Controllers/Pdf/EstimatePdfController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\PDF;
+namespace App\Http\Controllers\Pdf;
 
 use App\Http\Controllers\Controller;
 use App\Models\Estimate;
diff --git a/app/Http/Controllers/V1/PDF/InvoicePdfController.php b/app/Http/Controllers/Pdf/InvoicePdfController.php
similarity index 94%
rename from app/Http/Controllers/V1/PDF/InvoicePdfController.php
rename to app/Http/Controllers/Pdf/InvoicePdfController.php
index f7cbfa1e..5e7cc227 100644
--- a/app/Http/Controllers/V1/PDF/InvoicePdfController.php
+++ b/app/Http/Controllers/Pdf/InvoicePdfController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\PDF;
+namespace App\Http\Controllers\Pdf;
 
 use App\Http\Controllers\Controller;
 use App\Models\Invoice;
diff --git a/app/Http/Controllers/V1/PDF/PaymentPdfController.php b/app/Http/Controllers/Pdf/PaymentPdfController.php
similarity index 92%
rename from app/Http/Controllers/V1/PDF/PaymentPdfController.php
rename to app/Http/Controllers/Pdf/PaymentPdfController.php
index 208145d3..992fc3e9 100644
--- a/app/Http/Controllers/V1/PDF/PaymentPdfController.php
+++ b/app/Http/Controllers/Pdf/PaymentPdfController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\PDF;
+namespace App\Http\Controllers\Pdf;
 
 use App\Http\Controllers\Controller;
 use App\Models\Payment;
diff --git a/app/Http/Controllers/V1/Installation/AppDomainController.php b/app/Http/Controllers/Setup/AppDomainController.php
similarity index 93%
rename from app/Http/Controllers/V1/Installation/AppDomainController.php
rename to app/Http/Controllers/Setup/AppDomainController.php
index 45265c55..bf199f88 100644
--- a/app/Http/Controllers/V1/Installation/AppDomainController.php
+++ b/app/Http/Controllers/Setup/AppDomainController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Installation;
+namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DomainEnvironmentRequest;
diff --git a/app/Http/Controllers/V1/Installation/DatabaseConfigurationController.php b/app/Http/Controllers/Setup/DatabaseConfigurationController.php
similarity index 98%
rename from app/Http/Controllers/V1/Installation/DatabaseConfigurationController.php
rename to app/Http/Controllers/Setup/DatabaseConfigurationController.php
index 48906eb2..6c26dcc1 100644
--- a/app/Http/Controllers/V1/Installation/DatabaseConfigurationController.php
+++ b/app/Http/Controllers/Setup/DatabaseConfigurationController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Installation;
+namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DatabaseEnvironmentRequest;
diff --git a/app/Http/Controllers/V1/Installation/FilePermissionsController.php b/app/Http/Controllers/Setup/FilePermissionsController.php
similarity index 94%
rename from app/Http/Controllers/V1/Installation/FilePermissionsController.php
rename to app/Http/Controllers/Setup/FilePermissionsController.php
index a6e3641e..606f513a 100644
--- a/app/Http/Controllers/V1/Installation/FilePermissionsController.php
+++ b/app/Http/Controllers/Setup/FilePermissionsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Installation;
+namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Services\Installation\FilePermissionChecker;
diff --git a/app/Http/Controllers/V1/Installation/FinishController.php b/app/Http/Controllers/Setup/FinishController.php
similarity index 88%
rename from app/Http/Controllers/V1/Installation/FinishController.php
rename to app/Http/Controllers/Setup/FinishController.php
index 8e7f4e1c..0d21a2ad 100644
--- a/app/Http/Controllers/V1/Installation/FinishController.php
+++ b/app/Http/Controllers/Setup/FinishController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Installation;
+namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
diff --git a/app/Http/Controllers/V1/Installation/LanguagesController.php b/app/Http/Controllers/Setup/LanguagesController.php
similarity index 88%
rename from app/Http/Controllers/V1/Installation/LanguagesController.php
rename to app/Http/Controllers/Setup/LanguagesController.php
index ecdbd528..7733b97e 100755
--- a/app/Http/Controllers/V1/Installation/LanguagesController.php
+++ b/app/Http/Controllers/Setup/LanguagesController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Installation;
+namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
diff --git a/app/Http/Controllers/V1/Installation/LoginController.php b/app/Http/Controllers/Setup/LoginController.php
similarity index 92%
rename from app/Http/Controllers/V1/Installation/LoginController.php
rename to app/Http/Controllers/Setup/LoginController.php
index dda5997e..f0612e87 100644
--- a/app/Http/Controllers/V1/Installation/LoginController.php
+++ b/app/Http/Controllers/Setup/LoginController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Installation;
+namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Models\User;
diff --git a/app/Http/Controllers/V1/Installation/OnboardingWizardController.php b/app/Http/Controllers/Setup/OnboardingWizardController.php
similarity index 96%
rename from app/Http/Controllers/V1/Installation/OnboardingWizardController.php
rename to app/Http/Controllers/Setup/OnboardingWizardController.php
index b276ad6d..6f3d4167 100644
--- a/app/Http/Controllers/V1/Installation/OnboardingWizardController.php
+++ b/app/Http/Controllers/Setup/OnboardingWizardController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Installation;
+namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Models\Setting;
diff --git a/app/Http/Controllers/V1/Installation/RequirementsController.php b/app/Http/Controllers/Setup/RequirementsController.php
similarity index 94%
rename from app/Http/Controllers/V1/Installation/RequirementsController.php
rename to app/Http/Controllers/Setup/RequirementsController.php
index dd6cea64..0140dbc9 100755
--- a/app/Http/Controllers/V1/Installation/RequirementsController.php
+++ b/app/Http/Controllers/Setup/RequirementsController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Installation;
+namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Services\Installation\RequirementsChecker;
diff --git a/app/Http/Controllers/V1/Webhook/CronJobController.php b/app/Http/Controllers/Webhook/CronJobController.php
similarity index 90%
rename from app/Http/Controllers/V1/Webhook/CronJobController.php
rename to app/Http/Controllers/Webhook/CronJobController.php
index f6df6da0..dd89dc59 100644
--- a/app/Http/Controllers/V1/Webhook/CronJobController.php
+++ b/app/Http/Controllers/Webhook/CronJobController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\V1\Webhook;
+namespace App\Http\Controllers\Webhook;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/routes/api.php b/routes/api.php
index 7f32b174..6af975f5 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,89 +1,89 @@
 <?php
 
+use App\Http\Controllers\Admin\Backup\BackupsController;
+use App\Http\Controllers\Admin\Backup\DownloadBackupController;
+use App\Http\Controllers\Admin\CountriesController;
+use App\Http\Controllers\Admin\CurrenciesController;
+use App\Http\Controllers\Admin\Modules\ApiTokenController;
+use App\Http\Controllers\Admin\Modules\CompleteModuleInstallationController;
+use App\Http\Controllers\Admin\Modules\CopyModuleController;
+use App\Http\Controllers\Admin\Modules\DisableModuleController;
+use App\Http\Controllers\Admin\Modules\DownloadModuleController;
+use App\Http\Controllers\Admin\Modules\EnableModuleController;
+use App\Http\Controllers\Admin\Modules\ModuleController;
+use App\Http\Controllers\Admin\Modules\ModulesController;
+use App\Http\Controllers\Admin\Modules\UnzipModuleController;
+use App\Http\Controllers\Admin\Modules\UploadModuleController;
+use App\Http\Controllers\Admin\Settings\DiskController;
+use App\Http\Controllers\Admin\Settings\GetSettingsController;
+use App\Http\Controllers\Admin\Settings\MailConfigurationController;
+use App\Http\Controllers\Admin\Settings\PDFConfigurationController;
+use App\Http\Controllers\Admin\Settings\UpdateSettingsController;
+use App\Http\Controllers\Admin\Update\CheckVersionController;
+use App\Http\Controllers\Admin\Update\CopyFilesController;
+use App\Http\Controllers\Admin\Update\DeleteFilesController;
+use App\Http\Controllers\Admin\Update\DownloadUpdateController;
+use App\Http\Controllers\Admin\Update\FinishUpdateController;
+use App\Http\Controllers\Admin\Update\MigrateUpdateController;
+use App\Http\Controllers\Admin\Update\UnzipUpdateController;
 use App\Http\Controllers\AppVersionController;
-use App\Http\Controllers\V1\Admin\Auth\ForgotPasswordController;
-use App\Http\Controllers\V1\Admin\Auth\ResetPasswordController;
-use App\Http\Controllers\V1\Admin\Company\CompaniesController;
-use App\Http\Controllers\V1\Admin\Customer\CustomersController;
-use App\Http\Controllers\V1\Admin\Customer\CustomerStatsController;
-use App\Http\Controllers\V1\Admin\CustomField\CustomFieldsController;
-use App\Http\Controllers\V1\Admin\Dashboard\DashboardController;
-use App\Http\Controllers\V1\Admin\Estimate\EstimatesController;
-use App\Http\Controllers\V1\Admin\Estimate\EstimateTemplatesController;
-use App\Http\Controllers\V1\Admin\ExchangeRate\ExchangeRateProviderController;
-use App\Http\Controllers\V1\Admin\Expense\ExpenseCategoriesController;
-use App\Http\Controllers\V1\Admin\Expense\ExpensesController;
-use App\Http\Controllers\V1\Admin\General\BootstrapController;
-use App\Http\Controllers\V1\Admin\General\ConfigController;
-use App\Http\Controllers\V1\Admin\General\FormatsController;
-use App\Http\Controllers\V1\Admin\General\NotesController;
-use App\Http\Controllers\V1\Admin\General\SearchController;
-use App\Http\Controllers\V1\Admin\General\SerialNumberController;
-use App\Http\Controllers\V1\Admin\Invoice\InvoicesController;
-use App\Http\Controllers\V1\Admin\Invoice\InvoiceTemplatesController;
-use App\Http\Controllers\V1\Admin\Item\ItemsController;
-use App\Http\Controllers\V1\Admin\Item\UnitsController;
-use App\Http\Controllers\V1\Admin\Mobile\AuthController;
-use App\Http\Controllers\V1\Admin\Payment\PaymentMethodsController;
-use App\Http\Controllers\V1\Admin\Payment\PaymentsController;
-use App\Http\Controllers\V1\Admin\RecurringInvoice\RecurringInvoiceController;
-use App\Http\Controllers\V1\Admin\RecurringInvoice\RecurringInvoiceFrequencyController;
-use App\Http\Controllers\V1\Admin\Role\AbilitiesController;
-use App\Http\Controllers\V1\Admin\Role\RolesController;
-use App\Http\Controllers\V1\Admin\Settings\CompanyController;
-use App\Http\Controllers\V1\Admin\Settings\CompanyCurrencyCheckTransactionsController;
-use App\Http\Controllers\V1\Admin\Settings\CompanyMailConfigurationController;
-use App\Http\Controllers\V1\Admin\Settings\CompanySettingsController;
-use App\Http\Controllers\V1\Admin\Settings\TaxTypesController;
-use App\Http\Controllers\V1\Admin\Settings\UserProfileController;
-use App\Http\Controllers\V1\Admin\Settings\UserSettingsController;
-use App\Http\Controllers\V1\Admin\Users\UsersController;
-use App\Http\Controllers\V1\Customer\Auth\ForgotPasswordController as AuthForgotPasswordController;
-use App\Http\Controllers\V1\Customer\Auth\ResetPasswordController as AuthResetPasswordController;
-use App\Http\Controllers\V1\Customer\Estimate\AcceptEstimateController as CustomerAcceptEstimateController;
-use App\Http\Controllers\V1\Customer\Estimate\EstimatesController as CustomerEstimatesController;
-use App\Http\Controllers\V1\Customer\Expense\ExpensesController as CustomerExpensesController;
-use App\Http\Controllers\V1\Customer\General\BootstrapController as CustomerBootstrapController;
-use App\Http\Controllers\V1\Customer\General\DashboardController as CustomerDashboardController;
-use App\Http\Controllers\V1\Customer\General\ProfileController as CustomerProfileController;
-use App\Http\Controllers\V1\Customer\Invoice\InvoicesController as CustomerInvoicesController;
-use App\Http\Controllers\V1\Customer\Payment\PaymentMethodController;
-use App\Http\Controllers\V1\Customer\Payment\PaymentsController as CustomerPaymentsController;
-use App\Http\Controllers\V1\Installation\AppDomainController;
-use App\Http\Controllers\V1\Installation\DatabaseConfigurationController;
-use App\Http\Controllers\V1\Installation\FilePermissionsController;
-use App\Http\Controllers\V1\Installation\FinishController;
-use App\Http\Controllers\V1\Installation\LanguagesController;
-use App\Http\Controllers\V1\Installation\LoginController;
-use App\Http\Controllers\V1\Installation\OnboardingWizardController;
-use App\Http\Controllers\V1\Installation\RequirementsController;
-use App\Http\Controllers\V1\SuperAdmin\Backup\BackupsController;
-use App\Http\Controllers\V1\SuperAdmin\Backup\DownloadBackupController;
-use App\Http\Controllers\V1\SuperAdmin\CountriesController;
-use App\Http\Controllers\V1\SuperAdmin\CurrenciesController;
-use App\Http\Controllers\V1\SuperAdmin\Modules\ApiTokenController;
-use App\Http\Controllers\V1\SuperAdmin\Modules\CompleteModuleInstallationController;
-use App\Http\Controllers\V1\SuperAdmin\Modules\CopyModuleController;
-use App\Http\Controllers\V1\SuperAdmin\Modules\DisableModuleController;
-use App\Http\Controllers\V1\SuperAdmin\Modules\DownloadModuleController;
-use App\Http\Controllers\V1\SuperAdmin\Modules\EnableModuleController;
-use App\Http\Controllers\V1\SuperAdmin\Modules\ModuleController;
-use App\Http\Controllers\V1\SuperAdmin\Modules\ModulesController;
-use App\Http\Controllers\V1\SuperAdmin\Modules\UnzipModuleController;
-use App\Http\Controllers\V1\SuperAdmin\Modules\UploadModuleController;
-use App\Http\Controllers\V1\SuperAdmin\Settings\DiskController;
-use App\Http\Controllers\V1\SuperAdmin\Settings\GetSettingsController;
-use App\Http\Controllers\V1\SuperAdmin\Settings\MailConfigurationController;
-use App\Http\Controllers\V1\SuperAdmin\Settings\PDFConfigurationController;
-use App\Http\Controllers\V1\SuperAdmin\Settings\UpdateSettingsController;
-use App\Http\Controllers\V1\SuperAdmin\Update\CheckVersionController;
-use App\Http\Controllers\V1\SuperAdmin\Update\CopyFilesController;
-use App\Http\Controllers\V1\SuperAdmin\Update\DeleteFilesController;
-use App\Http\Controllers\V1\SuperAdmin\Update\DownloadUpdateController;
-use App\Http\Controllers\V1\SuperAdmin\Update\FinishUpdateController;
-use App\Http\Controllers\V1\SuperAdmin\Update\MigrateUpdateController;
-use App\Http\Controllers\V1\SuperAdmin\Update\UnzipUpdateController;
-use App\Http\Controllers\V1\Webhook\CronJobController;
+use App\Http\Controllers\Company\Auth\ForgotPasswordController;
+use App\Http\Controllers\Company\Auth\ResetPasswordController;
+use App\Http\Controllers\Company\Company\CompaniesController;
+use App\Http\Controllers\Company\Customer\CustomersController;
+use App\Http\Controllers\Company\Customer\CustomerStatsController;
+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\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\Mobile\AuthController;
+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\CompanyController;
+use App\Http\Controllers\Company\Settings\CompanyCurrencyCheckTransactionsController;
+use App\Http\Controllers\Company\Settings\CompanyMailConfigurationController;
+use App\Http\Controllers\Company\Settings\CompanySettingsController;
+use App\Http\Controllers\Company\Settings\TaxTypesController;
+use App\Http\Controllers\Company\Settings\UserProfileController;
+use App\Http\Controllers\Company\Settings\UserSettingsController;
+use App\Http\Controllers\Company\Users\UsersController;
+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\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;
 
 /*
@@ -166,19 +166,19 @@ Route::prefix('/v1')->group(function () {
     // ----------------------------------
 
     Route::middleware(['auth:sanctum', 'super-admin'])->prefix('super-admin')->group(function () {
-        Route::get('companies', [App\Http\Controllers\V1\SuperAdmin\CompaniesController::class, 'index']);
-        Route::get('companies/{company}', [App\Http\Controllers\V1\SuperAdmin\CompaniesController::class, 'show']);
-        Route::put('companies/{company}', [App\Http\Controllers\V1\SuperAdmin\CompaniesController::class, 'update']);
+        Route::get('companies', [App\Http\Controllers\Admin\CompaniesController::class, 'index']);
+        Route::get('companies/{company}', [App\Http\Controllers\Admin\CompaniesController::class, 'show']);
+        Route::put('companies/{company}', [App\Http\Controllers\Admin\CompaniesController::class, 'update']);
 
-        Route::get('users', [App\Http\Controllers\V1\SuperAdmin\UsersController::class, 'index']);
-        Route::get('users/{user}', [App\Http\Controllers\V1\SuperAdmin\UsersController::class, 'show']);
-        Route::put('users/{user}', [App\Http\Controllers\V1\SuperAdmin\UsersController::class, 'update']);
-        Route::post('users/{user}/impersonate', [App\Http\Controllers\V1\SuperAdmin\UsersController::class, 'impersonate']);
+        Route::get('users', [App\Http\Controllers\Admin\UsersController::class, 'index']);
+        Route::get('users/{user}', [App\Http\Controllers\Admin\UsersController::class, 'show']);
+        Route::put('users/{user}', [App\Http\Controllers\Admin\UsersController::class, 'update']);
+        Route::post('users/{user}/impersonate', [App\Http\Controllers\Admin\UsersController::class, 'impersonate']);
     });
 
     // 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', [App\Http\Controllers\V1\SuperAdmin\UsersController::class, 'stopImpersonating']);
+        Route::post('stop-impersonating', [App\Http\Controllers\Admin\UsersController::class, 'stopImpersonating']);
     });
 
     Route::middleware(['auth:sanctum', 'company'])->group(function () {
diff --git a/routes/web.php b/routes/web.php
index 4b1d541a..f11c8eba 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,22 +1,22 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Auth\LoginController;
-use App\Http\Controllers\V1\Admin\Expense\ExpensesController;
-use App\Http\Controllers\V1\Admin\Report\CustomerSalesReportController;
-use App\Http\Controllers\V1\Admin\Report\ExpensesReportController;
-use App\Http\Controllers\V1\Admin\Report\ItemSalesReportController;
-use App\Http\Controllers\V1\Admin\Report\ProfitLossReportController;
-use App\Http\Controllers\V1\Admin\Report\TaxSummaryReportController;
-use App\Http\Controllers\V1\Customer\Auth\LoginController as CustomerLoginController;
-use App\Http\Controllers\V1\Customer\EstimatePdfController as CustomerEstimatePdfController;
-use App\Http\Controllers\V1\Customer\InvoicePdfController as CustomerInvoicePdfController;
-use App\Http\Controllers\V1\Customer\PaymentPdfController as CustomerPaymentPdfController;
-use App\Http\Controllers\V1\Modules\ScriptController;
-use App\Http\Controllers\V1\Modules\StyleController;
-use App\Http\Controllers\V1\PDF\DownloadReceiptController;
-use App\Http\Controllers\V1\PDF\EstimatePdfController;
-use App\Http\Controllers\V1\PDF\InvoicePdfController;
-use App\Http\Controllers\V1\PDF\PaymentPdfController;
+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\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\DownloadReceiptController;
+use App\Http\Controllers\Pdf\EstimatePdfController;
+use App\Http\Controllers\Pdf\InvoicePdfController;
+use App\Http\Controllers\Pdf\PaymentPdfController;
 use App\Models\Company;
 use Illuminate\Support\Facades\Route;
 
diff --git a/tests/Feature/Admin/CompanySettingTest.php b/tests/Feature/Admin/CompanySettingTest.php
index 1f1c95a4..b623de07 100644
--- a/tests/Feature/Admin/CompanySettingTest.php
+++ b/tests/Feature/Admin/CompanySettingTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Settings\CompanyController;
-use App\Http\Controllers\V1\Admin\Settings\UserProfileController;
+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;
diff --git a/tests/Feature/Admin/CompanyTest.php b/tests/Feature/Admin/CompanyTest.php
index 2d8d0c82..adee308b 100644
--- a/tests/Feature/Admin/CompanyTest.php
+++ b/tests/Feature/Admin/CompanyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Company\CompaniesController;
+use App\Http\Controllers\Company\Company\CompaniesController;
 use App\Http\Requests\CompaniesRequest;
 use App\Models\Company;
 use App\Models\User;
diff --git a/tests/Feature/Admin/CustomFieldTest.php b/tests/Feature/Admin/CustomFieldTest.php
index e0334dfd..811c481d 100644
--- a/tests/Feature/Admin/CustomFieldTest.php
+++ b/tests/Feature/Admin/CustomFieldTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\CustomField\CustomFieldsController;
+use App\Http\Controllers\Company\CustomField\CustomFieldsController;
 use App\Http\Requests\CustomFieldRequest;
 use App\Models\CustomField;
 use App\Models\User;
diff --git a/tests/Feature/Admin/CustomerTest.php b/tests/Feature/Admin/CustomerTest.php
index 731a4e34..0e649884 100644
--- a/tests/Feature/Admin/CustomerTest.php
+++ b/tests/Feature/Admin/CustomerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Customer\CustomersController;
+use App\Http\Controllers\Company\Customer\CustomersController;
 use App\Http\Requests\CustomerRequest;
 use App\Models\Company;
 use App\Models\Customer;
diff --git a/tests/Feature/Admin/EstimateTest.php b/tests/Feature/Admin/EstimateTest.php
index f0c505ad..14f1f99d 100644
--- a/tests/Feature/Admin/EstimateTest.php
+++ b/tests/Feature/Admin/EstimateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Estimate\EstimatesController;
+use App\Http\Controllers\Company\Estimate\EstimatesController;
 use App\Http\Requests\DeleteEstimatesRequest;
 use App\Http\Requests\EstimatesRequest;
 use App\Http\Requests\SendEstimatesRequest;
diff --git a/tests/Feature/Admin/ExpenseCategoryTest.php b/tests/Feature/Admin/ExpenseCategoryTest.php
index e8584d92..58ca3606 100644
--- a/tests/Feature/Admin/ExpenseCategoryTest.php
+++ b/tests/Feature/Admin/ExpenseCategoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Expense\ExpenseCategoriesController;
+use App\Http\Controllers\Company\Expense\ExpenseCategoriesController;
 use App\Http\Requests\ExpenseCategoryRequest;
 use App\Models\ExpenseCategory;
 use App\Models\User;
diff --git a/tests/Feature/Admin/ExpenseTest.php b/tests/Feature/Admin/ExpenseTest.php
index 4267a153..4a120725 100644
--- a/tests/Feature/Admin/ExpenseTest.php
+++ b/tests/Feature/Admin/ExpenseTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Expense\ExpensesController;
+use App\Http\Controllers\Company\Expense\ExpensesController;
 use App\Http\Requests\ExpenseRequest;
 use App\Models\Expense;
 use App\Models\User;
diff --git a/tests/Feature/Admin/InvoiceTest.php b/tests/Feature/Admin/InvoiceTest.php
index 99d9c4dc..597df186 100644
--- a/tests/Feature/Admin/InvoiceTest.php
+++ b/tests/Feature/Admin/InvoiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Invoice\InvoicesController;
+use App\Http\Controllers\Company\Invoice\InvoicesController;
 use App\Http\Requests\InvoicesRequest;
 use App\Mail\SendInvoiceMail;
 use App\Models\Invoice;
diff --git a/tests/Feature/Admin/ItemTest.php b/tests/Feature/Admin/ItemTest.php
index b6ab0cab..8cac1d1b 100644
--- a/tests/Feature/Admin/ItemTest.php
+++ b/tests/Feature/Admin/ItemTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Item\ItemsController;
+use App\Http\Controllers\Company\Item\ItemsController;
 use App\Http\Requests\ItemsRequest;
 use App\Models\Item;
 use App\Models\Tax;
diff --git a/tests/Feature/Admin/PaymentMethodTest.php b/tests/Feature/Admin/PaymentMethodTest.php
index 0f7e2436..c0923742 100644
--- a/tests/Feature/Admin/PaymentMethodTest.php
+++ b/tests/Feature/Admin/PaymentMethodTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Payment\PaymentMethodsController;
+use App\Http\Controllers\Company\Payment\PaymentMethodsController;
 use App\Http\Requests\PaymentMethodRequest;
 use App\Models\PaymentMethod;
 use App\Models\User;
diff --git a/tests/Feature/Admin/PaymentTest.php b/tests/Feature/Admin/PaymentTest.php
index e73c48f3..7277b323 100644
--- a/tests/Feature/Admin/PaymentTest.php
+++ b/tests/Feature/Admin/PaymentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Payment\PaymentsController;
+use App\Http\Controllers\Company\Payment\PaymentsController;
 use App\Http\Requests\PaymentRequest;
 use App\Mail\SendPaymentMail;
 use App\Models\Invoice;
diff --git a/tests/Feature/Admin/RecurringInvoiceTest.php b/tests/Feature/Admin/RecurringInvoiceTest.php
index bcf169c8..f4468250 100644
--- a/tests/Feature/Admin/RecurringInvoiceTest.php
+++ b/tests/Feature/Admin/RecurringInvoiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\RecurringInvoice\RecurringInvoiceController;
+use App\Http\Controllers\Company\RecurringInvoice\RecurringInvoiceController;
 use App\Http\Requests\RecurringInvoiceRequest;
 use App\Models\InvoiceItem;
 use App\Models\RecurringInvoice;
diff --git a/tests/Feature/Admin/TaxTypeTest.php b/tests/Feature/Admin/TaxTypeTest.php
index 1c0c6413..51b88da1 100644
--- a/tests/Feature/Admin/TaxTypeTest.php
+++ b/tests/Feature/Admin/TaxTypeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Settings\TaxTypesController;
+use App\Http\Controllers\Company\Settings\TaxTypesController;
 use App\Http\Requests\TaxTypeRequest;
 use App\Models\TaxType;
 use App\Models\User;
diff --git a/tests/Feature/Admin/UnitTest.php b/tests/Feature/Admin/UnitTest.php
index 8ae6dccc..a8e2688a 100644
--- a/tests/Feature/Admin/UnitTest.php
+++ b/tests/Feature/Admin/UnitTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Item\UnitsController;
+use App\Http\Controllers\Company\Item\UnitsController;
 use App\Http\Requests\UnitRequest;
 use App\Models\Unit;
 use App\Models\User;
diff --git a/tests/Feature/Admin/UserTest.php b/tests/Feature/Admin/UserTest.php
index 0e322f10..05357857 100644
--- a/tests/Feature/Admin/UserTest.php
+++ b/tests/Feature/Admin/UserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Http\Controllers\V1\Admin\Users\UsersController;
+use App\Http\Controllers\Company\Users\UsersController;
 use App\Http\Requests\UserRequest;
 use App\Models\User;
 use Laravel\Sanctum\Sanctum;
diff --git a/tests/Feature/Customer/ProfileTest.php b/tests/Feature/Customer/ProfileTest.php
index 3046587e..81bc241f 100644
--- a/tests/Feature/Customer/ProfileTest.php
+++ b/tests/Feature/Customer/ProfileTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Feature\Customer;
 
-use App\Http\Controllers\V1\Customer\General\ProfileController;
+use App\Http\Controllers\CustomerPortal\General\ProfileController;
 use App\Http\Requests\Customer\CustomerProfileRequest;
 use App\Models\Customer;
 use Illuminate\Support\Facades\Artisan;