diff --git a/app/Console/Commands/AdminInviteCommand.php b/app/Console/Commands/Admin/AdminInviteCommand.php
similarity index 99%
rename from app/Console/Commands/AdminInviteCommand.php
rename to app/Console/Commands/Admin/AdminInviteCommand.php
index e2a6a1d47..6f094032a 100644
--- a/app/Console/Commands/AdminInviteCommand.php
+++ b/app/Console/Commands/Admin/AdminInviteCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Mail\AdminInviteEmail;
 use App\Models\AdminInvite;
diff --git a/app/Console/Commands/BackupToCloud.php b/app/Console/Commands/Admin/BackupToCloud.php
similarity index 98%
rename from app/Console/Commands/BackupToCloud.php
rename to app/Console/Commands/Admin/BackupToCloud.php
index 2603ba0dc..60f6e89f6 100644
--- a/app/Console/Commands/BackupToCloud.php
+++ b/app/Console/Commands/Admin/BackupToCloud.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use Illuminate\Console\Command;
 use Illuminate\Http\File;
diff --git a/app/Console/Commands/BannedEmailCheck.php b/app/Console/Commands/Admin/BannedEmailCheck.php
similarity index 96%
rename from app/Console/Commands/BannedEmailCheck.php
rename to app/Console/Commands/Admin/BannedEmailCheck.php
index dea3e8daf..f0bec3db9 100644
--- a/app/Console/Commands/BannedEmailCheck.php
+++ b/app/Console/Commands/Admin/BannedEmailCheck.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Models\User;
 use App\Services\EmailService;
diff --git a/app/Console/Commands/CaptchaToggleCommand.php b/app/Console/Commands/Admin/CaptchaToggleCommand.php
similarity index 96%
rename from app/Console/Commands/CaptchaToggleCommand.php
rename to app/Console/Commands/Admin/CaptchaToggleCommand.php
index 409fb63ae..f9d574b54 100644
--- a/app/Console/Commands/CaptchaToggleCommand.php
+++ b/app/Console/Commands/Admin/CaptchaToggleCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Services\ConfigCacheService;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/CuratedOnboardingCommand.php b/app/Console/Commands/Admin/CuratedOnboardingCommand.php
similarity index 99%
rename from app/Console/Commands/CuratedOnboardingCommand.php
rename to app/Console/Commands/Admin/CuratedOnboardingCommand.php
index 7db62e218..ce2d8ff66 100644
--- a/app/Console/Commands/CuratedOnboardingCommand.php
+++ b/app/Console/Commands/Admin/CuratedOnboardingCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Mail\CuratedRegisterConfirmEmail;
 use App\Models\CuratedRegister;
diff --git a/app/Console/Commands/DeleteRemoteProfile.php b/app/Console/Commands/Admin/DeleteRemoteProfile.php
similarity index 97%
rename from app/Console/Commands/DeleteRemoteProfile.php
rename to app/Console/Commands/Admin/DeleteRemoteProfile.php
index 6dac81063..a4431fdec 100644
--- a/app/Console/Commands/DeleteRemoteProfile.php
+++ b/app/Console/Commands/Admin/DeleteRemoteProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Jobs\DeletePipeline\DeleteRemoteProfilePipeline;
 use App\Models\Profile;
diff --git a/app/Console/Commands/ImportCities.php b/app/Console/Commands/Admin/ImportCities.php
similarity index 99%
rename from app/Console/Commands/ImportCities.php
rename to app/Console/Commands/Admin/ImportCities.php
index 37d0d7c9a..a207c496b 100644
--- a/app/Console/Commands/ImportCities.php
+++ b/app/Console/Commands/Admin/ImportCities.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Models\Place;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/ImportEmojis.php b/app/Console/Commands/Admin/ImportEmojis.php
similarity index 98%
rename from app/Console/Commands/ImportEmojis.php
rename to app/Console/Commands/Admin/ImportEmojis.php
index a0d16df1b..43500fbf2 100644
--- a/app/Console/Commands/ImportEmojis.php
+++ b/app/Console/Commands/Admin/ImportEmojis.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Models\CustomEmoji;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/InstanceManager.php b/app/Console/Commands/Admin/InstanceManager.php
similarity index 99%
rename from app/Console/Commands/InstanceManager.php
rename to app/Console/Commands/Admin/InstanceManager.php
index 69b5d6418..c4d1a18e7 100644
--- a/app/Console/Commands/InstanceManager.php
+++ b/app/Console/Commands/Admin/InstanceManager.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Jobs\InstancePipeline\FetchNodeinfoPipeline;
 use App\Models\Instance;
diff --git a/app/Console/Commands/MediaMoveStorageCloudToCloud.php b/app/Console/Commands/Admin/MediaMoveStorageCloudToCloud.php
similarity index 99%
rename from app/Console/Commands/MediaMoveStorageCloudToCloud.php
rename to app/Console/Commands/Admin/MediaMoveStorageCloudToCloud.php
index 90311d10d..dae3924f9 100644
--- a/app/Console/Commands/MediaMoveStorageCloudToCloud.php
+++ b/app/Console/Commands/Admin/MediaMoveStorageCloudToCloud.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Models\Media;
 use App\Services\MediaService;
diff --git a/app/Console/Commands/MediaMoveStorageCloudToLocal.php b/app/Console/Commands/Admin/MediaMoveStorageCloudToLocal.php
similarity index 99%
rename from app/Console/Commands/MediaMoveStorageCloudToLocal.php
rename to app/Console/Commands/Admin/MediaMoveStorageCloudToLocal.php
index bfbdfc2bb..4177e5247 100644
--- a/app/Console/Commands/MediaMoveStorageCloudToLocal.php
+++ b/app/Console/Commands/Admin/MediaMoveStorageCloudToLocal.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Console\Commands\Concerns\ManagesMediaStorageEnv;
 use App\Models\Media;
diff --git a/app/Console/Commands/MediaMoveStorageLocalToCloud.php b/app/Console/Commands/Admin/MediaMoveStorageLocalToCloud.php
similarity index 99%
rename from app/Console/Commands/MediaMoveStorageLocalToCloud.php
rename to app/Console/Commands/Admin/MediaMoveStorageLocalToCloud.php
index 185f73739..ef686d297 100644
--- a/app/Console/Commands/MediaMoveStorageLocalToCloud.php
+++ b/app/Console/Commands/Admin/MediaMoveStorageLocalToCloud.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Console\Commands\Concerns\ManagesMediaStorageEnv;
 use App\Models\Media;
diff --git a/app/Console/Commands/MigrateLocalS3MediaURL.php b/app/Console/Commands/Admin/MigrateLocalS3MediaURL.php
similarity index 99%
rename from app/Console/Commands/MigrateLocalS3MediaURL.php
rename to app/Console/Commands/Admin/MigrateLocalS3MediaURL.php
index dc5195f88..3a2f4e6bb 100644
--- a/app/Console/Commands/MigrateLocalS3MediaURL.php
+++ b/app/Console/Commands/Admin/MigrateLocalS3MediaURL.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Models\Media;
 use App\Models\Status;
diff --git a/app/Console/Commands/RegenerateThumbnails.php b/app/Console/Commands/Admin/RegenerateThumbnails.php
similarity index 96%
rename from app/Console/Commands/RegenerateThumbnails.php
rename to app/Console/Commands/Admin/RegenerateThumbnails.php
index cb8327baf..384338c56 100644
--- a/app/Console/Commands/RegenerateThumbnails.php
+++ b/app/Console/Commands/Admin/RegenerateThumbnails.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Jobs\ImageOptimizePipeline\ImageThumbnail;
 use App\Models\Media;
diff --git a/app/Console/Commands/SendUpdateActor.php b/app/Console/Commands/Admin/SendUpdateActor.php
similarity index 99%
rename from app/Console/Commands/SendUpdateActor.php
rename to app/Console/Commands/Admin/SendUpdateActor.php
index e0981e71b..9f1df231d 100644
--- a/app/Console/Commands/SendUpdateActor.php
+++ b/app/Console/Commands/Admin/SendUpdateActor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Models\Instance;
 use App\Models\Profile;
diff --git a/app/Console/Commands/VideoThumbnail.php b/app/Console/Commands/Admin/VideoThumbnail.php
similarity index 96%
rename from app/Console/Commands/VideoThumbnail.php
rename to app/Console/Commands/Admin/VideoThumbnail.php
index e08e7e533..13ffc6841 100644
--- a/app/Console/Commands/VideoThumbnail.php
+++ b/app/Console/Commands/Admin/VideoThumbnail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Admin;
 
 use App\Jobs\VideoPipeline\VideoThumbnail as Pipeline;
 use App\Models\Media;
diff --git a/app/Console/Commands/ExportLanguages.php b/app/Console/Commands/Dev/ExportLanguages.php
similarity index 98%
rename from app/Console/Commands/ExportLanguages.php
rename to app/Console/Commands/Dev/ExportLanguages.php
index c6089fb81..97ebb92ba 100644
--- a/app/Console/Commands/ExportLanguages.php
+++ b/app/Console/Commands/Dev/ExportLanguages.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Dev;
 
 use Illuminate\Console\Command;
 
diff --git a/app/Console/Commands/Localization.php b/app/Console/Commands/Dev/Localization.php
similarity index 98%
rename from app/Console/Commands/Localization.php
rename to app/Console/Commands/Dev/Localization.php
index 4e38ae86d..2893361b8 100644
--- a/app/Console/Commands/Localization.php
+++ b/app/Console/Commands/Dev/Localization.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Dev;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
diff --git a/app/Console/Commands/SeedDevUsers.php b/app/Console/Commands/Dev/SeedDevUsers.php
similarity index 98%
rename from app/Console/Commands/SeedDevUsers.php
rename to app/Console/Commands/Dev/SeedDevUsers.php
index 31badbd72..5e17bae2f 100644
--- a/app/Console/Commands/SeedDevUsers.php
+++ b/app/Console/Commands/Dev/SeedDevUsers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Dev;
 
 use App\Models\User;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/SeedFollows.php b/app/Console/Commands/Dev/SeedFollows.php
similarity index 97%
rename from app/Console/Commands/SeedFollows.php
rename to app/Console/Commands/Dev/SeedFollows.php
index ff2b6e9e0..fcbba91e5 100644
--- a/app/Console/Commands/SeedFollows.php
+++ b/app/Console/Commands/Dev/SeedFollows.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Dev;
 
 use App\Jobs\FollowPipeline\FollowPipeline;
 use App\Models\Follower;
diff --git a/app/Console/Commands/AvatarDefaultMigration.php b/app/Console/Commands/FixBugs/AvatarDefaultMigration.php
similarity index 98%
rename from app/Console/Commands/AvatarDefaultMigration.php
rename to app/Console/Commands/FixBugs/AvatarDefaultMigration.php
index dc981e077..a46de5505 100644
--- a/app/Console/Commands/AvatarDefaultMigration.php
+++ b/app/Console/Commands/FixBugs/AvatarDefaultMigration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Models\Avatar;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/AvatarStorage.php b/app/Console/Commands/FixBugs/AvatarStorage.php
similarity index 99%
rename from app/Console/Commands/AvatarStorage.php
rename to app/Console/Commands/FixBugs/AvatarStorage.php
index 01e956ca6..636c126fe 100644
--- a/app/Console/Commands/AvatarStorage.php
+++ b/app/Console/Commands/FixBugs/AvatarStorage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Jobs\AvatarPipeline\RemoteAvatarFetch;
 use App\Models\Avatar;
diff --git a/app/Console/Commands/AvatarStorageDeepClean.php b/app/Console/Commands/FixBugs/AvatarStorageDeepClean.php
similarity index 98%
rename from app/Console/Commands/AvatarStorageDeepClean.php
rename to app/Console/Commands/FixBugs/AvatarStorageDeepClean.php
index f5214bdc2..4336dfd91 100644
--- a/app/Console/Commands/AvatarStorageDeepClean.php
+++ b/app/Console/Commands/FixBugs/AvatarStorageDeepClean.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Jobs\AvatarPipeline\AvatarStorageCleanup;
 use App\Models\Avatar;
diff --git a/app/Console/Commands/CatchUnoptimizedMedia.php b/app/Console/Commands/FixBugs/CatchUnoptimizedMedia.php
similarity index 97%
rename from app/Console/Commands/CatchUnoptimizedMedia.php
rename to app/Console/Commands/FixBugs/CatchUnoptimizedMedia.php
index 8ba4277aa..ec1ff14b7 100644
--- a/app/Console/Commands/CatchUnoptimizedMedia.php
+++ b/app/Console/Commands/FixBugs/CatchUnoptimizedMedia.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Jobs\ImageOptimizePipeline\ImageOptimize;
 use App\Models\Media;
diff --git a/app/Console/Commands/FetchMissingMediaMimeType.php b/app/Console/Commands/FixBugs/FetchMissingMediaMimeType.php
similarity index 97%
rename from app/Console/Commands/FetchMissingMediaMimeType.php
rename to app/Console/Commands/FixBugs/FetchMissingMediaMimeType.php
index b7e6ae029..ad9ab7e4f 100644
--- a/app/Console/Commands/FetchMissingMediaMimeType.php
+++ b/app/Console/Commands/FixBugs/FetchMissingMediaMimeType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Models\Media;
 use App\Services\MediaService;
diff --git a/app/Console/Commands/FixDuplicateProfiles.php b/app/Console/Commands/FixBugs/FixDuplicateProfiles.php
similarity index 99%
rename from app/Console/Commands/FixDuplicateProfiles.php
rename to app/Console/Commands/FixBugs/FixDuplicateProfiles.php
index 9fbf56131..7f9e934d1 100644
--- a/app/Console/Commands/FixDuplicateProfiles.php
+++ b/app/Console/Commands/FixBugs/FixDuplicateProfiles.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Models\Avatar;
 use App\Models\Bookmark;
diff --git a/app/Console/Commands/FixHashtags.php b/app/Console/Commands/FixBugs/FixHashtags.php
similarity index 98%
rename from app/Console/Commands/FixHashtags.php
rename to app/Console/Commands/FixBugs/FixHashtags.php
index 00d450a20..8bea215bc 100644
--- a/app/Console/Commands/FixHashtags.php
+++ b/app/Console/Commands/FixBugs/FixHashtags.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Models\Hashtag;
 use App\Models\StatusHashtag;
diff --git a/app/Console/Commands/FixLikes.php b/app/Console/Commands/FixBugs/FixLikes.php
similarity index 97%
rename from app/Console/Commands/FixLikes.php
rename to app/Console/Commands/FixBugs/FixLikes.php
index 34d64d257..98d6c0379 100644
--- a/app/Console/Commands/FixLikes.php
+++ b/app/Console/Commands/FixBugs/FixLikes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Models\Like;
 use App\Models\Status;
diff --git a/app/Console/Commands/FixMediaDriver.php b/app/Console/Commands/FixBugs/FixMediaDriver.php
similarity index 99%
rename from app/Console/Commands/FixMediaDriver.php
rename to app/Console/Commands/FixBugs/FixMediaDriver.php
index e7f78f312..3b2511117 100644
--- a/app/Console/Commands/FixMediaDriver.php
+++ b/app/Console/Commands/FixBugs/FixMediaDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Jobs\ImageOptimizePipeline\ImageOptimize;
 use App\Jobs\MediaPipeline\MediaFixLocalFilesystemCleanupPipeline;
diff --git a/app/Console/Commands/FixMissingUserProfile.php b/app/Console/Commands/FixBugs/FixMissingUserProfile.php
similarity index 99%
rename from app/Console/Commands/FixMissingUserProfile.php
rename to app/Console/Commands/FixBugs/FixMissingUserProfile.php
index 0d743713a..891f632c8 100644
--- a/app/Console/Commands/FixMissingUserProfile.php
+++ b/app/Console/Commands/FixBugs/FixMissingUserProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Jobs\AvatarPipeline\CreateAvatar;
 use App\Jobs\FollowPipeline\FollowPipeline;
diff --git a/app/Console/Commands/FixProfileCounts.php b/app/Console/Commands/FixBugs/FixProfileCounts.php
similarity index 99%
rename from app/Console/Commands/FixProfileCounts.php
rename to app/Console/Commands/FixBugs/FixProfileCounts.php
index c9bbb2cb4..2afbe735a 100644
--- a/app/Console/Commands/FixProfileCounts.php
+++ b/app/Console/Commands/FixBugs/FixProfileCounts.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Jobs\FollowPipeline\FollowServiceWarmCache;
 use App\Models\Profile;
diff --git a/app/Console/Commands/FixUsernames.php b/app/Console/Commands/FixBugs/FixUsernames.php
similarity index 99%
rename from app/Console/Commands/FixUsernames.php
rename to app/Console/Commands/FixBugs/FixUsernames.php
index ac64ef6c0..8c8748656 100644
--- a/app/Console/Commands/FixUsernames.php
+++ b/app/Console/Commands/FixBugs/FixUsernames.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Models\Profile;
 use App\Models\User;
diff --git a/app/Console/Commands/HashtagRelatedGenerate.php b/app/Console/Commands/FixBugs/HashtagRelatedGenerate.php
similarity index 98%
rename from app/Console/Commands/HashtagRelatedGenerate.php
rename to app/Console/Commands/FixBugs/HashtagRelatedGenerate.php
index 7bf1a0e33..ec8b4b453 100644
--- a/app/Console/Commands/HashtagRelatedGenerate.php
+++ b/app/Console/Commands/FixBugs/HashtagRelatedGenerate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Models\Hashtag;
 use App\Models\HashtagRelated;
diff --git a/app/Console/Commands/MediaFix.php b/app/Console/Commands/FixBugs/MediaFix.php
similarity index 97%
rename from app/Console/Commands/MediaFix.php
rename to app/Console/Commands/FixBugs/MediaFix.php
index 24e105056..b5ea07452 100644
--- a/app/Console/Commands/MediaFix.php
+++ b/app/Console/Commands/FixBugs/MediaFix.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Models\Media;
 use App\Util\Media\Filter;
diff --git a/app/Console/Commands/StatusDedupe.php b/app/Console/Commands/FixBugs/StatusDedupe.php
similarity index 97%
rename from app/Console/Commands/StatusDedupe.php
rename to app/Console/Commands/FixBugs/StatusDedupe.php
index b676d972c..5d75016f8 100644
--- a/app/Console/Commands/StatusDedupe.php
+++ b/app/Console/Commands/FixBugs/StatusDedupe.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\FixBugs;
 
 use App\Jobs\StatusPipeline\StatusDelete;
 use App\Models\Status;
diff --git a/app/Console/Commands/GenerateInstanceActor.php b/app/Console/Commands/Install/GenerateInstanceActor.php
similarity index 98%
rename from app/Console/Commands/GenerateInstanceActor.php
rename to app/Console/Commands/Install/GenerateInstanceActor.php
index 1bad66d91..807f0f03f 100644
--- a/app/Console/Commands/GenerateInstanceActor.php
+++ b/app/Console/Commands/Install/GenerateInstanceActor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Install;
 
 use App\Models\InstanceActor;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/Installer.php b/app/Console/Commands/Install/Installer.php
similarity index 99%
rename from app/Console/Commands/Installer.php
rename to app/Console/Commands/Install/Installer.php
index a9c3ca70f..859745909 100644
--- a/app/Console/Commands/Installer.php
+++ b/app/Console/Commands/Install/Installer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Install;
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables;
diff --git a/app/Console/Commands/UpdateCommand.php b/app/Console/Commands/Install/UpdateCommand.php
similarity index 96%
rename from app/Console/Commands/UpdateCommand.php
rename to app/Console/Commands/Install/UpdateCommand.php
index 03d7c69e8..be144dabb 100644
--- a/app/Console/Commands/UpdateCommand.php
+++ b/app/Console/Commands/Install/UpdateCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Install;
 
 use Illuminate\Console\Command;
 
diff --git a/app/Console/Commands/AccountPostCountStatUpdate.php b/app/Console/Commands/Internal/AccountPostCountStatUpdate.php
similarity index 97%
rename from app/Console/Commands/AccountPostCountStatUpdate.php
rename to app/Console/Commands/Internal/AccountPostCountStatUpdate.php
index d2c3100ed..e1709d64a 100644
--- a/app/Console/Commands/AccountPostCountStatUpdate.php
+++ b/app/Console/Commands/Internal/AccountPostCountStatUpdate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Models\Profile;
 use App\Services\Account\AccountStatService;
diff --git a/app/Console/Commands/CleanupExpiredAppRegistrations.php b/app/Console/Commands/Internal/CleanupExpiredAppRegistrations.php
similarity index 93%
rename from app/Console/Commands/CleanupExpiredAppRegistrations.php
rename to app/Console/Commands/Internal/CleanupExpiredAppRegistrations.php
index 40dcdeebf..f53a745ed 100644
--- a/app/Console/Commands/CleanupExpiredAppRegistrations.php
+++ b/app/Console/Commands/Internal/CleanupExpiredAppRegistrations.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Models\AppRegister;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/DatabaseSessionGarbageCollector.php b/app/Console/Commands/Internal/DatabaseSessionGarbageCollector.php
similarity index 96%
rename from app/Console/Commands/DatabaseSessionGarbageCollector.php
rename to app/Console/Commands/Internal/DatabaseSessionGarbageCollector.php
index 62c5e5d9d..45676a16d 100644
--- a/app/Console/Commands/DatabaseSessionGarbageCollector.php
+++ b/app/Console/Commands/Internal/DatabaseSessionGarbageCollector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
diff --git a/app/Console/Commands/FailedJobGC.php b/app/Console/Commands/Internal/FailedJobGC.php
similarity index 95%
rename from app/Console/Commands/FailedJobGC.php
rename to app/Console/Commands/Internal/FailedJobGC.php
index 13bd19db9..f9e4824a7 100644
--- a/app/Console/Commands/FailedJobGC.php
+++ b/app/Console/Commands/Internal/FailedJobGC.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Models\FailedJob;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/HashtagCachedCountUpdate.php b/app/Console/Commands/Internal/HashtagCachedCountUpdate.php
similarity index 96%
rename from app/Console/Commands/HashtagCachedCountUpdate.php
rename to app/Console/Commands/Internal/HashtagCachedCountUpdate.php
index 601778940..a26f74581 100644
--- a/app/Console/Commands/HashtagCachedCountUpdate.php
+++ b/app/Console/Commands/Internal/HashtagCachedCountUpdate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Models\Hashtag;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/ImportRemoveDeletedAccounts.php b/app/Console/Commands/Internal/ImportRemoveDeletedAccounts.php
similarity index 97%
rename from app/Console/Commands/ImportRemoveDeletedAccounts.php
rename to app/Console/Commands/Internal/ImportRemoveDeletedAccounts.php
index 041ec8b60..118db5e91 100644
--- a/app/Console/Commands/ImportRemoveDeletedAccounts.php
+++ b/app/Console/Commands/Internal/ImportRemoveDeletedAccounts.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Models\ImportPost;
 use App\Models\User;
diff --git a/app/Console/Commands/ImportUploadCleanStorage.php b/app/Console/Commands/Internal/ImportUploadCleanStorage.php
similarity index 95%
rename from app/Console/Commands/ImportUploadCleanStorage.php
rename to app/Console/Commands/Internal/ImportUploadCleanStorage.php
index 5302b0138..adcb24cc2 100644
--- a/app/Console/Commands/ImportUploadCleanStorage.php
+++ b/app/Console/Commands/Internal/ImportUploadCleanStorage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Models\User;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/ImportUploadGarbageCollection.php b/app/Console/Commands/Internal/ImportUploadGarbageCollection.php
similarity index 96%
rename from app/Console/Commands/ImportUploadGarbageCollection.php
rename to app/Console/Commands/Internal/ImportUploadGarbageCollection.php
index e377e313b..f481aedc0 100644
--- a/app/Console/Commands/ImportUploadGarbageCollection.php
+++ b/app/Console/Commands/Internal/ImportUploadGarbageCollection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Models\ImportPost;
 use App\Services\ImportService;
diff --git a/app/Console/Commands/ImportUploadMediaToCloudStorage.php b/app/Console/Commands/Internal/ImportUploadMediaToCloudStorage.php
similarity index 97%
rename from app/Console/Commands/ImportUploadMediaToCloudStorage.php
rename to app/Console/Commands/Internal/ImportUploadMediaToCloudStorage.php
index b876eeef4..969b118d5 100644
--- a/app/Console/Commands/ImportUploadMediaToCloudStorage.php
+++ b/app/Console/Commands/Internal/ImportUploadMediaToCloudStorage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Jobs\ImportPipeline\ImportMediaToCloudPipeline;
 use App\Models\ImportPost;
diff --git a/app/Console/Commands/InstanceUpdateTotalLocalPosts.php b/app/Console/Commands/Internal/InstanceUpdateTotalLocalPosts.php
similarity index 98%
rename from app/Console/Commands/InstanceUpdateTotalLocalPosts.php
rename to app/Console/Commands/Internal/InstanceUpdateTotalLocalPosts.php
index 92ffe87b0..c318b78c5 100644
--- a/app/Console/Commands/InstanceUpdateTotalLocalPosts.php
+++ b/app/Console/Commands/Internal/InstanceUpdateTotalLocalPosts.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Services\ConfigCacheService;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/MediaGarbageCollector.php b/app/Console/Commands/Internal/MediaGarbageCollector.php
similarity index 96%
rename from app/Console/Commands/MediaGarbageCollector.php
rename to app/Console/Commands/Internal/MediaGarbageCollector.php
index 8218d0cd6..e7da79f42 100644
--- a/app/Console/Commands/MediaGarbageCollector.php
+++ b/app/Console/Commands/Internal/MediaGarbageCollector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Models\Media;
 use App\Services\MediaStorageService;
diff --git a/app/Console/Commands/NotificationEpochUpdate.php b/app/Console/Commands/Internal/NotificationEpochUpdate.php
similarity index 93%
rename from app/Console/Commands/NotificationEpochUpdate.php
rename to app/Console/Commands/Internal/NotificationEpochUpdate.php
index ab6055990..e39561d21 100644
--- a/app/Console/Commands/NotificationEpochUpdate.php
+++ b/app/Console/Commands/Internal/NotificationEpochUpdate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Jobs\InternalPipeline\NotificationEpochUpdatePipeline;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/PasswordResetGC.php b/app/Console/Commands/Internal/PasswordResetGC.php
similarity index 95%
rename from app/Console/Commands/PasswordResetGC.php
rename to app/Console/Commands/Internal/PasswordResetGC.php
index 8bac0d072..613b3f87f 100644
--- a/app/Console/Commands/PasswordResetGC.php
+++ b/app/Console/Commands/Internal/PasswordResetGC.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Models\EmailVerification;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/PushGatewayRefresh.php b/app/Console/Commands/Internal/PushGatewayRefresh.php
similarity index 97%
rename from app/Console/Commands/PushGatewayRefresh.php
rename to app/Console/Commands/Internal/PushGatewayRefresh.php
index 79672695d..4c42a7a0e 100644
--- a/app/Console/Commands/PushGatewayRefresh.php
+++ b/app/Console/Commands/Internal/PushGatewayRefresh.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Services\NotificationAppGatewayService;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/SoftwareUpdateRefresh.php b/app/Console/Commands/Internal/SoftwareUpdateRefresh.php
similarity index 95%
rename from app/Console/Commands/SoftwareUpdateRefresh.php
rename to app/Console/Commands/Internal/SoftwareUpdateRefresh.php
index cdb9ee241..4cd1fec5b 100644
--- a/app/Console/Commands/SoftwareUpdateRefresh.php
+++ b/app/Console/Commands/Internal/SoftwareUpdateRefresh.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Services\Internal\SoftwareUpdateService;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/StoryGC.php b/app/Console/Commands/Internal/StoryGC.php
similarity index 97%
rename from app/Console/Commands/StoryGC.php
rename to app/Console/Commands/Internal/StoryGC.php
index fb3a138ff..4728145ed 100644
--- a/app/Console/Commands/StoryGC.php
+++ b/app/Console/Commands/Internal/StoryGC.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Jobs\StoryPipeline\StoryExpire;
 use App\Jobs\StoryPipeline\StoryRotateMedia;
diff --git a/app/Console/Commands/TransformImports.php b/app/Console/Commands/Internal/TransformImports.php
similarity index 99%
rename from app/Console/Commands/TransformImports.php
rename to app/Console/Commands/Internal/TransformImports.php
index 794598a8c..93d2bb6a0 100644
--- a/app/Console/Commands/TransformImports.php
+++ b/app/Console/Commands/Internal/TransformImports.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Models\ImportPost;
 use App\Models\Media;
diff --git a/app/Console/Commands/WeeklyInstanceScan.php b/app/Console/Commands/Internal/WeeklyInstanceScan.php
similarity index 96%
rename from app/Console/Commands/WeeklyInstanceScan.php
rename to app/Console/Commands/Internal/WeeklyInstanceScan.php
index 7545393bd..ff5cafbb5 100644
--- a/app/Console/Commands/WeeklyInstanceScan.php
+++ b/app/Console/Commands/Internal/WeeklyInstanceScan.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Internal;
 
 use App\Jobs\InstancePipeline\FetchNodeinfoPipeline;
 use App\Models\Instance;
diff --git a/app/Console/Commands/StatusPost.php b/app/Console/Commands/Status/StatusPost.php
similarity index 99%
rename from app/Console/Commands/StatusPost.php
rename to app/Console/Commands/Status/StatusPost.php
index f6cde4848..fe75585e7 100644
--- a/app/Console/Commands/StatusPost.php
+++ b/app/Console/Commands/Status/StatusPost.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Status;
 
 use App\Models\Media;
 use App\Models\Status;
diff --git a/app/Console/Commands/StatusProfile.php b/app/Console/Commands/Status/StatusProfile.php
similarity index 99%
rename from app/Console/Commands/StatusProfile.php
rename to app/Console/Commands/Status/StatusProfile.php
index fd224583e..9049996cb 100644
--- a/app/Console/Commands/StatusProfile.php
+++ b/app/Console/Commands/Status/StatusProfile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Status;
 
 use App\Models\Instance;
 use App\Models\Profile;
diff --git a/app/Console/Commands/StatusUser.php b/app/Console/Commands/Status/StatusUser.php
similarity index 99%
rename from app/Console/Commands/StatusUser.php
rename to app/Console/Commands/Status/StatusUser.php
index 9615fb32c..7236a863d 100644
--- a/app/Console/Commands/StatusUser.php
+++ b/app/Console/Commands/Status/StatusUser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\Status;
 
 use App\Models\AccountLog;
 use App\Models\Profile;
diff --git a/app/Console/Commands/AddUserDomainBlock.php b/app/Console/Commands/User/AddUserDomainBlock.php
similarity index 98%
rename from app/Console/Commands/AddUserDomainBlock.php
rename to app/Console/Commands/User/AddUserDomainBlock.php
index 20d704ac3..ed1bcd2f2 100644
--- a/app/Console/Commands/AddUserDomainBlock.php
+++ b/app/Console/Commands/User/AddUserDomainBlock.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\DefaultDomainBlock;
 use App\Models\User;
diff --git a/app/Console/Commands/DeleteUserDomainBlock.php b/app/Console/Commands/User/DeleteUserDomainBlock.php
similarity index 98%
rename from app/Console/Commands/DeleteUserDomainBlock.php
rename to app/Console/Commands/User/DeleteUserDomainBlock.php
index 72889987d..566d80edb 100644
--- a/app/Console/Commands/DeleteUserDomainBlock.php
+++ b/app/Console/Commands/User/DeleteUserDomainBlock.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\DefaultDomainBlock;
 use App\Models\UserDomainBlock;
diff --git a/app/Console/Commands/ReclaimUsername.php b/app/Console/Commands/User/ReclaimUsername.php
similarity index 98%
rename from app/Console/Commands/ReclaimUsername.php
rename to app/Console/Commands/User/ReclaimUsername.php
index 3f47623ab..d0faec64a 100644
--- a/app/Console/Commands/ReclaimUsername.php
+++ b/app/Console/Commands/User/ReclaimUsername.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\Profile;
 use App\Models\User;
diff --git a/app/Console/Commands/UserAccountDelete.php b/app/Console/Commands/User/UserAccountDelete.php
similarity index 99%
rename from app/Console/Commands/UserAccountDelete.php
rename to app/Console/Commands/User/UserAccountDelete.php
index b6be91f99..07acdc6a6 100644
--- a/app/Console/Commands/UserAccountDelete.php
+++ b/app/Console/Commands/User/UserAccountDelete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\Instance;
 use App\Models\Profile;
diff --git a/app/Console/Commands/UserAdmin.php b/app/Console/Commands/User/UserAdmin.php
similarity index 97%
rename from app/Console/Commands/UserAdmin.php
rename to app/Console/Commands/User/UserAdmin.php
index 56767e278..b21d444f3 100644
--- a/app/Console/Commands/UserAdmin.php
+++ b/app/Console/Commands/User/UserAdmin.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\User;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/UserAvatarDelete.php b/app/Console/Commands/User/UserAvatarDelete.php
similarity index 99%
rename from app/Console/Commands/UserAvatarDelete.php
rename to app/Console/Commands/User/UserAvatarDelete.php
index d2a9ed680..c92daf548 100644
--- a/app/Console/Commands/UserAvatarDelete.php
+++ b/app/Console/Commands/User/UserAvatarDelete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\Avatar;
 use App\Models\User;
diff --git a/app/Console/Commands/UserCheckPassword.php b/app/Console/Commands/User/UserCheckPassword.php
similarity index 99%
rename from app/Console/Commands/UserCheckPassword.php
rename to app/Console/Commands/User/UserCheckPassword.php
index 4c0970f4c..80765ee80 100644
--- a/app/Console/Commands/UserCheckPassword.php
+++ b/app/Console/Commands/User/UserCheckPassword.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\User;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/UserCreate.php b/app/Console/Commands/User/UserCreate.php
similarity index 98%
rename from app/Console/Commands/UserCreate.php
rename to app/Console/Commands/User/UserCreate.php
index a4c72ad4a..8ad1f5d8d 100644
--- a/app/Console/Commands/UserCreate.php
+++ b/app/Console/Commands/User/UserCreate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\User;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/UserDelete.php b/app/Console/Commands/User/UserDelete.php
similarity index 99%
rename from app/Console/Commands/UserDelete.php
rename to app/Console/Commands/User/UserDelete.php
index 4c0702e62..2e5512f20 100644
--- a/app/Console/Commands/UserDelete.php
+++ b/app/Console/Commands/User/UserDelete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Jobs\DeletePipeline\DeleteAccountPipeline;
 use App\Models\Profile;
diff --git a/app/Console/Commands/UserRegistrationMagicLink.php b/app/Console/Commands/User/UserRegistrationMagicLink.php
similarity index 98%
rename from app/Console/Commands/UserRegistrationMagicLink.php
rename to app/Console/Commands/User/UserRegistrationMagicLink.php
index 50136598b..7215c0805 100644
--- a/app/Console/Commands/UserRegistrationMagicLink.php
+++ b/app/Console/Commands/User/UserRegistrationMagicLink.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\EmailVerification;
 use App\Models\User;
diff --git a/app/Console/Commands/UserSetPassword.php b/app/Console/Commands/User/UserSetPassword.php
similarity index 98%
rename from app/Console/Commands/UserSetPassword.php
rename to app/Console/Commands/User/UserSetPassword.php
index c558d1691..2376bc755 100644
--- a/app/Console/Commands/UserSetPassword.php
+++ b/app/Console/Commands/User/UserSetPassword.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\User;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/UserShow.php b/app/Console/Commands/User/UserShow.php
similarity index 97%
rename from app/Console/Commands/UserShow.php
rename to app/Console/Commands/User/UserShow.php
index dcbb1948b..1a9624ca2 100644
--- a/app/Console/Commands/UserShow.php
+++ b/app/Console/Commands/User/UserShow.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\User;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/UserSuspend.php b/app/Console/Commands/User/UserSuspend.php
similarity index 97%
rename from app/Console/Commands/UserSuspend.php
rename to app/Console/Commands/User/UserSuspend.php
index e19bee1e6..22cf6ef08 100644
--- a/app/Console/Commands/UserSuspend.php
+++ b/app/Console/Commands/User/UserSuspend.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\User;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/UserTable.php b/app/Console/Commands/User/UserTable.php
similarity index 96%
rename from app/Console/Commands/UserTable.php
rename to app/Console/Commands/User/UserTable.php
index 1942aaaba..a9699bb84 100644
--- a/app/Console/Commands/UserTable.php
+++ b/app/Console/Commands/User/UserTable.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\User;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/UserToggle2FA.php b/app/Console/Commands/User/UserToggle2FA.php
similarity index 97%
rename from app/Console/Commands/UserToggle2FA.php
rename to app/Console/Commands/User/UserToggle2FA.php
index 4a72676d9..ae7ac582c 100644
--- a/app/Console/Commands/UserToggle2FA.php
+++ b/app/Console/Commands/User/UserToggle2FA.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\User;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/UserUnsuspend.php b/app/Console/Commands/User/UserUnsuspend.php
similarity index 97%
rename from app/Console/Commands/UserUnsuspend.php
rename to app/Console/Commands/User/UserUnsuspend.php
index 3312bb439..5b8ba16d2 100644
--- a/app/Console/Commands/UserUnsuspend.php
+++ b/app/Console/Commands/User/UserUnsuspend.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\User;
 use Illuminate\Console\Command;
diff --git a/app/Console/Commands/UserVerifyEmail.php b/app/Console/Commands/User/UserVerifyEmail.php
similarity index 97%
rename from app/Console/Commands/UserVerifyEmail.php
rename to app/Console/Commands/User/UserVerifyEmail.php
index 52856f549..49dec0bef 100644
--- a/app/Console/Commands/UserVerifyEmail.php
+++ b/app/Console/Commands/User/UserVerifyEmail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Console\Commands\User;
 
 use App\Models\User;
 use Illuminate\Console\Command;