diff --git a/[core]/es_extended/client/compat.lua b/[core]/es_extended/client/compat.lua
index 254148ac..96a57a55 100644
--- a/[core]/es_extended/client/compat.lua
+++ b/[core]/es_extended/client/compat.lua
@@ -1 +1,5 @@
---All client-side functions outsourced from the Core to the lib will be stored here for compatability, e.g:
\ No newline at end of file
+--All client-side functions outsourced from the Core to the lib will be stored here for compatability, e.g:
+
+ESX.Game.GetClosestEntity = xLib.entity.closest
+EnumerateEntitiesWithinDistance = xLib.entity.EnumerateWithinDistance
+ESX.Game.Teleport = xLib.entity.Teleport
\ No newline at end of file
diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
index 953296d2..419adc4e 100644
--- a/[core]/es_extended/client/functions.lua
+++ b/[core]/es_extended/client/functions.lua
@@ -473,26 +473,6 @@ function ESX.Game.GetPedMugshot(ped, transparent)
     return mugshot, GetPedheadshotTxdString(mugshot)
 end
 
----@param entity integer The entity to get the coords of
----@param coords table | vector3 | vector4 The coords to teleport the entity to
----@param cb? function The callback function
-function ESX.Game.Teleport(entity, coords, cb)
-
-    if DoesEntityExist(entity) then
-        RequestCollisionAtCoord(coords.x, coords.y, coords.z)
-        while not HasCollisionLoadedAroundEntity(entity) do
-            Wait(0)
-        end
-
-        SetEntityCoords(entity, coords.x, coords.y, coords.z, false, false, false, false)
-        SetEntityHeading(entity, coords.w or coords.heading or 0.0)
-    end
-
-    if cb then
-        cb()
-    end
-end
-
 ---@param object integer | string The object to spawn
 ---@param coords table | vector3 The coords to spawn the object at
 ---@param cb? function The callback function
@@ -689,32 +669,6 @@ function ESX.Game.GetClosestVehicle(coords, modelFilter)
     return ESX.Game.GetClosestEntity(ESX.Game.GetVehicles(), false, coords, modelFilter)
 end
 
----@param entities table The entities to search through
----@param isPlayerEntities boolean Whether the entities are players
----@param coords table | vector3 The coords to search from
----@param maxDistance number The max distance to search within
----@return table
-local function EnumerateEntitiesWithinDistance(entities, isPlayerEntities, coords, maxDistance)
-    local nearbyEntities = {}
-
-    if coords then
-        coords = vector3(coords.x, coords.y, coords.z)
-    else
-        local playerPed = ESX.PlayerData.ped
-        coords = GetEntityCoords(playerPed)
-    end
-
-    for k, entity in pairs(entities) do
-        local distance = #(coords - GetEntityCoords(entity))
-
-        if distance <= maxDistance then
-            nearbyEntities[#nearbyEntities + 1] = isPlayerEntities and k or entity
-        end
-    end
-
-    return nearbyEntities
-end
-
 ---@param coords table | vector3 The coords to search from
 ---@param maxDistance number The max distance to search within
 ---@return table
@@ -757,42 +711,6 @@ function ESX.Game.RaycastScreen(depth, ...)
 	return target, ESX.Game.GetShapeTestResultSync(StartShapeTestLosProbe(origin.x, origin.y, origin.z, target.x, target.y, target.z, ...))
 end
 
----@param entities table The entities to search through
----@param isPlayerEntities boolean Whether the entities are players
----@param coords? table | vector3 The coords to search from
----@param modelFilter? table The model filter
----@return integer, integer
-function ESX.Game.GetClosestEntity(entities, isPlayerEntities, coords, modelFilter)
-    local closestEntity, closestEntityDistance, filteredEntities = -1, -1, nil
-
-    if coords then
-        coords = vector3(coords.x, coords.y, coords.z)
-    else
-        local playerPed = ESX.PlayerData.ped
-        coords = GetEntityCoords(playerPed)
-    end
-
-    if modelFilter then
-        filteredEntities = {}
-
-        for currentEntityIndex = 1, #entities do
-            if modelFilter[GetEntityModel(entities[currentEntityIndex])] then
-                filteredEntities[#filteredEntities + 1] = entities[currentEntityIndex]
-            end
-        end
-    end
-
-    for k, entity in pairs(filteredEntities or entities) do
-        local distance = #(coords - GetEntityCoords(entity))
-
-        if closestEntityDistance == -1 or distance < closestEntityDistance then
-            closestEntity, closestEntityDistance = isPlayerEntities and k or entity, distance
-        end
-    end
-
-    return closestEntity, closestEntityDistance
-end
-
 ---@return integer | nil, vector3 | nil
 function ESX.Game.GetVehicleInDirection()
     local _, hit, coords, _, _, entity = ESX.Game.RaycastScreen(5, 10, ESX.PlayerData.ped)
diff --git a/[core]/esx_lib/imports/entity/client.lua b/[core]/esx_lib/imports/entity/client.lua
new file mode 100644
index 00000000..6b861e3b
--- /dev/null
+++ b/[core]/esx_lib/imports/entity/client.lua
@@ -0,0 +1,85 @@
+xLib.entity = {}
+
+---@param entities table The entities to search through
+---@param isPlayerEntities boolean Whether the entities are players
+---@param coords? table | vector3 The coords to search from
+---@param modelFilter? table The model filter
+---@return integer, integer
+function xLib.entity.closest(entities, isPlayerEntities, coords, modelFilter)
+    local closestEntity, closestEntityDistance, filteredEntities = -1, -1, nil
+
+    if coords then
+        coords = vector3(coords.x, coords.y, coords.z)
+    else
+        local playerPed = PlayerPedId()
+        coords = GetEntityCoords(playerPed)
+    end
+
+    if modelFilter then
+        filteredEntities = {}
+
+        for currentEntityIndex = 1, #entities do
+            if modelFilter[GetEntityModel(entities[currentEntityIndex])] then
+                filteredEntities[#filteredEntities + 1] = entities[currentEntityIndex]
+            end
+        end
+    end
+
+    for k, entity in pairs(filteredEntities or entities) do
+        local distance = #(coords - GetEntityCoords(entity))
+
+        if closestEntityDistance == -1 or distance < closestEntityDistance then
+            closestEntity, closestEntityDistance = isPlayerEntities and k or entity, distance
+        end
+    end
+
+    return closestEntity, closestEntityDistance
+end
+
+---@param entities table The entities to search through
+---@param isPlayerEntities boolean Whether the entities are players
+---@param coords? table | vector3 The coords to search from
+---@param maxDistance number The maximum distance
+---@return table
+function xLib.entity.EnumerateWithinDistance(entities, isPlayerEntities, coords, maxDistance)
+    local nearbyEntities = {}
+
+    if coords then
+        coords = vector3(coords.x, coords.y, coords.z)
+    else
+        local playerPed = PlayerPedId()
+        coords = GetEntityCoords(playerPed)
+    end
+
+    for k, entity in pairs(entities) do
+        local distance = #(coords - GetEntityCoords(entity))
+
+        if distance <= maxDistance then
+            nearbyEntities[#nearbyEntities + 1] = isPlayerEntities and k or entity
+        end
+    end
+
+    return nearbyEntities
+end
+
+---@param entity integer The entity to get the coords of
+---@param coords table | vector3 | vector4 The coords to teleport the entity to
+---@param cb? function The callback function
+function xLib.entity.Teleport(entity, coords, cb)
+
+    if DoesEntityExist(entity) then
+        RequestCollisionAtCoord(coords.x, coords.y, coords.z)
+        while not HasCollisionLoadedAroundEntity(entity) do
+            Wait(0)
+        end
+
+        SetEntityCoords(entity, coords.x, coords.y, coords.z, false, false, false, false)
+        SetEntityHeading(entity, coords.w or coords.heading or 0.0)
+    end
+
+    if cb then
+        cb()
+    end
+end
+
+return xLib.entity
\ No newline at end of file