diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d6f8e6e..5ac1f60 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_subdirectory(app)
 add_subdirectory(async)
 add_subdirectory(client)
+add_subdirectory(console)
 add_subdirectory(db)
 add_subdirectory(event)
 add_subdirectory(glue)
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 432dec5..4f47b79 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -36,6 +36,7 @@ target_include_directories(client
 target_link_libraries(client
     PRIVATE
         async
+        console
         db
         event
         gx
diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index cf3601c..c04354e 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -11,7 +11,7 @@
 #include "net/Poll.hpp"
 #include "ui/FrameScript.hpp"
 #include "ui/FrameXML.hpp"
-#include "util/CVar.hpp"
+#include "console/CVar.hpp"
 #include "world/World.hpp"
 #include <cstring>
 #include <bc/Debug.hpp>
diff --git a/src/client/ClientServices.cpp b/src/client/ClientServices.cpp
index dddaede..f17b834 100644
--- a/src/client/ClientServices.cpp
+++ b/src/client/ClientServices.cpp
@@ -3,7 +3,7 @@
 #include "glue/CGlueMgr.hpp"
 #include "net/Connection.hpp"
 #include "net/Login.hpp"
-#include "util/CVar.hpp"
+#include "console/CVar.hpp"
 #include <storm/Memory.hpp>
 #include <storm/String.hpp>
 #include <new>
diff --git a/src/client/Console.cpp b/src/client/Console.cpp
index b9cd28d..93edabb 100644
--- a/src/client/Console.cpp
+++ b/src/client/Console.cpp
@@ -2,7 +2,7 @@
 #include "client/Gui.hpp"
 #include "event/Input.hpp"
 #include "gx/Device.hpp"
-#include "util/CVar.hpp"
+#include "console/CVar.hpp"
 #include <cstring>
 
 CVar* s_cvGxMaximize;
diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt
new file mode 100644
index 0000000..5d6d09d
--- /dev/null
+++ b/src/console/CMakeLists.txt
@@ -0,0 +1,18 @@
+file(GLOB PRIVATE_SOURCES
+    "*.cpp"
+)
+
+add_library(console STATIC
+    ${PRIVATE_SOURCES}
+)
+
+target_include_directories(console
+    PRIVATE
+        ${CMAKE_SOURCE_DIR}/src
+)
+
+target_link_libraries(console
+    PUBLIC
+        common
+        storm
+)
diff --git a/src/util/CVar.cpp b/src/console/CVar.cpp
similarity index 99%
rename from src/util/CVar.cpp
rename to src/console/CVar.cpp
index f9fd7b0..424e5a2 100644
--- a/src/util/CVar.cpp
+++ b/src/console/CVar.cpp
@@ -1,4 +1,4 @@
-#include "util/CVar.hpp"
+#include "console/CVar.hpp"
 #include <storm/String.hpp>
 
 bool CVar::m_needsSave;
diff --git a/src/util/CVar.hpp b/src/console/CVar.hpp
similarity index 95%
rename from src/util/CVar.hpp
rename to src/console/CVar.hpp
index 1871db6..f37b1e7 100644
--- a/src/util/CVar.hpp
+++ b/src/console/CVar.hpp
@@ -1,5 +1,5 @@
-#ifndef UTIL_C_VAR_HPP
-#define UTIL_C_VAR_HPP
+#ifndef CONSOLE_C_VAR_HPP
+#define CONSOLE_C_VAR_HPP
 
 #include <cstdint>
 #include <common/String.hpp>
diff --git a/src/glue/CGlueMgr.cpp b/src/glue/CGlueMgr.cpp
index bc66747..2a8a9b5 100644
--- a/src/glue/CGlueMgr.cpp
+++ b/src/glue/CGlueMgr.cpp
@@ -14,7 +14,7 @@
 #include "ui/FrameXML.hpp"
 #include "ui/Interface.hpp"
 #include "ui/ScriptFunctions.hpp"
-#include "util/CVar.hpp"
+#include "console/CVar.hpp"
 #include "util/Filesystem.hpp"
 #include "util/Log.hpp"
 #include <cstdio>
diff --git a/src/glue/CMakeLists.txt b/src/glue/CMakeLists.txt
index faabf6a..5e3a357 100644
--- a/src/glue/CMakeLists.txt
+++ b/src/glue/CMakeLists.txt
@@ -12,6 +12,7 @@ target_include_directories(glue
 target_link_libraries(glue
     PRIVATE
         client
+        console
         db
         event
         gx
diff --git a/src/model/Model2.cpp b/src/model/Model2.cpp
index c29be2c..31f012f 100644
--- a/src/model/Model2.cpp
+++ b/src/model/Model2.cpp
@@ -1,7 +1,7 @@
 #include "model/Model2.hpp"
 #include "model/CM2Cache.hpp"
 #include "model/M2Internal.hpp"
-#include "util/CVar.hpp"
+#include "console/CVar.hpp"
 #include "util/Filesystem.hpp"
 #include <cstring>
 #include <new>
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index a4cadf6..8bf424e 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -12,6 +12,7 @@ target_include_directories(ui
 target_link_libraries(ui
     PRIVATE
         client
+        console
         db
         event
         glue
diff --git a/src/ui/ScriptFunctionsGlueScriptEvents.cpp b/src/ui/ScriptFunctionsGlueScriptEvents.cpp
index 4b1e19b..e95a6f4 100644
--- a/src/ui/ScriptFunctionsGlueScriptEvents.cpp
+++ b/src/ui/ScriptFunctionsGlueScriptEvents.cpp
@@ -7,7 +7,7 @@
 #include "net/connection/ClientConnection.hpp"
 #include "ui/CSimpleTop.hpp"
 #include "ui/Types.hpp"
-#include "util/CVar.hpp"
+#include "console/CVar.hpp"
 #include "util/Lua.hpp"
 #include "util/SFile.hpp"
 #include "util/Unimplemented.hpp"
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index bd8714e..baf7d0f 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -1,4 +1,6 @@
-file(GLOB PRIVATE_SOURCES "*.cpp")
+file(GLOB PRIVATE_SOURCES
+    "*.cpp"
+)
 
 if(WHOA_SYSTEM_MAC)
     file(GLOB MAC_SOURCES "*.mm")