diff --git a/r5dev/client/cdll_engine_int.cpp b/r5dev/client/cdll_engine_int.cpp
index efab29b8..4e9275fa 100644
--- a/r5dev/client/cdll_engine_int.cpp
+++ b/r5dev/client/cdll_engine_int.cpp
@@ -12,7 +12,7 @@
 #include "client/cdll_engine_int.h"
 #include "engine/net_chan.h"
 #include "engine/client/cl_rcon.h"
-#include "public/include/bansystem.h"
+#include "public/bansystem.h"
 #include "vpc/keyvalues.h"
 /*****************************************************************************/
 
diff --git a/r5dev/client/cdll_engine_int.h b/r5dev/client/cdll_engine_int.h
index 8225f3ac..b75ab808 100644
--- a/r5dev/client/cdll_engine_int.h
+++ b/r5dev/client/cdll_engine_int.h
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef DEDICATED // We should think about not including this file at all in dedicated tbh.
-#include "public/include/client_class.h"
-#include "public/include/icliententitylist.h"
+#include "public/client_class.h"
+#include "public/icliententitylist.h"
 #endif // !DEDICATED
 
 enum class ClientFrameStage_t : int
diff --git a/r5dev/common/netmessages.h b/r5dev/common/netmessages.h
index dd32de1e..6306d273 100644
--- a/r5dev/common/netmessages.h
+++ b/r5dev/common/netmessages.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "tier1/bitbuf.h"
-#include "public/include/inetmsghandler.h"
+#include "public/inetmsghandler.h"
 
 enum class UserMessages : int
 {
diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp
index d087c270..bed0d4df 100644
--- a/r5dev/core/init.cpp
+++ b/r5dev/core/init.cpp
@@ -102,9 +102,9 @@
 #ifndef DEDICATED
 #include "game/client/view.h"
 #endif // !DEDICATED
-#include "public/include/edict.h"
+#include "public/edict.h"
 #ifndef DEDICATED
-#include "public/include/idebugoverlay.h"
+#include "public/idebugoverlay.h"
 #include "inputsystem/inputsystem.h"
 #include "windows/id3dx.h"
 #endif // !DEDICATED
diff --git a/r5dev/core/stdafx.h b/r5dev/core/stdafx.h
index 66b2ac5d..5467333f 100644
--- a/r5dev/core/stdafx.h
+++ b/r5dev/core/stdafx.h
@@ -82,11 +82,11 @@
 #include "common/x86defs.h"
 #include "common/sdkdefs.h"
 
-#include "public/include/utility.h"
-#include "public/include/memaddr.h"
-#include "public/include/module.h"
-#include "public/include/httplib.h"
-#include "public/include/vdf_parser.h"
+#include "public/utility/utility.h"
+#include "public/utility/memaddr.h"
+#include "public/utility/module.h"
+#include "public/utility/httplib.h"
+#include "public/utility/vdf_parser.h"
 
 #include "core/assert.h"
 #include "core/termutil.h"
diff --git a/r5dev/datacache/mdlcache.cpp b/r5dev/datacache/mdlcache.cpp
index cc0ff804..d772b21f 100644
--- a/r5dev/datacache/mdlcache.cpp
+++ b/r5dev/datacache/mdlcache.cpp
@@ -12,7 +12,7 @@
 #include "datacache/imdlcache.h"
 #include "datacache/idatacache.h"
 #include "rtech/rtech_utils.h"
-#include "public/include/studio.h"
+#include "public/studio.h"
 #include "tier1/utldict.h"
 
 
diff --git a/r5dev/datacache/mdlcache.h b/r5dev/datacache/mdlcache.h
index b1dc8a61..991cbecf 100644
--- a/r5dev/datacache/mdlcache.h
+++ b/r5dev/datacache/mdlcache.h
@@ -1,10 +1,10 @@
 #ifndef MDLCACHE_H
 #define MDLCACHE_H
-#include "public/include/studio.h"
-#include "datacache/idatacache.h"
-#include "datacache/imdlcache.h"
 #include "tier0/threadtools.h"
 #include "tier1/utldict.h"
+#include "datacache/idatacache.h"
+#include "datacache/imdlcache.h"
+#include "public/studio.h"
 
 struct RStaticProp_t
 {
diff --git a/r5dev/ebisusdk/EbisuSDK.h b/r5dev/ebisusdk/EbisuSDK.h
index 8f9ae15b..8d5136fa 100644
--- a/r5dev/ebisusdk/EbisuSDK.h
+++ b/r5dev/ebisusdk/EbisuSDK.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "vstdlib/completion.h"
-#include "public/include/utility.h"
+#include "public/utility/utility.h"
 
 //#ifdef DEDICATED
 inline CMemory p_EbisuSDK_Init_Tier0;
diff --git a/r5dev/engine/client/clientstate.h b/r5dev/engine/client/clientstate.h
index 76d0f63d..7907bce9 100644
--- a/r5dev/engine/client/clientstate.h
+++ b/r5dev/engine/client/clientstate.h
@@ -2,7 +2,7 @@
 #include "tier1/NetAdr2.h"
 #include "tier1/mempool.h"
 #include "common/protocol.h"
-#include "public/include/inetmsghandler.h"
+#include "public/inetmsghandler.h"
 #include "engine/datablock.h"
 #include "engine/net_chan.h"
 #include "engine/debugoverlay.h"
diff --git a/r5dev/engine/gl_model_private.h b/r5dev/engine/gl_model_private.h
index 30402e96..5ec5ef78 100644
--- a/r5dev/engine/gl_model_private.h
+++ b/r5dev/engine/gl_model_private.h
@@ -10,7 +10,7 @@
 #include "mathlib/vector.h"
 #include "common/qlimits.h"
 #include "datacache/imdlcache.h"
-#include "public/include/model_types.h"
+#include "public/model_types.h"
 
 #ifndef DEDICATED
 #include "game/client/enginesprite.h"
diff --git a/r5dev/engine/gl_rsurf.h b/r5dev/engine/gl_rsurf.h
index 25f1d572..98d51ba9 100644
--- a/r5dev/engine/gl_rsurf.h
+++ b/r5dev/engine/gl_rsurf.h
@@ -1,6 +1,6 @@
 #ifndef GL_RSURF_H
 #define GL_RSURF_H
-#include "public/include/ivrenderview.h"
+#include "public/ivrenderview.h"
 
 inline CMemory P_DrawWorldMeshes;
 inline auto V_DrawWorldMeshes = P_DrawWorldMeshes.RCast<void* (*)(void* baseEntity, void* renderContext, DrawWorldLists_t worldLists)>();
diff --git a/r5dev/engine/host_state.cpp b/r5dev/engine/host_state.cpp
index c215055d..a4d7d315 100644
--- a/r5dev/engine/host_state.cpp
+++ b/r5dev/engine/host_state.cpp
@@ -41,8 +41,8 @@
 #endif // DEDICATED
 #include "client/vengineclient_impl.h"
 #include "networksystem/pylon.h"
-#include "public/include/bansystem.h"
-#include "public/include/edict.h"
+#include "public/bansystem.h"
+#include "public/edict.h"
 #ifndef CLIENT_DLL
 #include "game/server/gameinterface.h"
 #endif // !CLIENT_DLL
diff --git a/r5dev/engine/net_chan.h b/r5dev/engine/net_chan.h
index 7ebf1fdc..fbf6676a 100644
--- a/r5dev/engine/net_chan.h
+++ b/r5dev/engine/net_chan.h
@@ -13,7 +13,7 @@
 #include "tier1/utlvector.h"
 #include "common/netmessages.h"
 #include "common/protocol.h"
-#include "public/include/inetchannel.h"
+#include "public/inetchannel.h"
 
 #define NET_FRAMES_BACKUP 128
 #define NET_CHANNELNAME_MAXLEN 32
diff --git a/r5dev/engine/server/server.cpp b/r5dev/engine/server/server.cpp
index 08b4195b..29b04c0b 100644
--- a/r5dev/engine/server/server.cpp
+++ b/r5dev/engine/server/server.cpp
@@ -14,8 +14,8 @@
 #include "engine/server/sv_main.h"
 #include "engine/server/server.h"
 #include "networksystem/pylon.h"
-#include "public/include/edict.h"
-#include "public/include/bansystem.h"
+#include "public/edict.h"
+#include "public/bansystem.h"
 
 //---------------------------------------------------------------------------------
 // Purpose: Gets the number of human players on the server
diff --git a/r5dev/engine/server/server.h b/r5dev/engine/server/server.h
index 7db83547..fa86438d 100644
--- a/r5dev/engine/server/server.h
+++ b/r5dev/engine/server/server.h
@@ -3,7 +3,7 @@
 #include "networksystem/pylon.h"
 #include "engine/client/client.h"
 #include "engine/networkstringtable.h"
-#include "public/include/iserver.h"
+#include "public/iserver.h"
 #ifndef CLIENT_DLL
 #include "server/vengineserver_impl.h"
 #endif // !CLIENT_DLL
diff --git a/r5dev/engine/server/sv_main.cpp b/r5dev/engine/server/sv_main.cpp
index df67e54c..e9fa29b6 100644
--- a/r5dev/engine/server/sv_main.cpp
+++ b/r5dev/engine/server/sv_main.cpp
@@ -1,7 +1,7 @@
 #include "core/stdafx.h"
 #include "engine/server/sv_main.h"
 #include "networksystem/pylon.h"
-#include "public/include/bansystem.h"
+#include "public/bansystem.h"
 
 //-----------------------------------------------------------------------------
 // Purpose: checks if particular client is banned on the comp server
diff --git a/r5dev/engine/server/sv_main.h b/r5dev/engine/server/sv_main.h
index f8aee542..e98c89ac 100644
--- a/r5dev/engine/server/sv_main.h
+++ b/r5dev/engine/server/sv_main.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "networksystem/pylon.h"
-#include "public/include/bansystem.h"
+#include "public/bansystem.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/r5dev/game/client/c_baseplayer.h b/r5dev/game/client/c_baseplayer.h
index 6b6fafe8..b443af78 100644
--- a/r5dev/game/client/c_baseplayer.h
+++ b/r5dev/game/client/c_baseplayer.h
@@ -1,14 +1,14 @@
 #ifndef C_BASEPLAYER_H
 #define C_BASEPLAYER_H
 
-#include "public/include/icliententity.h"
-#include "public/include/icliententitylist.h"
-#include "public/include/iclientnetworkable.h"
-#include "public/include/iclientrenderable.h"
-#include "public/include/iclientthinkable.h"
-#include "public/include/iclientunknown.h"
-#include "public/include/ihandleentity.h"
-#include "public/include/ivscript.h"
+#include "public/icliententity.h"
+#include "public/icliententitylist.h"
+#include "public/iclientnetworkable.h"
+#include "public/iclientrenderable.h"
+#include "public/iclientthinkable.h"
+#include "public/iclientunknown.h"
+#include "public/ihandleentity.h"
+#include "public/ivscript.h"
 
 
 class C_BaseCombatCharacter
diff --git a/r5dev/game/client/enginesprite.h b/r5dev/game/client/enginesprite.h
index 2909e5f8..5fadd3dc 100644
--- a/r5dev/game/client/enginesprite.h
+++ b/r5dev/game/client/enginesprite.h
@@ -8,7 +8,7 @@
 #define ENGINESPRITE_H
 #include "public/avi/iavi.h"
 #include "public/avi/ibik.h"
-#include "public/include/const.h"
+#include "public/const.h"
 #include "game/client/hud.h"
 
 typedef void* IMaterial; // HACK
diff --git a/r5dev/game/server/ai_networkmanager.cpp b/r5dev/game/server/ai_networkmanager.cpp
index 55e6fe11..6a1d8d00 100644
--- a/r5dev/game/server/ai_networkmanager.cpp
+++ b/r5dev/game/server/ai_networkmanager.cpp
@@ -9,9 +9,9 @@
 #include "tier1/cvar.h"
 #include "tier1/cmd.h"
 #include "mathlib/crc32.h"
-#include "public/include/binstream.h"
-#include "public/include/edict.h"
-#include "public/include/utility.h"
+#include "public/edict.h"
+#include "public/utility/binstream.h"
+#include "public/utility/utility.h"
 #include "engine/host_state.h"
 #include "game/server/ai_node.h"
 #include "game/server/ai_network.h"
diff --git a/r5dev/game/shared/animation.cpp b/r5dev/game/shared/animation.cpp
index 6dcca68e..7439f196 100644
--- a/r5dev/game/shared/animation.cpp
+++ b/r5dev/game/shared/animation.cpp
@@ -5,7 +5,7 @@
 // $NoKeywords: $
 //=============================================================================//
 #include "core/stdafx.h"
-#include "public/include/studio.h"
+#include "public/studio.h"
 #include "game/shared/animation.h"
 
 //-----------------------------------------------------------------------------
diff --git a/r5dev/gameui/IBrowser.cpp b/r5dev/gameui/IBrowser.cpp
index 923156f7..4542510a 100644
--- a/r5dev/gameui/IBrowser.cpp
+++ b/r5dev/gameui/IBrowser.cpp
@@ -35,7 +35,7 @@ History:
 #include "vstdlib/callback.h"
 #include "vpklib/packedstore.h"
 #include "gameui/IBrowser.h"
-#include "public/include/edict.h"
+#include "public/edict.h"
 
 //-----------------------------------------------------------------------------
 // Purpose: 
diff --git a/r5dev/netconsole/netconsole.cpp b/r5dev/netconsole/netconsole.cpp
index 39a058ee..225244b6 100644
--- a/r5dev/netconsole/netconsole.cpp
+++ b/r5dev/netconsole/netconsole.cpp
@@ -10,7 +10,7 @@
 #include "tier2/socketcreator.h"
 #include "protoc/sv_rcon.pb.h"
 #include "protoc/cl_rcon.pb.h"
-#include "public/include/utility.h"
+#include "public/utility/utility.h"
 #include "engine/net.h"
 #include "netconsole/netconsole.h"
 
diff --git a/r5dev/networksystem/pylon.cpp b/r5dev/networksystem/pylon.cpp
index aaf91ab5..246af5c1 100644
--- a/r5dev/networksystem/pylon.cpp
+++ b/r5dev/networksystem/pylon.cpp
@@ -15,7 +15,7 @@
 #endif
 #include <squirrel/sqinit.h>
 #include <networksystem/pylon.h>
-#include <public/include/edict.h>
+#include <public/edict.h>
 
 //-----------------------------------------------------------------------------
 // Purpose: Send keep alive request to Pylon Master Server.
diff --git a/r5dev/public/bansystem.cpp b/r5dev/public/bansystem.cpp
index c7c64034..81c229f4 100644
--- a/r5dev/public/bansystem.cpp
+++ b/r5dev/public/bansystem.cpp
@@ -8,7 +8,7 @@
 #include "core/stdafx.h"
 #include "engine/net.h"
 #include "engine/client/client.h"
-#include "public/include/bansystem.h"
+#include "public/bansystem.h"
 
 //-----------------------------------------------------------------------------
 // Purpose: 
diff --git a/r5dev/public/include/bansystem.h b/r5dev/public/bansystem.h
similarity index 100%
rename from r5dev/public/include/bansystem.h
rename to r5dev/public/bansystem.h
diff --git a/r5dev/public/include/stb_image.h b/r5dev/public/bitmap/stb_image.h
similarity index 100%
rename from r5dev/public/include/stb_image.h
rename to r5dev/public/bitmap/stb_image.h
diff --git a/r5dev/public/include/client_class.h b/r5dev/public/client_class.h
similarity index 93%
rename from r5dev/public/include/client_class.h
rename to r5dev/public/client_class.h
index 48a7dfed..12b4a7ce 100644
--- a/r5dev/public/include/client_class.h
+++ b/r5dev/public/client_class.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "public/include/iclientnetworkable.h"
+#include "public/iclientnetworkable.h"
 
 typedef IClientNetworkable* (*CreateClientClassFn)(int entNum, int serialNum);
 typedef IClientNetworkable* (*CreateEventFn)();
diff --git a/r5dev/public/include/const.h b/r5dev/public/const.h
similarity index 100%
rename from r5dev/public/include/const.h
rename to r5dev/public/const.h
diff --git a/r5dev/public/include/edict.h b/r5dev/public/edict.h
similarity index 98%
rename from r5dev/public/include/edict.h
rename to r5dev/public/edict.h
index a3e2c203..eb28ab51 100644
--- a/r5dev/public/include/edict.h
+++ b/r5dev/public/edict.h
@@ -2,7 +2,7 @@
 #ifndef DEDICATED
 #include "launcher/IApplication.h"
 #endif // !DEDICATED
-#include "public/include/globalvars_base.h"
+#include "public/globalvars_base.h"
 #ifndef CLIENT_DLL
 #include "engine/server/sv_main.h"
 #endif // !CLIENT_DLL
diff --git a/r5dev/public/include/globalvars_base.h b/r5dev/public/globalvars_base.h
similarity index 100%
rename from r5dev/public/include/globalvars_base.h
rename to r5dev/public/globalvars_base.h
diff --git a/r5dev/public/include/icliententity.h b/r5dev/public/icliententity.h
similarity index 100%
rename from r5dev/public/include/icliententity.h
rename to r5dev/public/icliententity.h
diff --git a/r5dev/public/include/icliententitylist.h b/r5dev/public/icliententitylist.h
similarity index 100%
rename from r5dev/public/include/icliententitylist.h
rename to r5dev/public/icliententitylist.h
diff --git a/r5dev/public/include/iclientnetworkable.h b/r5dev/public/iclientnetworkable.h
similarity index 100%
rename from r5dev/public/include/iclientnetworkable.h
rename to r5dev/public/iclientnetworkable.h
diff --git a/r5dev/public/include/iclientrenderable.h b/r5dev/public/iclientrenderable.h
similarity index 100%
rename from r5dev/public/include/iclientrenderable.h
rename to r5dev/public/iclientrenderable.h
diff --git a/r5dev/public/include/iclientthinkable.h b/r5dev/public/iclientthinkable.h
similarity index 100%
rename from r5dev/public/include/iclientthinkable.h
rename to r5dev/public/iclientthinkable.h
diff --git a/r5dev/public/include/iclientunknown.h b/r5dev/public/iclientunknown.h
similarity index 100%
rename from r5dev/public/include/iclientunknown.h
rename to r5dev/public/iclientunknown.h
diff --git a/r5dev/public/include/icommandline.h b/r5dev/public/icommandline.h
similarity index 100%
rename from r5dev/public/include/icommandline.h
rename to r5dev/public/icommandline.h
diff --git a/r5dev/public/include/iconcommand.h b/r5dev/public/iconcommand.h
similarity index 100%
rename from r5dev/public/include/iconcommand.h
rename to r5dev/public/iconcommand.h
diff --git a/r5dev/public/include/iconvar.h b/r5dev/public/iconvar.h
similarity index 100%
rename from r5dev/public/include/iconvar.h
rename to r5dev/public/iconvar.h
diff --git a/r5dev/public/include/icvar.h b/r5dev/public/icvar.h
similarity index 100%
rename from r5dev/public/include/icvar.h
rename to r5dev/public/icvar.h
diff --git a/r5dev/public/include/idebugoverlay.h b/r5dev/public/idebugoverlay.h
similarity index 100%
rename from r5dev/public/include/idebugoverlay.h
rename to r5dev/public/idebugoverlay.h
diff --git a/r5dev/public/include/ihandleentity.h b/r5dev/public/ihandleentity.h
similarity index 100%
rename from r5dev/public/include/ihandleentity.h
rename to r5dev/public/ihandleentity.h
diff --git a/r5dev/public/include/inetchannel.h b/r5dev/public/inetchannel.h
similarity index 100%
rename from r5dev/public/include/inetchannel.h
rename to r5dev/public/inetchannel.h
diff --git a/r5dev/public/include/inetmsghandler.h b/r5dev/public/inetmsghandler.h
similarity index 100%
rename from r5dev/public/include/inetmsghandler.h
rename to r5dev/public/inetmsghandler.h
diff --git a/r5dev/public/include/iserver.h b/r5dev/public/iserver.h
similarity index 100%
rename from r5dev/public/include/iserver.h
rename to r5dev/public/iserver.h
diff --git a/r5dev/public/include/ivrenderview.h b/r5dev/public/ivrenderview.h
similarity index 100%
rename from r5dev/public/include/ivrenderview.h
rename to r5dev/public/ivrenderview.h
diff --git a/r5dev/public/include/ivscript.h b/r5dev/public/ivscript.h
similarity index 100%
rename from r5dev/public/include/ivscript.h
rename to r5dev/public/ivscript.h
diff --git a/r5dev/public/include/model_types.h b/r5dev/public/model_types.h
similarity index 100%
rename from r5dev/public/include/model_types.h
rename to r5dev/public/model_types.h
diff --git a/r5dev/public/include/studio.h b/r5dev/public/studio.h
similarity index 100%
rename from r5dev/public/include/studio.h
rename to r5dev/public/studio.h
diff --git a/r5dev/public/binstream.cpp b/r5dev/public/utility/binstream.cpp
similarity index 99%
rename from r5dev/public/binstream.cpp
rename to r5dev/public/utility/binstream.cpp
index 2b4c6138..a31b1d2c 100644
--- a/r5dev/public/binstream.cpp
+++ b/r5dev/public/utility/binstream.cpp
@@ -1,5 +1,5 @@
 #include "core/stdafx.h"
-#include "public/include/binstream.h"
+#include "public/utility/binstream.h"
 
 //-----------------------------------------------------------------------------
 // Purpose: CIOStream constructors
diff --git a/r5dev/public/include/binstream.h b/r5dev/public/utility/binstream.h
similarity index 100%
rename from r5dev/public/include/binstream.h
rename to r5dev/public/utility/binstream.h
diff --git a/r5dev/public/include/httplib.h b/r5dev/public/utility/httplib.h
similarity index 100%
rename from r5dev/public/include/httplib.h
rename to r5dev/public/utility/httplib.h
diff --git a/r5dev/public/memaddr.cpp b/r5dev/public/utility/memaddr.cpp
similarity index 99%
rename from r5dev/public/memaddr.cpp
rename to r5dev/public/utility/memaddr.cpp
index a572a399..92210585 100644
--- a/r5dev/public/memaddr.cpp
+++ b/r5dev/public/utility/memaddr.cpp
@@ -4,8 +4,8 @@
 //
 //===========================================================================//
 #include "core/stdafx.h"
-#include "public/include/utility.h"
-#include "public/include/memaddr.h"
+#include "public/utility/utility.h"
+#include "public/utility/memaddr.h"
 
 //-----------------------------------------------------------------------------
 // Purpose: check array of opcodes starting from current address
diff --git a/r5dev/public/include/memaddr.h b/r5dev/public/utility/memaddr.h
similarity index 100%
rename from r5dev/public/include/memaddr.h
rename to r5dev/public/utility/memaddr.h
diff --git a/r5dev/public/module.cpp b/r5dev/public/utility/module.cpp
similarity index 99%
rename from r5dev/public/module.cpp
rename to r5dev/public/utility/module.cpp
index e2e9b567..362e1be4 100644
--- a/r5dev/public/module.cpp
+++ b/r5dev/public/utility/module.cpp
@@ -4,8 +4,8 @@
 //
 //===========================================================================//
 #include "core/stdafx.h"
-#include "public/include/utility.h"
-#include "public/include/memaddr.h"
+#include "public/utility/utility.h"
+#include "public/utility/memaddr.h"
 
 //-----------------------------------------------------------------------------
 // Purpose: constructor
diff --git a/r5dev/public/include/module.h b/r5dev/public/utility/module.h
similarity index 100%
rename from r5dev/public/include/module.h
rename to r5dev/public/utility/module.h
diff --git a/r5dev/public/utility.cpp b/r5dev/public/utility/utility.cpp
similarity index 99%
rename from r5dev/public/utility.cpp
rename to r5dev/public/utility/utility.cpp
index 501cf476..e5f99ccc 100644
--- a/r5dev/public/utility.cpp
+++ b/r5dev/public/utility/utility.cpp
@@ -4,7 +4,7 @@
 
 #include "core/stdafx.h"
 #include "core/logdef.h"
-#include "public/include/utility.h"
+#include "public/utility/utility.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // For checking if a specific file exists.
diff --git a/r5dev/public/include/utility.h b/r5dev/public/utility/utility.h
similarity index 100%
rename from r5dev/public/include/utility.h
rename to r5dev/public/utility/utility.h
diff --git a/r5dev/public/include/vdf_parser.h b/r5dev/public/utility/vdf_parser.h
similarity index 100%
rename from r5dev/public/include/vdf_parser.h
rename to r5dev/public/utility/vdf_parser.h
diff --git a/r5dev/public/include/worldsize.h b/r5dev/public/worldsize.h
similarity index 100%
rename from r5dev/public/include/worldsize.h
rename to r5dev/public/worldsize.h
diff --git a/r5dev/thirdparty/imgui/src/imgui_impl_win32.cpp b/r5dev/thirdparty/imgui/src/imgui_impl_win32.cpp
index 5615b9ba..0bcf711a 100644
--- a/r5dev/thirdparty/imgui/src/imgui_impl_win32.cpp
+++ b/r5dev/thirdparty/imgui/src/imgui_impl_win32.cpp
@@ -25,7 +25,7 @@
 // Includes of the game have to be here since this header is precompiled.
 #include "string"
 #include "d3d11.h"
-#include "public/include/httplib.h"
+#include "public/utility/httplib.h"
 
 // Game ImGui headers are here for mouse tracking.
 #include "gameui/IBrowser.h"
diff --git a/r5dev/tier0/commandline.h b/r5dev/tier0/commandline.h
index 9f439e30..ede3007d 100644
--- a/r5dev/tier0/commandline.h
+++ b/r5dev/tier0/commandline.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "public/include/icommandline.h"
+#include "public/icommandline.h"
 
 class CCommandLine : public ICommandLine // VTABLE @0x141369C78 in R5pc_r5launch_N1094_CL456479_2019_10_30_05_20_PM
 {
diff --git a/r5dev/tier1/IConVar.cpp b/r5dev/tier1/IConVar.cpp
index 7ca44625..03df6183 100644
--- a/r5dev/tier1/IConVar.cpp
+++ b/r5dev/tier1/IConVar.cpp
@@ -12,8 +12,8 @@
 #include "tier1/utlvector.h"
 #include "mathlib/bits.h"
 #include "vstdlib/callback.h"
-#include "public/include/iconvar.h"
-#include "public/include/iconcommand.h"
+#include "public/iconvar.h"
+#include "public/iconcommand.h"
 
 //-----------------------------------------------------------------------------
 // Purpose: create
diff --git a/r5dev/tier1/IConVar.h b/r5dev/tier1/IConVar.h
index 0b1e164f..dd6cb0e4 100644
--- a/r5dev/tier1/IConVar.h
+++ b/r5dev/tier1/IConVar.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "tier1/cmd.h"
 #include "mathlib/color.h"
-#include "public/include/iconvar.h"
+#include "public/iconvar.h"
 #include "tier1/utlvector.h"
 
 //-----------------------------------------------------------------------------
diff --git a/r5dev/tier1/cmd.h b/r5dev/tier1/cmd.h
index eea2ac10..e301ff2a 100644
--- a/r5dev/tier1/cmd.h
+++ b/r5dev/tier1/cmd.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "tier1/characterset.h"
-#include "public/include/iconvar.h"
-#include "public/include/iconcommand.h"
+#include "public/iconvar.h"
+#include "public/iconcommand.h"
 
 //-----------------------------------------------------------------------------
 // Forward declarations
diff --git a/r5dev/vpklib/packedstore.h b/r5dev/vpklib/packedstore.h
index 93f4618c..4bfdd265 100644
--- a/r5dev/vpklib/packedstore.h
+++ b/r5dev/vpklib/packedstore.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "public/include/binstream.h"
+#include "public/utility/binstream.h"
 #include "thirdparty/lzham/include/lzham.h"
 
 constexpr unsigned int VPK_HEADER_MARKER = 0x55AA1234;
diff --git a/r5dev/vproj/clientsdk.vcxproj b/r5dev/vproj/clientsdk.vcxproj
index 73dc220c..89be9868 100644
--- a/r5dev/vproj/clientsdk.vcxproj
+++ b/r5dev/vproj/clientsdk.vcxproj
@@ -85,10 +85,10 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\public\binstream.cpp" />
-    <ClCompile Include="..\public\memaddr.cpp" />
-    <ClCompile Include="..\public\module.cpp" />
-    <ClCompile Include="..\public\utility.cpp" />
+    <ClCompile Include="..\public\utility\binstream.cpp" />
+    <ClCompile Include="..\public\utility\memaddr.cpp" />
+    <ClCompile Include="..\public\utility\module.cpp" />
+    <ClCompile Include="..\public\utility\utility.cpp" />
     <ClCompile Include="..\rtech\rtech_utils.cpp" />
     <ClCompile Include="..\rtech\rtech_game.cpp" />
     <ClCompile Include="..\rtech\rui\rui.cpp" />
@@ -235,36 +235,37 @@
     <ClInclude Include="..\protoc\sv_rcon.pb.h" />
     <ClInclude Include="..\public\avi\iavi.h" />
     <ClInclude Include="..\public\avi\ibik.h" />
+    <ClInclude Include="..\public\bitmap\stb_image.h" />
     <ClInclude Include="..\public\iengine.h" />
-    <ClInclude Include="..\public\include\client_class.h" />
-    <ClInclude Include="..\public\include\const.h" />
-    <ClInclude Include="..\public\include\edict.h" />
-    <ClInclude Include="..\public\include\globalvars_base.h" />
-    <ClInclude Include="..\public\include\icliententity.h" />
-    <ClInclude Include="..\public\include\icliententitylist.h" />
-    <ClInclude Include="..\public\include\iclientnetworkable.h" />
-    <ClInclude Include="..\public\include\iclientrenderable.h" />
-    <ClInclude Include="..\public\include\iclientthinkable.h" />
-    <ClInclude Include="..\public\include\iclientunknown.h" />
-    <ClInclude Include="..\public\include\icommandline.h" />
-    <ClInclude Include="..\public\include\iconcommand.h" />
-    <ClInclude Include="..\public\include\iconvar.h" />
-    <ClInclude Include="..\public\include\idebugoverlay.h" />
-    <ClInclude Include="..\public\include\ihandleentity.h" />
-    <ClInclude Include="..\public\include\inetchannel.h" />
-    <ClInclude Include="..\public\include\inetmsghandler.h" />
-    <ClInclude Include="..\public\include\ivrenderview.h" />
-    <ClInclude Include="..\public\include\ivscript.h" />
-    <ClInclude Include="..\public\include\memaddr.h" />
-    <ClInclude Include="..\public\include\binstream.h" />
-    <ClInclude Include="..\public\include\httplib.h" />
-    <ClInclude Include="..\public\include\model_types.h" />
-    <ClInclude Include="..\public\include\module.h" />
-    <ClInclude Include="..\public\include\stb_image.h" />
-    <ClInclude Include="..\public\include\studio.h" />
-    <ClInclude Include="..\public\include\utility.h" />
+    <ClInclude Include="..\public\client_class.h" />
+    <ClInclude Include="..\public\const.h" />
+    <ClInclude Include="..\public\edict.h" />
+    <ClInclude Include="..\public\globalvars_base.h" />
+    <ClInclude Include="..\public\icliententity.h" />
+    <ClInclude Include="..\public\icliententitylist.h" />
+    <ClInclude Include="..\public\iclientnetworkable.h" />
+    <ClInclude Include="..\public\iclientrenderable.h" />
+    <ClInclude Include="..\public\iclientthinkable.h" />
+    <ClInclude Include="..\public\iclientunknown.h" />
+    <ClInclude Include="..\public\icommandline.h" />
+    <ClInclude Include="..\public\iconcommand.h" />
+    <ClInclude Include="..\public\iconvar.h" />
+    <ClInclude Include="..\public\idebugoverlay.h" />
+    <ClInclude Include="..\public\ihandleentity.h" />
+    <ClInclude Include="..\public\inetchannel.h" />
+    <ClInclude Include="..\public\inetmsghandler.h" />
+    <ClInclude Include="..\public\ivrenderview.h" />
+    <ClInclude Include="..\public\ivscript.h" />
+    <ClInclude Include="..\public\model_types.h" />
+    <ClInclude Include="..\public\studio.h" />
     <ClInclude Include="..\core\resource.h" />
-    <ClInclude Include="..\public\include\worldsize.h" />
+    <ClInclude Include="..\public\utility\binstream.h" />
+    <ClInclude Include="..\public\utility\httplib.h" />
+    <ClInclude Include="..\public\utility\memaddr.h" />
+    <ClInclude Include="..\public\utility\module.h" />
+    <ClInclude Include="..\public\utility\utility.h" />
+    <ClInclude Include="..\public\utility\vdf_parser.h" />
+    <ClInclude Include="..\public\worldsize.h" />
     <ClInclude Include="..\rtech\rtech_utils.h" />
     <ClInclude Include="..\rtech\rtech_game.h" />
     <ClInclude Include="..\rtech\rui\rui.h" />
diff --git a/r5dev/vproj/clientsdk.vcxproj.filters b/r5dev/vproj/clientsdk.vcxproj.filters
index 1f929199..bd8bb6ac 100644
--- a/r5dev/vproj/clientsdk.vcxproj.filters
+++ b/r5dev/vproj/clientsdk.vcxproj.filters
@@ -118,7 +118,7 @@
     <Filter Include="sdk\public">
       <UniqueIdentifier>{b0696621-8658-4918-b0f2-ba20acc26829}</UniqueIdentifier>
     </Filter>
-    <Filter Include="sdk\public\include">
+    <Filter Include="sdk\public">
       <UniqueIdentifier>{cbe60970-f348-4a8b-8cee-d4cfebbe0d99}</UniqueIdentifier>
     </Filter>
     <Filter Include="sdk\tier2">
@@ -214,6 +214,12 @@
     <Filter Include="sdk\bonesetup">
       <UniqueIdentifier>{57e1f0c7-ce4f-4576-960e-0cd15b2b5092}</UniqueIdentifier>
     </Filter>
+    <Filter Include="sdk\public\bitmap">
+      <UniqueIdentifier>{84fdfada-64fe-4591-b639-431058a16686}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="sdk\public\utility">
+      <UniqueIdentifier>{91e5c68f-327d-446c-840d-5e7a53d9a631}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\client\cdll_engine_int.cpp">
@@ -243,9 +249,6 @@
     <ClCompile Include="..\gameui\IConsole.cpp">
       <Filter>sdk\gameui</Filter>
     </ClCompile>
-    <ClCompile Include="..\public\utility.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
     <ClCompile Include="..\rtech\rtech_utils.cpp">
       <Filter>sdk\rtech</Filter>
     </ClCompile>
@@ -309,9 +312,6 @@
     <ClCompile Include="..\vpklib\packedstore.cpp">
       <Filter>sdk\vpklib</Filter>
     </ClCompile>
-    <ClCompile Include="..\public\binstream.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
     <ClCompile Include="..\bsplib\bsplib.cpp">
       <Filter>sdk\bsplib</Filter>
     </ClCompile>
@@ -438,12 +438,6 @@
     <ClCompile Include="..\vstdlib\keyvaluessystem.cpp">
       <Filter>sdk\vstdlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\public\memaddr.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
-    <ClCompile Include="..\public\module.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
     <ClCompile Include="..\vstdlib\callback.cpp">
       <Filter>sdk\vstdlib</Filter>
     </ClCompile>
@@ -567,6 +561,18 @@
     <ClCompile Include="..\tier1\splitstring.cpp">
       <Filter>sdk\tier1</Filter>
     </ClCompile>
+    <ClCompile Include="..\public\utility\memaddr.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\public\utility\module.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\public\utility\utility.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\public\utility\binstream.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\client\cdll_engine_int.h">
@@ -599,15 +605,6 @@
     <ClInclude Include="..\gameui\IConsole.h">
       <Filter>sdk\gameui</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\httplib.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\public\include\utility.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\public\include\memaddr.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\rtech\rtech_utils.h">
       <Filter>sdk\rtech</Filter>
     </ClInclude>
@@ -1016,9 +1013,6 @@
     <ClInclude Include="..\mathlib\parallel_for.h">
       <Filter>sdk\mathlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\stb_image.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\squirrel\sqinit.h">
       <Filter>sdk\squirrel</Filter>
     </ClInclude>
@@ -1034,9 +1028,6 @@
     <ClInclude Include="..\vpklib\packedstore.h">
       <Filter>sdk\vpklib</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\binstream.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\mathlib\adler32.h">
       <Filter>sdk\mathlib</Filter>
     </ClInclude>
@@ -1226,11 +1217,11 @@
     <ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_lzdecompbase.h">
       <Filter>thirdparty\lzham\lzhamdecomp\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\edict.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\edict.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\globalvars_base.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\globalvars_base.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\engine\gl_matsysiface.h">
       <Filter>sdk\engine</Filter>
@@ -1259,8 +1250,8 @@
     <ClInclude Include="..\squirrel\sqtype.h">
       <Filter>sdk\squirrel</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\inetchannel.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\inetchannel.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\utlvector.h">
       <Filter>sdk\tier1</Filter>
@@ -1298,9 +1289,6 @@
     <ClInclude Include="..\vstdlib\keyvaluessystem.h">
       <Filter>sdk\vstdlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\module.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\x86defs.h">
       <Filter>sdk\common</Filter>
     </ClInclude>
@@ -1325,8 +1313,8 @@
     <ClInclude Include="..\windows\resource.h">
       <Filter>windows</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\studio.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\studio.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\engine\gl_model_private.h">
       <Filter>sdk\engine</Filter>
@@ -1334,8 +1322,8 @@
     <ClInclude Include="..\common\qlimits.h">
       <Filter>sdk\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\model_types.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\model_types.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\game\client\enginesprite.h">
       <Filter>sdk\game\client</Filter>
@@ -1355,14 +1343,14 @@
     <ClInclude Include="..\public\avi\ibik.h">
       <Filter>sdk\public\avi</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\const.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\const.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\engine\gl_rsurf.h">
       <Filter>sdk\engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\ivrenderview.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\ivrenderview.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier0\threadtools.h">
       <Filter>sdk\tier0</Filter>
@@ -1373,8 +1361,8 @@
     <ClInclude Include="..\tier1\utldict.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\client_class.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\client_class.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\datacache\idatacache.h">
       <Filter>sdk\datacache</Filter>
@@ -1514,8 +1502,8 @@
     <ClInclude Include="..\engine\packed_entity.h">
       <Filter>sdk\engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\inetmsghandler.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\inetmsghandler.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\mempool.h">
       <Filter>sdk\tier1</Filter>
@@ -1571,8 +1559,8 @@
     <ClInclude Include="..\tier0\platform_internal.h">
       <Filter>sdk\tier0</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\icommandline.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\icommandline.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\mathlib\mathlib.h">
       <Filter>sdk\mathlib</Filter>
@@ -1619,8 +1607,8 @@
     <ClInclude Include="..\mathlib\transform.h">
       <Filter>sdk\mathlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\idebugoverlay.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\idebugoverlay.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier0\memstd.h">
       <Filter>sdk\tier0</Filter>
@@ -1628,44 +1616,44 @@
     <ClInclude Include="..\game\client\c_baseplayer.h">
       <Filter>sdk\game\client</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iclientrenderable.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iclientrenderable.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iclientthinkable.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iclientthinkable.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iclientunknown.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iclientunknown.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\ihandleentity.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\ihandleentity.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iclientnetworkable.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iclientnetworkable.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\icliententity.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\icliententity.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\ivscript.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\ivscript.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\game\client\view.h">
       <Filter>sdk\game\client</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iconcommand.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iconcommand.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iconvar.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iconvar.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\characterset.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\worldsize.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\worldsize.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\icliententitylist.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\icliententitylist.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\utlblockmemory.h">
       <Filter>sdk\tier1</Filter>
@@ -1676,6 +1664,27 @@
     <ClInclude Include="..\public\iengine.h">
       <Filter>sdk\public</Filter>
     </ClInclude>
+    <ClInclude Include="..\public\bitmap\stb_image.h">
+      <Filter>sdk\public\bitmap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\binstream.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\httplib.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\memaddr.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\module.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\utility.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\vdf_parser.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\shared\resource\lockedserver.png">
diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj
index 66915901..aaa1ab33 100644
--- a/r5dev/vproj/dedicated.vcxproj
+++ b/r5dev/vproj/dedicated.vcxproj
@@ -212,27 +212,28 @@
     <ClInclude Include="..\protoc\cl_rcon.pb.h" />
     <ClInclude Include="..\protoc\sv_rcon.pb.h" />
     <ClInclude Include="..\public\iengine.h" />
-    <ClInclude Include="..\public\include\client_class.h" />
-    <ClInclude Include="..\public\include\const.h" />
-    <ClInclude Include="..\public\include\edict.h" />
-    <ClInclude Include="..\public\include\globalvars_base.h" />
-    <ClInclude Include="..\public\include\icommandline.h" />
-    <ClInclude Include="..\public\include\iconcommand.h" />
-    <ClInclude Include="..\public\include\iconvar.h" />
-    <ClInclude Include="..\public\include\icvar.h" />
-    <ClInclude Include="..\public\include\inetchannel.h" />
-    <ClInclude Include="..\public\include\inetmsghandler.h" />
-    <ClInclude Include="..\public\include\iserver.h" />
-    <ClInclude Include="..\public\include\ivscript.h" />
-    <ClInclude Include="..\public\include\memaddr.h" />
-    <ClInclude Include="..\public\include\bansystem.h" />
-    <ClInclude Include="..\public\include\binstream.h" />
-    <ClInclude Include="..\public\include\httplib.h" />
-    <ClInclude Include="..\public\include\model_types.h" />
-    <ClInclude Include="..\public\include\module.h" />
-    <ClInclude Include="..\public\include\studio.h" />
-    <ClInclude Include="..\public\include\utility.h" />
-    <ClInclude Include="..\public\include\worldsize.h" />
+    <ClInclude Include="..\public\client_class.h" />
+    <ClInclude Include="..\public\const.h" />
+    <ClInclude Include="..\public\edict.h" />
+    <ClInclude Include="..\public\globalvars_base.h" />
+    <ClInclude Include="..\public\icommandline.h" />
+    <ClInclude Include="..\public\iconcommand.h" />
+    <ClInclude Include="..\public\iconvar.h" />
+    <ClInclude Include="..\public\icvar.h" />
+    <ClInclude Include="..\public\inetchannel.h" />
+    <ClInclude Include="..\public\inetmsghandler.h" />
+    <ClInclude Include="..\public\iserver.h" />
+    <ClInclude Include="..\public\ivscript.h" />
+    <ClInclude Include="..\public\bansystem.h" />
+    <ClInclude Include="..\public\model_types.h" />
+    <ClInclude Include="..\public\studio.h" />
+    <ClInclude Include="..\public\utility\binstream.h" />
+    <ClInclude Include="..\public\utility\httplib.h" />
+    <ClInclude Include="..\public\utility\memaddr.h" />
+    <ClInclude Include="..\public\utility\module.h" />
+    <ClInclude Include="..\public\utility\utility.h" />
+    <ClInclude Include="..\public\utility\vdf_parser.h" />
+    <ClInclude Include="..\public\worldsize.h" />
     <ClInclude Include="..\rtech\rtech_utils.h" />
     <ClInclude Include="..\rtech\rtech_game.h" />
     <ClInclude Include="..\rtech\rui\rui.h" />
@@ -527,10 +528,10 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\public\bansystem.cpp" />
-    <ClCompile Include="..\public\binstream.cpp" />
-    <ClCompile Include="..\public\memaddr.cpp" />
-    <ClCompile Include="..\public\module.cpp" />
-    <ClCompile Include="..\public\utility.cpp" />
+    <ClCompile Include="..\public\utility\binstream.cpp" />
+    <ClCompile Include="..\public\utility\memaddr.cpp" />
+    <ClCompile Include="..\public\utility\module.cpp" />
+    <ClCompile Include="..\public\utility\utility.cpp" />
     <ClCompile Include="..\rtech\rtech_utils.cpp" />
     <ClCompile Include="..\rtech\rtech_game.cpp" />
     <ClCompile Include="..\rtech\stryder\stryder.cpp" />
diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters
index f1ef6111..cf3fc864 100644
--- a/r5dev/vproj/dedicated.vcxproj.filters
+++ b/r5dev/vproj/dedicated.vcxproj.filters
@@ -82,7 +82,7 @@
     <Filter Include="sdk\public">
       <UniqueIdentifier>{bbb7a170-37ae-4c76-b99a-8ebb924818ed}</UniqueIdentifier>
     </Filter>
-    <Filter Include="sdk\public\include">
+    <Filter Include="sdk\public">
       <UniqueIdentifier>{e1897f61-953e-4173-9c75-e59ca33929ea}</UniqueIdentifier>
     </Filter>
     <Filter Include="sdk\vpklib">
@@ -190,6 +190,9 @@
     <Filter Include="sdk\bonesetup">
       <UniqueIdentifier>{d49ec580-58c2-49e7-8e83-957da576febd}</UniqueIdentifier>
     </Filter>
+    <Filter Include="sdk\public\utility">
+      <UniqueIdentifier>{e0155821-8fb2-4fb6-aa6a-d3e6d980b64c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\opcodes.h">
@@ -240,17 +243,8 @@
     <ClInclude Include="..\networksystem\sm_protocol.h">
       <Filter>sdk\networksystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\httplib.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\public\include\utility.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\public\include\memaddr.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\public\include\bansystem.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\bansystem.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\rtech\rtech_utils.h">
       <Filter>sdk\rtech</Filter>
@@ -594,9 +588,6 @@
     <ClInclude Include="..\vpklib\packedstore.h">
       <Filter>sdk\vpklib</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\binstream.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\mathlib\adler32.h">
       <Filter>sdk\mathlib</Filter>
     </ClInclude>
@@ -792,11 +783,11 @@
     <ClInclude Include="..\game\server\ai_network.h">
       <Filter>sdk\game\server</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\edict.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\edict.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\globalvars_base.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\globalvars_base.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\engine\gl_matsysiface.h">
       <Filter>sdk\engine</Filter>
@@ -828,8 +819,8 @@
     <ClInclude Include="..\squirrel\sqtype.h">
       <Filter>sdk\squirrel</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\inetchannel.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\inetchannel.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\utlmemory.h">
       <Filter>sdk\tier1</Filter>
@@ -864,9 +855,6 @@
     <ClInclude Include="..\vstdlib\keyvaluessystem.h">
       <Filter>sdk\vstdlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\module.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\x86defs.h">
       <Filter>sdk\common</Filter>
     </ClInclude>
@@ -891,8 +879,8 @@
     <ClInclude Include="..\rtech\rui\rui.h">
       <Filter>sdk\rtech\rui</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\studio.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\studio.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\engine\gl_model_private.h">
       <Filter>sdk\engine</Filter>
@@ -900,8 +888,8 @@
     <ClInclude Include="..\common\qlimits.h">
       <Filter>sdk\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\model_types.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\model_types.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\datacache\imdlcache.h">
       <Filter>sdk\datacache</Filter>
@@ -909,8 +897,8 @@
     <ClInclude Include="..\datacache\mdlcache.h">
       <Filter>sdk\datacache</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\const.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\const.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier0\threadtools.h">
       <Filter>sdk\tier0</Filter>
@@ -921,8 +909,8 @@
     <ClInclude Include="..\tier1\utldict.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\client_class.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\client_class.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\datacache\idatacache.h">
       <Filter>sdk\datacache</Filter>
@@ -1062,8 +1050,8 @@
     <ClInclude Include="..\engine\packed_entity.h">
       <Filter>sdk\engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\inetmsghandler.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\inetmsghandler.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\mempool.h">
       <Filter>sdk\tier1</Filter>
@@ -1089,8 +1077,8 @@
     <ClInclude Include="..\engine\networkstringtable.h">
       <Filter>sdk\engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iserver.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iserver.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier0\dbg.h">
       <Filter>sdk\tier0</Filter>
@@ -1125,8 +1113,8 @@
     <ClInclude Include="..\tier0\platform_internal.h">
       <Filter>sdk\tier0</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\icommandline.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\icommandline.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\mathlib\noisedata.h">
       <Filter>sdk\mathlib</Filter>
@@ -1173,23 +1161,23 @@
     <ClInclude Include="..\tier0\memstd.h">
       <Filter>sdk\tier0</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\ivscript.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\ivscript.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iconvar.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iconvar.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iconcommand.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iconcommand.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\icvar.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\icvar.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\characterset.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\worldsize.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\worldsize.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\utlblockmemory.h">
       <Filter>sdk\tier1</Filter>
@@ -1200,6 +1188,24 @@
     <ClInclude Include="..\public\iengine.h">
       <Filter>sdk\public</Filter>
     </ClInclude>
+    <ClInclude Include="..\public\utility\memaddr.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\module.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\utility.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\vdf_parser.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\binstream.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\httplib.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\common\opcodes.cpp">
@@ -1235,9 +1241,6 @@
     <ClCompile Include="..\launcher\IApplication.cpp">
       <Filter>sdk\launcher</Filter>
     </ClCompile>
-    <ClCompile Include="..\public\utility.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
     <ClCompile Include="..\public\bansystem.cpp">
       <Filter>sdk\public</Filter>
     </ClCompile>
@@ -1274,9 +1277,6 @@
     <ClCompile Include="..\vpklib\packedstore.cpp">
       <Filter>sdk\vpklib</Filter>
     </ClCompile>
-    <ClCompile Include="..\public\binstream.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
     <ClCompile Include="..\bsplib\bsplib.cpp">
       <Filter>sdk\bsplib</Filter>
     </ClCompile>
@@ -1397,12 +1397,6 @@
     <ClCompile Include="..\vstdlib\keyvaluessystem.cpp">
       <Filter>sdk\vstdlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\public\memaddr.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
-    <ClCompile Include="..\public\module.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
     <ClCompile Include="..\vstdlib\callback.cpp">
       <Filter>sdk\vstdlib</Filter>
     </ClCompile>
@@ -1505,6 +1499,18 @@
     <ClCompile Include="..\tier1\splitstring.cpp">
       <Filter>sdk\tier1</Filter>
     </ClCompile>
+    <ClCompile Include="..\public\utility\memaddr.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\public\utility\module.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\public\utility\utility.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\public\utility\binstream.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Dedicated.def" />
diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj
index 9629f399..2008dff8 100644
--- a/r5dev/vproj/gamesdk.vcxproj
+++ b/r5dev/vproj/gamesdk.vcxproj
@@ -93,10 +93,10 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="..\public\bansystem.cpp" />
-    <ClCompile Include="..\public\binstream.cpp" />
-    <ClCompile Include="..\public\memaddr.cpp" />
-    <ClCompile Include="..\public\module.cpp" />
-    <ClCompile Include="..\public\utility.cpp" />
+    <ClCompile Include="..\public\utility\binstream.cpp" />
+    <ClCompile Include="..\public\utility\memaddr.cpp" />
+    <ClCompile Include="..\public\utility\module.cpp" />
+    <ClCompile Include="..\public\utility\utility.cpp" />
     <ClCompile Include="..\rtech\rtech_utils.cpp" />
     <ClCompile Include="..\rtech\rtech_game.cpp" />
     <ClCompile Include="..\rtech\rui\rui.cpp" />
@@ -258,39 +258,39 @@
     <ClInclude Include="..\protoc\sv_rcon.pb.h" />
     <ClInclude Include="..\public\avi\iavi.h" />
     <ClInclude Include="..\public\avi\ibik.h" />
+    <ClInclude Include="..\public\bitmap\stb_image.h" />
     <ClInclude Include="..\public\iengine.h" />
-    <ClInclude Include="..\public\include\client_class.h" />
-    <ClInclude Include="..\public\include\const.h" />
-    <ClInclude Include="..\public\include\edict.h" />
-    <ClInclude Include="..\public\include\globalvars_base.h" />
-    <ClInclude Include="..\public\include\icliententity.h" />
-    <ClInclude Include="..\public\include\icliententitylist.h" />
-    <ClInclude Include="..\public\include\iclientnetworkable.h" />
-    <ClInclude Include="..\public\include\iclientrenderable.h" />
-    <ClInclude Include="..\public\include\iclientthinkable.h" />
-    <ClInclude Include="..\public\include\iclientunknown.h" />
-    <ClInclude Include="..\public\include\icommandline.h" />
-    <ClInclude Include="..\public\include\iconcommand.h" />
-    <ClInclude Include="..\public\include\iconvar.h" />
-    <ClInclude Include="..\public\include\icvar.h" />
-    <ClInclude Include="..\public\include\idebugoverlay.h" />
-    <ClInclude Include="..\public\include\ihandleentity.h" />
-    <ClInclude Include="..\public\include\inetchannel.h" />
-    <ClInclude Include="..\public\include\inetmsghandler.h" />
-    <ClInclude Include="..\public\include\iserver.h" />
-    <ClInclude Include="..\public\include\ivrenderview.h" />
-    <ClInclude Include="..\public\include\ivscript.h" />
-    <ClInclude Include="..\public\include\memaddr.h" />
-    <ClInclude Include="..\public\include\bansystem.h" />
-    <ClInclude Include="..\public\include\binstream.h" />
-    <ClInclude Include="..\public\include\httplib.h" />
-    <ClInclude Include="..\public\include\model_types.h" />
-    <ClInclude Include="..\public\include\module.h" />
-    <ClInclude Include="..\public\include\stb_image.h" />
-    <ClInclude Include="..\public\include\studio.h" />
-    <ClInclude Include="..\public\include\utility.h" />
+    <ClInclude Include="..\public\client_class.h" />
+    <ClInclude Include="..\public\const.h" />
+    <ClInclude Include="..\public\edict.h" />
+    <ClInclude Include="..\public\globalvars_base.h" />
+    <ClInclude Include="..\public\icliententity.h" />
+    <ClInclude Include="..\public\icliententitylist.h" />
+    <ClInclude Include="..\public\iclientnetworkable.h" />
+    <ClInclude Include="..\public\iclientrenderable.h" />
+    <ClInclude Include="..\public\iclientthinkable.h" />
+    <ClInclude Include="..\public\iclientunknown.h" />
+    <ClInclude Include="..\public\icommandline.h" />
+    <ClInclude Include="..\public\iconcommand.h" />
+    <ClInclude Include="..\public\iconvar.h" />
+    <ClInclude Include="..\public\icvar.h" />
+    <ClInclude Include="..\public\idebugoverlay.h" />
+    <ClInclude Include="..\public\ihandleentity.h" />
+    <ClInclude Include="..\public\inetchannel.h" />
+    <ClInclude Include="..\public\inetmsghandler.h" />
+    <ClInclude Include="..\public\iserver.h" />
+    <ClInclude Include="..\public\ivrenderview.h" />
+    <ClInclude Include="..\public\ivscript.h" />
+    <ClInclude Include="..\public\bansystem.h" />
+    <ClInclude Include="..\public\model_types.h" />
+    <ClInclude Include="..\public\studio.h" />
     <ClInclude Include="..\core\resource.h" />
-    <ClInclude Include="..\public\include\worldsize.h" />
+    <ClInclude Include="..\public\utility\binstream.h" />
+    <ClInclude Include="..\public\utility\httplib.h" />
+    <ClInclude Include="..\public\utility\memaddr.h" />
+    <ClInclude Include="..\public\utility\module.h" />
+    <ClInclude Include="..\public\utility\utility.h" />
+    <ClInclude Include="..\public\worldsize.h" />
     <ClInclude Include="..\rtech\rtech_utils.h" />
     <ClInclude Include="..\rtech\rtech_game.h" />
     <ClInclude Include="..\rtech\rui\rui.h" />
diff --git a/r5dev/vproj/gamesdk.vcxproj.filters b/r5dev/vproj/gamesdk.vcxproj.filters
index 8c21e6e3..948e665d 100644
--- a/r5dev/vproj/gamesdk.vcxproj.filters
+++ b/r5dev/vproj/gamesdk.vcxproj.filters
@@ -121,7 +121,7 @@
     <Filter Include="sdk\public">
       <UniqueIdentifier>{b0696621-8658-4918-b0f2-ba20acc26829}</UniqueIdentifier>
     </Filter>
-    <Filter Include="sdk\public\include">
+    <Filter Include="sdk\public">
       <UniqueIdentifier>{cbe60970-f348-4a8b-8cee-d4cfebbe0d99}</UniqueIdentifier>
     </Filter>
     <Filter Include="sdk\tier2">
@@ -223,6 +223,12 @@
     <Filter Include="sdk\bonesetup">
       <UniqueIdentifier>{acbd4b45-6a8d-4d9f-9747-1bc460481bb4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="sdk\public\bitmap">
+      <UniqueIdentifier>{a7d7c0e6-d908-4e3e-ae8d-f45dea8de772}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="sdk\public\utility">
+      <UniqueIdentifier>{2828835b-d972-4793-83f7-8eb1741b78ba}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\client\vengineclient_impl.cpp">
@@ -258,9 +264,6 @@
     <ClCompile Include="..\public\bansystem.cpp">
       <Filter>sdk\public</Filter>
     </ClCompile>
-    <ClCompile Include="..\public\utility.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
     <ClCompile Include="..\rtech\rtech_utils.cpp">
       <Filter>sdk\rtech</Filter>
     </ClCompile>
@@ -327,9 +330,6 @@
     <ClCompile Include="..\vpklib\packedstore.cpp">
       <Filter>sdk\vpklib</Filter>
     </ClCompile>
-    <ClCompile Include="..\public\binstream.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
     <ClCompile Include="..\bsplib\bsplib.cpp">
       <Filter>sdk\bsplib</Filter>
     </ClCompile>
@@ -465,12 +465,6 @@
     <ClCompile Include="..\vstdlib\keyvaluessystem.cpp">
       <Filter>sdk\vstdlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\public\memaddr.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
-    <ClCompile Include="..\public\module.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
     <ClCompile Include="..\vstdlib\callback.cpp">
       <Filter>sdk\vstdlib</Filter>
     </ClCompile>
@@ -606,6 +600,18 @@
     <ClCompile Include="..\tier1\splitstring.cpp">
       <Filter>sdk\tier1</Filter>
     </ClCompile>
+    <ClCompile Include="..\public\utility\module.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\public\utility\utility.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\public\utility\binstream.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
+    <ClCompile Include="..\public\utility\memaddr.cpp">
+      <Filter>sdk\public\utility</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\client\cdll_engine_int.h">
@@ -641,17 +647,8 @@
     <ClInclude Include="..\gameui\IConsole.h">
       <Filter>sdk\gameui</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\bansystem.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\public\include\httplib.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\public\include\utility.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\public\include\memaddr.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\bansystem.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\rtech\rtech_utils.h">
       <Filter>sdk\rtech</Filter>
@@ -1064,9 +1061,6 @@
     <ClInclude Include="..\mathlib\parallel_for.h">
       <Filter>sdk\mathlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\stb_image.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\squirrel\sqinit.h">
       <Filter>sdk\squirrel</Filter>
     </ClInclude>
@@ -1079,9 +1073,6 @@
     <ClInclude Include="..\vpklib\packedstore.h">
       <Filter>sdk\vpklib</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\binstream.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\mathlib\adler32.h">
       <Filter>sdk\mathlib</Filter>
     </ClInclude>
@@ -1286,11 +1277,11 @@
     <ClInclude Include="..\game\server\ai_network.h">
       <Filter>sdk\game\server</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\edict.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\edict.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\globalvars_base.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\globalvars_base.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\engine\gl_matsysiface.h">
       <Filter>sdk\engine</Filter>
@@ -1325,8 +1316,8 @@
     <ClInclude Include="..\squirrel\sqtype.h">
       <Filter>sdk\squirrel</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\inetchannel.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\inetchannel.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\utlmemory.h">
       <Filter>sdk\tier1</Filter>
@@ -1361,9 +1352,6 @@
     <ClInclude Include="..\vstdlib\keyvaluessystem.h">
       <Filter>sdk\vstdlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\module.h">
-      <Filter>sdk\public\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\common\x86defs.h">
       <Filter>sdk\common</Filter>
     </ClInclude>
@@ -1391,8 +1379,8 @@
     <ClInclude Include="..\datacache\mdlcache.h">
       <Filter>sdk\datacache</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\studio.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\studio.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\engine\gl_model_private.h">
       <Filter>sdk\engine</Filter>
@@ -1400,8 +1388,8 @@
     <ClInclude Include="..\common\qlimits.h">
       <Filter>sdk\common</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\model_types.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\model_types.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\datacache\imdlcache.h">
       <Filter>sdk\datacache</Filter>
@@ -1409,8 +1397,8 @@
     <ClInclude Include="..\game\client\enginesprite.h">
       <Filter>sdk\game\client</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\const.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\const.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\public\avi\ibik.h">
       <Filter>sdk\public\avi</Filter>
@@ -1424,8 +1412,8 @@
     <ClInclude Include="..\engine\gl_rsurf.h">
       <Filter>sdk\engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\ivrenderview.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\ivrenderview.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier0\threadtools.h">
       <Filter>sdk\tier0</Filter>
@@ -1433,14 +1421,14 @@
     <ClInclude Include="..\game\shared\animation.h">
       <Filter>sdk\game\shared</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\icliententitylist.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\icliententitylist.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\utldict.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\client_class.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\client_class.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\datacache\idatacache.h">
       <Filter>sdk\datacache</Filter>
@@ -1583,8 +1571,8 @@
     <ClInclude Include="..\tier1\mempool.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\inetmsghandler.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\inetmsghandler.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\squirrel\sqstate.h">
       <Filter>sdk\squirrel</Filter>
@@ -1610,8 +1598,8 @@
     <ClInclude Include="..\engine\networkstringtable.h">
       <Filter>sdk\engine</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iserver.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iserver.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier0\wchartypes.h">
       <Filter>sdk\tier0</Filter>
@@ -1646,8 +1634,8 @@
     <ClInclude Include="..\tier0\platform_internal.h">
       <Filter>sdk\tier0</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\icommandline.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\icommandline.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\materialsystem\cshaderglue.h">
       <Filter>sdk\materialsystem</Filter>
@@ -1706,8 +1694,8 @@
     <ClInclude Include="..\server\persistence.h">
       <Filter>sdk\server</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\idebugoverlay.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\idebugoverlay.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier0\memstd.h">
       <Filter>sdk\tier0</Filter>
@@ -1715,26 +1703,26 @@
     <ClInclude Include="..\game\client\c_baseplayer.h">
       <Filter>sdk\game\client</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\icliententity.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\icliententity.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iclientthinkable.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iclientthinkable.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iclientunknown.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iclientunknown.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\ihandleentity.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\ihandleentity.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iclientnetworkable.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iclientnetworkable.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iclientrenderable.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iclientrenderable.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\ivscript.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\ivscript.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\game\client\view.h">
       <Filter>sdk\game\client</Filter>
@@ -1742,20 +1730,20 @@
     <ClInclude Include="..\game\shared\ai_utility_shared.h">
       <Filter>sdk\game\shared</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iconvar.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iconvar.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\iconcommand.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\iconcommand.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\icvar.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\icvar.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\characterset.h">
       <Filter>sdk\tier1</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\worldsize.h">
-      <Filter>sdk\public\include</Filter>
+    <ClInclude Include="..\public\worldsize.h">
+      <Filter>sdk\public</Filter>
     </ClInclude>
     <ClInclude Include="..\tier1\utlblockmemory.h">
       <Filter>sdk\tier1</Filter>
@@ -1766,6 +1754,24 @@
     <ClInclude Include="..\public\iengine.h">
       <Filter>sdk\public</Filter>
     </ClInclude>
+    <ClInclude Include="..\public\bitmap\stb_image.h">
+      <Filter>sdk\public\bitmap</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\memaddr.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\module.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\utility.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\binstream.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
+    <ClInclude Include="..\public\utility\httplib.h">
+      <Filter>sdk\public\utility</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\shared\resource\lockedserver.png">
diff --git a/r5dev/vproj/netconsole.vcxproj b/r5dev/vproj/netconsole.vcxproj
index 3444bf26..03468933 100644
--- a/r5dev/vproj/netconsole.vcxproj
+++ b/r5dev/vproj/netconsole.vcxproj
@@ -40,7 +40,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\public\utility.cpp" />
+    <ClCompile Include="..\public\utility\utility.cpp" />
     <ClCompile Include="..\tier1\NetAdr2.cpp" />
     <ClCompile Include="..\tier2\socketcreator.cpp" />
   </ItemGroup>
@@ -51,7 +51,7 @@
     <ClInclude Include="..\netconsole\netconsole.h" />
     <ClInclude Include="..\protoc\cl_rcon.pb.h" />
     <ClInclude Include="..\protoc\sv_rcon.pb.h" />
-    <ClInclude Include="..\public\include\utility.h" />
+    <ClInclude Include="..\public\utility\utility.h" />
     <ClInclude Include="..\tier1\NetAdr2.h" />
     <ClInclude Include="..\tier2\socketcreator.h" />
   </ItemGroup>
diff --git a/r5dev/vproj/netconsole.vcxproj.filters b/r5dev/vproj/netconsole.vcxproj.filters
index e5a47942..a8780abc 100644
--- a/r5dev/vproj/netconsole.vcxproj.filters
+++ b/r5dev/vproj/netconsole.vcxproj.filters
@@ -31,9 +31,6 @@
     <ClCompile Include="..\tier1\NetAdr2.cpp">
       <Filter>sdk\tier1</Filter>
     </ClCompile>
-    <ClCompile Include="..\public\utility.cpp">
-      <Filter>sdk\public</Filter>
-    </ClCompile>
     <ClCompile Include="..\core\stdafx.cpp">
       <Filter>core</Filter>
     </ClCompile>
@@ -55,6 +52,9 @@
     <ClCompile Include="..\protoc\cl_rcon.pb.cc">
       <Filter>thirdparty\protobuf</Filter>
     </ClCompile>
+    <ClCompile Include="..\public\utility\utility.cpp">
+      <Filter>sdk\public</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\tier1\NetAdr2.h">
@@ -81,7 +81,7 @@
     <ClInclude Include="..\protoc\cl_rcon.pb.h">
       <Filter>thirdparty\protobuf</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\utility.h">
+    <ClInclude Include="..\public\utility\utility.h">
       <Filter>sdk\public</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/r5dev/vproj/sdklauncher.vcxproj b/r5dev/vproj/sdklauncher.vcxproj
index 4a8aa099..4a1805b2 100644
--- a/r5dev/vproj/sdklauncher.vcxproj
+++ b/r5dev/vproj/sdklauncher.vcxproj
@@ -126,7 +126,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\public\utility.cpp" />
+    <ClCompile Include="..\public\utility\utility.cpp" />
     <ClCompile Include="..\sdklauncher\basepanel.cpp" />
     <ClCompile Include="..\sdklauncher\sdklauncher.cpp" />
   </ItemGroup>
@@ -140,7 +140,7 @@
   <ItemGroup>
     <ClInclude Include="..\core\stdafx.h" />
     <ClInclude Include="..\launcher\launcherdefs.h" />
-    <ClInclude Include="..\public\include\utility.h" />
+    <ClInclude Include="..\public\utility\utility.h" />
     <ClInclude Include="..\sdklauncher\basepanel.h" />
     <ClInclude Include="..\sdklauncher\sdklauncher.h" />
     <ClInclude Include="..\sdklauncher\sdklauncher_const.h" />
diff --git a/r5dev/vproj/sdklauncher.vcxproj.filters b/r5dev/vproj/sdklauncher.vcxproj.filters
index db3e53a8..ba98e4f5 100644
--- a/r5dev/vproj/sdklauncher.vcxproj.filters
+++ b/r5dev/vproj/sdklauncher.vcxproj.filters
@@ -31,15 +31,15 @@
     <ClCompile Include="..\core\stdafx.cpp">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\public\utility.cpp">
-      <Filter>public</Filter>
-    </ClCompile>
     <ClCompile Include="..\sdklauncher\basepanel.cpp">
       <Filter>ui</Filter>
     </ClCompile>
     <ClCompile Include="..\sdklauncher\sdklauncher.cpp">
       <Filter>launcher</Filter>
     </ClCompile>
+    <ClCompile Include="..\public\utility\utility.cpp">
+      <Filter>public</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\resource\sdklauncher.rc">
@@ -59,9 +59,6 @@
     <ClInclude Include="..\core\stdafx.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\public\include\utility.h">
-      <Filter>public</Filter>
-    </ClInclude>
     <ClInclude Include="..\sdklauncher\basepanel.h">
       <Filter>ui</Filter>
     </ClInclude>
@@ -77,6 +74,9 @@
     <ClInclude Include="..\launcher\launcherdefs.h">
       <Filter>launcher</Filter>
     </ClInclude>
+    <ClInclude Include="..\public\utility\utility.h">
+      <Filter>public</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\resource\ico\sdklauncher_rel.ico">
diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp
index b9390d8c..96466c45 100644
--- a/r5dev/vstdlib/callback.cpp
+++ b/r5dev/vstdlib/callback.cpp
@@ -31,16 +31,16 @@
 #include "gameui/IConsole.h"
 #endif // !DEDICATED
 #ifndef CLIENT_DLL
-#include "public/include/bansystem.h"
+#include "public/bansystem.h"
 #endif // !CLIENT_DLL
-#include "public/include/worldsize.h"
+#include "public/worldsize.h"
 #include "mathlib/crc32.h"
 #include "mathlib/mathlib.h"
 #include "vstdlib/completion.h"
 #include "vstdlib/callback.h"
 #ifndef DEDICATED
 #include "materialsystem/cmaterialglue.h"
-#include "public/include/idebugoverlay.h"
+#include "public/idebugoverlay.h"
 #endif // !DEDICATED
 #ifndef DEDICATED
 #include "game/client/view.h"
diff --git a/r5dev/windows/id3dx.cpp b/r5dev/windows/id3dx.cpp
index 2f4cd242..58d89f3a 100644
--- a/r5dev/windows/id3dx.cpp
+++ b/r5dev/windows/id3dx.cpp
@@ -8,7 +8,7 @@
 #include "gameui/IConsole.h"
 #include "gameui/IBrowser.h"
 #include "inputsystem/inputsystem.h"
-#include "public/include/stb_image.h"
+#include "public/bitmap/stb_image.h"
 
 /**********************************************************************************
 -----------------------------------------------------------------------------------