diff --git a/src/client/ClientHandlers.cpp b/src/client/ClientHandlers.cpp
index 9e3b575..eb55a52 100644
--- a/src/client/ClientHandlers.cpp
+++ b/src/client/ClientHandlers.cpp
@@ -1,7 +1,7 @@
 #include "client/ClientHandlers.hpp"
-#include "client/ObjMgr.hpp"
 #include "console/Console.hpp"
 #include "db/Db.hpp"
+#include "object/Client.hpp"
 #include "world/World.hpp"
 #include <common/DataStore.hpp>
 #include <tempest/Vector.hpp>
diff --git a/src/client/ObjMgr.hpp b/src/client/ObjMgr.hpp
deleted file mode 100644
index e9e7b7c..0000000
--- a/src/client/ObjMgr.hpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef CLIENT_OBJ_MGR_HPP
-#define CLIENT_OBJ_MGR_HPP
-
-#include <cstdint>
-
-uint32_t ClntObjMgrGetMapID();
-
-#endif
diff --git a/src/object/Client.hpp b/src/object/Client.hpp
new file mode 100644
index 0000000..24a5c2b
--- /dev/null
+++ b/src/object/Client.hpp
@@ -0,0 +1,7 @@
+#ifndef OBJECT_CLIENT_HPP
+#define OBJECT_CLIENT_HPP
+
+#include "client/ObjMgr.hpp"
+#include "object/Types.hpp"
+
+#endif
diff --git a/src/client/ObjMgr.cpp b/src/object/client/ObjMgr.cpp
similarity index 63%
rename from src/client/ObjMgr.cpp
rename to src/object/client/ObjMgr.cpp
index a89388f..b577251 100644
--- a/src/client/ObjMgr.cpp
+++ b/src/object/client/ObjMgr.cpp
@@ -1,4 +1,4 @@
-#include "client/ObjMgr.hpp"
+#include "object/client/ObjMgr.hpp"
 
 uint32_t ClntObjMgrGetMapID() {
     // TODO
diff --git a/src/object/client/ObjMgr.hpp b/src/object/client/ObjMgr.hpp
new file mode 100644
index 0000000..6970460
--- /dev/null
+++ b/src/object/client/ObjMgr.hpp
@@ -0,0 +1,8 @@
+#ifndef OBJECT_CLIENT_CLIENT_OBJ_MGR_HPP
+#define OBJECT_CLIENT_CLIENT_OBJ_MGR_HPP
+
+#include <cstdint>
+
+uint32_t ClntObjMgrGetMapID();
+
+#endif