diff --git a/app/Http/Controllers/Admin/Settings/MailConfigurationController.php b/app/Http/Controllers/Admin/Settings/MailConfigurationController.php
index 310ed3d6..f474255a 100755
--- a/app/Http/Controllers/Admin/Settings/MailConfigurationController.php
+++ b/app/Http/Controllers/Admin/Settings/MailConfigurationController.php
@@ -6,7 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\MailEnvironmentRequest;
 use App\Mail\TestMail;
 use App\Models\Setting;
-use App\Services\Installation\EnvironmentManager;
+use App\Services\Setup\EnvironmentManager;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php b/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php
index 26735922..115c2413 100644
--- a/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php
+++ b/app/Http/Controllers/Admin/Settings/PDFConfigurationController.php
@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin\Settings;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\PDFConfigurationRequest;
 use App\Models\Setting;
-use App\Services\Installation\EnvironmentManager;
+use App\Services\Setup\EnvironmentManager;
 
 class PDFConfigurationController extends Controller
 {
diff --git a/app/Http/Controllers/Setup/AppDomainController.php b/app/Http/Controllers/Setup/AppDomainController.php
index bf199f88..6a6b7ce7 100644
--- a/app/Http/Controllers/Setup/AppDomainController.php
+++ b/app/Http/Controllers/Setup/AppDomainController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DomainEnvironmentRequest;
-use App\Services\Installation\EnvironmentManager;
+use App\Services\Setup\EnvironmentManager;
 use Illuminate\Support\Facades\Artisan;
 
 class AppDomainController extends Controller
diff --git a/app/Http/Controllers/Setup/DatabaseConfigurationController.php b/app/Http/Controllers/Setup/DatabaseConfigurationController.php
index 6c26dcc1..9845e5f5 100644
--- a/app/Http/Controllers/Setup/DatabaseConfigurationController.php
+++ b/app/Http/Controllers/Setup/DatabaseConfigurationController.php
@@ -4,8 +4,8 @@ namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\DatabaseEnvironmentRequest;
-use App\Services\Installation\EnvironmentManager;
-use App\Services\Installation\InstallUtils;
+use App\Services\Setup\EnvironmentManager;
+use App\Services\Setup\InstallUtils;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
 
diff --git a/app/Http/Controllers/Setup/FilePermissionsController.php b/app/Http/Controllers/Setup/FilePermissionsController.php
index 606f513a..c75b37f7 100644
--- a/app/Http/Controllers/Setup/FilePermissionsController.php
+++ b/app/Http/Controllers/Setup/FilePermissionsController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
-use App\Services\Installation\FilePermissionChecker;
+use App\Services\Setup\FilePermissionChecker;
 use Illuminate\Http\JsonResponse;
 
 class FilePermissionsController extends Controller
diff --git a/app/Http/Controllers/Setup/OnboardingWizardController.php b/app/Http/Controllers/Setup/OnboardingWizardController.php
index 6f3d4167..c2e62191 100644
--- a/app/Http/Controllers/Setup/OnboardingWizardController.php
+++ b/app/Http/Controllers/Setup/OnboardingWizardController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
 use App\Models\Setting;
-use App\Services\Installation\InstallUtils;
+use App\Services\Setup\InstallUtils;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/Setup/RequirementsController.php b/app/Http/Controllers/Setup/RequirementsController.php
index 0140dbc9..5eeaf502 100755
--- a/app/Http/Controllers/Setup/RequirementsController.php
+++ b/app/Http/Controllers/Setup/RequirementsController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Setup;
 
 use App\Http\Controllers\Controller;
-use App\Services\Installation\RequirementsChecker;
+use App\Services\Setup\RequirementsChecker;
 use Illuminate\Http\JsonResponse;
 
 class RequirementsController extends Controller
diff --git a/app/Http/Middleware/ConfigMiddleware.php b/app/Http/Middleware/ConfigMiddleware.php
index 4e3589ff..42e6e687 100644
--- a/app/Http/Middleware/ConfigMiddleware.php
+++ b/app/Http/Middleware/ConfigMiddleware.php
@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Models\FileDisk;
-use App\Services\Installation\InstallUtils;
+use App\Services\Setup\InstallUtils;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/app/Http/Middleware/InstallationMiddleware.php b/app/Http/Middleware/InstallationMiddleware.php
index 5349b98f..48ea6cfa 100644
--- a/app/Http/Middleware/InstallationMiddleware.php
+++ b/app/Http/Middleware/InstallationMiddleware.php
@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Models\Setting;
-use App\Services\Installation\InstallUtils;
+use App\Services\Setup\InstallUtils;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/app/Http/Middleware/RedirectIfInstalled.php b/app/Http/Middleware/RedirectIfInstalled.php
index a5b52a24..1ac820f1 100644
--- a/app/Http/Middleware/RedirectIfInstalled.php
+++ b/app/Http/Middleware/RedirectIfInstalled.php
@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Models\Setting;
-use App\Services\Installation\InstallUtils;
+use App\Services\Setup\InstallUtils;
 use Closure;
 use Illuminate\Http\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/app/Providers/AppConfigProvider.php b/app/Providers/AppConfigProvider.php
index 3ab98bb0..481f8b4a 100644
--- a/app/Providers/AppConfigProvider.php
+++ b/app/Providers/AppConfigProvider.php
@@ -4,7 +4,7 @@ namespace App\Providers;
 
 use App\Models\FileDisk;
 use App\Models\Setting;
-use App\Services\Installation\InstallUtils;
+use App\Services\Setup\InstallUtils;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 573ac984..7cdd0a2d 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -18,7 +18,7 @@ use App\Policies\ReportPolicy;
 use App\Policies\RolePolicy;
 use App\Policies\SettingsPolicy;
 use App\Policies\UserPolicy;
-use App\Services\Installation\InstallUtils;
+use App\Services\Setup\InstallUtils;
 use App\Support\BouncerDefaultScope;
 use Gate;
 use Illuminate\Support\Facades\Broadcast;
diff --git a/app/Services/Installation/EnvironmentManager.php b/app/Services/Setup/EnvironmentManager.php
similarity index 99%
rename from app/Services/Installation/EnvironmentManager.php
rename to app/Services/Setup/EnvironmentManager.php
index c00b04f2..be565511 100755
--- a/app/Services/Installation/EnvironmentManager.php
+++ b/app/Services/Setup/EnvironmentManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Installation;
+namespace App\Services\Setup;
 
 use App\Http\Requests\DatabaseEnvironmentRequest;
 use App\Http\Requests\DomainEnvironmentRequest;
diff --git a/app/Services/Installation/FilePermissionChecker.php b/app/Services/Setup/FilePermissionChecker.php
similarity index 97%
rename from app/Services/Installation/FilePermissionChecker.php
rename to app/Services/Setup/FilePermissionChecker.php
index 9244b102..f79e4efb 100644
--- a/app/Services/Installation/FilePermissionChecker.php
+++ b/app/Services/Setup/FilePermissionChecker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Installation;
+namespace App\Services\Setup;
 
 class FilePermissionChecker
 {
diff --git a/app/Services/Installation/InstallUtils.php b/app/Services/Setup/InstallUtils.php
similarity index 96%
rename from app/Services/Installation/InstallUtils.php
rename to app/Services/Setup/InstallUtils.php
index e3963199..9eb1ccaf 100644
--- a/app/Services/Installation/InstallUtils.php
+++ b/app/Services/Setup/InstallUtils.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Installation;
+namespace App\Services\Setup;
 
 use App\Models\Setting;
 use Illuminate\Database\QueryException;
diff --git a/app/Services/Installation/RequirementsChecker.php b/app/Services/Setup/RequirementsChecker.php
similarity index 99%
rename from app/Services/Installation/RequirementsChecker.php
rename to app/Services/Setup/RequirementsChecker.php
index 5bd3771a..e5202d9e 100755
--- a/app/Services/Installation/RequirementsChecker.php
+++ b/app/Services/Setup/RequirementsChecker.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Installation;
+namespace App\Services\Setup;
 
 use Illuminate\Support\Str;
 use PDO;
diff --git a/app/Support/helpers.php b/app/Support/helpers.php
index 5c380200..9ccfc1ec 100644
--- a/app/Support/helpers.php
+++ b/app/Support/helpers.php
@@ -4,7 +4,7 @@ use App\Models\CompanySetting;
 use App\Models\Currency;
 use App\Models\CustomField;
 use App\Models\Setting;
-use App\Services\Installation\InstallUtils;
+use App\Services\Setup\InstallUtils;
 use Illuminate\Support\Str;
 
 /**
diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php
index 17c0c58a..25921757 100644
--- a/database/seeders/UsersTableSeeder.php
+++ b/database/seeders/UsersTableSeeder.php
@@ -7,7 +7,7 @@ use App\Models\Company;
 use App\Models\Setting;
 use App\Models\User;
 use App\Services\CompanyService;
-use App\Services\Installation\InstallUtils;
+use App\Services\Setup\InstallUtils;
 use Illuminate\Database\Seeder;
 use Silber\Bouncer\BouncerFacade;
 
diff --git a/routes/console.php b/routes/console.php
index 3b22769c..7a83d2fb 100644
--- a/routes/console.php
+++ b/routes/console.php
@@ -2,8 +2,8 @@
 
 use App\Models\CompanySetting;
 use App\Models\RecurringInvoice;
-use App\Services\Installation\InstallUtils;
 use App\Services\RecurringInvoiceService;
+use App\Services\Setup\InstallUtils;
 use Illuminate\Support\Facades\Schedule;
 
 // Only run in demo environment