diff --git a/composer.json b/composer.json
index 8ac7c1b8..cbb73e3b 100644
--- a/composer.json
+++ b/composer.json
@@ -55,14 +55,13 @@
         "phpunit/phpunit": "^9.0"
     },
     "autoload": {
-        "classmap": [
-            "database"
-        ],
         "files": [
             "app/helpers.php"
         ],
         "psr-4": {
-            "Pterodactyl\\": "app/"
+            "Pterodactyl\\": "app/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
         }
     },
     "autoload-dev": {
diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php
index 4997a9b6..0493b372 100644
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Database\Factories;
+
 use Carbon\Carbon;
 use Ramsey\Uuid\Uuid;
 use Cake\Chronos\Chronos;
@@ -7,6 +9,7 @@ use Illuminate\Support\Str;
 use Pterodactyl\Models\Node;
 use Faker\Generator as Faker;
 use Pterodactyl\Models\ApiKey;
+use Illuminate\Support\Facades\Crypt;
 
 /** @var \Illuminate\Database\Eloquent\Factory $factory */
 /*
@@ -188,8 +191,8 @@ $factory->define(Pterodactyl\Models\ApiKey::class, function (Faker $faker) {
 
     return [
         'key_type' => ApiKey::TYPE_APPLICATION,
-        'identifier' => str_random(Pterodactyl\Models\ApiKey::IDENTIFIER_LENGTH),
-        'token' => $token ?: $token = encrypt(str_random(Pterodactyl\Models\ApiKey::KEY_LENGTH)),
+        'identifier' => str_random(\Pterodactyl\Models\ApiKey::IDENTIFIER_LENGTH),
+        'token' => $token ?: $token = encrypt(str_random(\Pterodactyl\Models\ApiKey::KEY_LENGTH)),
         'allowed_ips' => null,
         'memo' => 'Test Function Key',
         'created_at' => Carbon::now()->toDateTimeString(),
diff --git a/database/seeds/.gitkeep b/database/seeders/.gitkeep
similarity index 100%
rename from database/seeds/.gitkeep
rename to database/seeders/.gitkeep
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
similarity index 89%
rename from database/seeds/DatabaseSeeder.php
rename to database/seeders/DatabaseSeeder.php
index fa426dea..ae534fe6 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
diff --git a/database/seeds/EggSeeder.php b/database/seeders/EggSeeder.php
similarity index 99%
rename from database/seeds/EggSeeder.php
rename to database/seeders/EggSeeder.php
index dea5b675..3a40a347 100644
--- a/database/seeds/EggSeeder.php
+++ b/database/seeders/EggSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Database\Seeders;
+
 use Pterodactyl\Models\Nest;
 use Illuminate\Database\Seeder;
 use Illuminate\Http\UploadedFile;
diff --git a/database/seeds/NestSeeder.php b/database/seeders/NestSeeder.php
similarity index 99%
rename from database/seeds/NestSeeder.php
rename to database/seeders/NestSeeder.php
index fdd77564..5e1fe407 100644
--- a/database/seeds/NestSeeder.php
+++ b/database/seeders/NestSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Database\Seeders;
+
 use Illuminate\Database\Seeder;
 use Pterodactyl\Services\Nests\NestCreationService;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
diff --git a/database/seeds/eggs/minecraft/egg-bungeecord.json b/database/seeders/eggs/minecraft/egg-bungeecord.json
similarity index 100%
rename from database/seeds/eggs/minecraft/egg-bungeecord.json
rename to database/seeders/eggs/minecraft/egg-bungeecord.json
diff --git a/database/seeds/eggs/minecraft/egg-forge-minecraft.json b/database/seeders/eggs/minecraft/egg-forge-minecraft.json
similarity index 100%
rename from database/seeds/eggs/minecraft/egg-forge-minecraft.json
rename to database/seeders/eggs/minecraft/egg-forge-minecraft.json
diff --git a/database/seeds/eggs/minecraft/egg-paper.json b/database/seeders/eggs/minecraft/egg-paper.json
similarity index 100%
rename from database/seeds/eggs/minecraft/egg-paper.json
rename to database/seeders/eggs/minecraft/egg-paper.json
diff --git a/database/seeds/eggs/minecraft/egg-sponge--sponge-vanilla.json b/database/seeders/eggs/minecraft/egg-sponge--sponge-vanilla.json
similarity index 100%
rename from database/seeds/eggs/minecraft/egg-sponge--sponge-vanilla.json
rename to database/seeders/eggs/minecraft/egg-sponge--sponge-vanilla.json
diff --git a/database/seeds/eggs/minecraft/egg-vanilla-minecraft.json b/database/seeders/eggs/minecraft/egg-vanilla-minecraft.json
similarity index 100%
rename from database/seeds/eggs/minecraft/egg-vanilla-minecraft.json
rename to database/seeders/eggs/minecraft/egg-vanilla-minecraft.json
diff --git a/database/seeds/eggs/rust/egg-rust.json b/database/seeders/eggs/rust/egg-rust.json
similarity index 100%
rename from database/seeds/eggs/rust/egg-rust.json
rename to database/seeders/eggs/rust/egg-rust.json
diff --git a/database/seeds/eggs/source-engine/egg-ark--survival-evolved.json b/database/seeders/eggs/source-engine/egg-ark--survival-evolved.json
similarity index 100%
rename from database/seeds/eggs/source-engine/egg-ark--survival-evolved.json
rename to database/seeders/eggs/source-engine/egg-ark--survival-evolved.json
diff --git a/database/seeds/eggs/source-engine/egg-counter--strike--global-offensive.json b/database/seeders/eggs/source-engine/egg-counter--strike--global-offensive.json
similarity index 100%
rename from database/seeds/eggs/source-engine/egg-counter--strike--global-offensive.json
rename to database/seeders/eggs/source-engine/egg-counter--strike--global-offensive.json
diff --git a/database/seeds/eggs/source-engine/egg-custom-source-engine-game.json b/database/seeders/eggs/source-engine/egg-custom-source-engine-game.json
similarity index 100%
rename from database/seeds/eggs/source-engine/egg-custom-source-engine-game.json
rename to database/seeders/eggs/source-engine/egg-custom-source-engine-game.json
diff --git a/database/seeds/eggs/source-engine/egg-garrys-mod.json b/database/seeders/eggs/source-engine/egg-garrys-mod.json
similarity index 100%
rename from database/seeds/eggs/source-engine/egg-garrys-mod.json
rename to database/seeders/eggs/source-engine/egg-garrys-mod.json
diff --git a/database/seeds/eggs/source-engine/egg-insurgency.json b/database/seeders/eggs/source-engine/egg-insurgency.json
similarity index 100%
rename from database/seeds/eggs/source-engine/egg-insurgency.json
rename to database/seeders/eggs/source-engine/egg-insurgency.json
diff --git a/database/seeds/eggs/source-engine/egg-team-fortress2.json b/database/seeders/eggs/source-engine/egg-team-fortress2.json
similarity index 100%
rename from database/seeds/eggs/source-engine/egg-team-fortress2.json
rename to database/seeders/eggs/source-engine/egg-team-fortress2.json
diff --git a/database/seeds/eggs/voice-servers/egg-mumble-server.json b/database/seeders/eggs/voice-servers/egg-mumble-server.json
similarity index 100%
rename from database/seeds/eggs/voice-servers/egg-mumble-server.json
rename to database/seeders/eggs/voice-servers/egg-mumble-server.json
diff --git a/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json b/database/seeders/eggs/voice-servers/egg-teamspeak3-server.json
similarity index 100%
rename from database/seeds/eggs/voice-servers/egg-teamspeak3-server.json
rename to database/seeders/eggs/voice-servers/egg-teamspeak3-server.json