diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
index 65be9a23..80956135 100644
--- a/[core]/es_extended/fxmanifest.lua
+++ b/[core]/es_extended/fxmanifest.lua
@@ -21,12 +21,13 @@ server_scripts {
 	'@oxmysql/lib/MySQL.lua',
     'shared/config/logs.lua',
 
+	'server/core.lua',
+	'server/functions.lua',
 	'server/common.lua',
 	'server/modules/callback.lua',
 	'server/classes/player.lua',
 	'server/classes/vehicle.lua',
 	'server/classes/overrides/*.lua',
-	'server/functions.lua',
 	'server/modules/onesync.lua',
 	'server/modules/paycheck.lua',
 
diff --git a/[core]/es_extended/server/common.lua b/[core]/es_extended/server/common.lua
index 70e68db1..a1aa9fe7 100644
--- a/[core]/es_extended/server/common.lua
+++ b/[core]/es_extended/server/common.lua
@@ -1,20 +1,6 @@
 ESX.Players = {}
 ESX.Jobs = {}
 ESX.Items = {}
-Core = {}
-Core.JobsPlayerCount = {}
-Core.UsableItemsCallbacks = {}
-Core.RegisteredCommands = {}
-Core.Pickups = {}
-Core.PickupId = 0
-Core.PlayerFunctionOverrides = {}
-Core.DatabaseConnected = false
-Core.playersByIdentifier = {}
-Core.JobsLoaded = false
-
----@type table<string, CVehicleData>
-Core.vehicles = {}
-Core.vehicleTypesByModel = {}
 
 RegisterNetEvent("esx:onPlayerSpawn", function()
     ESX.Players[source].spawned = true
diff --git a/[core]/es_extended/server/core.lua b/[core]/es_extended/server/core.lua
new file mode 100644
index 00000000..b897983e
--- /dev/null
+++ b/[core]/es_extended/server/core.lua
@@ -0,0 +1,14 @@
+Core = {}
+Core.JobsPlayerCount = {}
+Core.UsableItemsCallbacks = {}
+Core.RegisteredCommands = {}
+Core.Pickups = {}
+Core.PickupId = 0
+Core.PlayerFunctionOverrides = {}
+Core.DatabaseConnected = false
+Core.playersByIdentifier = {}
+Core.JobsLoaded = false
+
+---@type table<string, CVehicleData>
+Core.vehicles = {}
+Core.vehicleTypesByModel = {}
\ No newline at end of file