diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj
index 7bf1b086..574567d5 100644
--- a/profiler/build/win32/Tracy.vcxproj
+++ b/profiler/build/win32/Tracy.vcxproj
@@ -196,8 +196,8 @@
     <ClCompile Include="..\..\..\zstd\dictBuilder\fastcover.c" />
     <ClCompile Include="..\..\..\zstd\dictBuilder\zdict.c" />
     <ClCompile Include="..\..\src\HttpRequest.cpp" />
-    <ClCompile Include="..\..\src\imgui_impl_glfw.cpp" />
-    <ClCompile Include="..\..\src\imgui_impl_opengl3.cpp" />
+    <ClCompile Include="..\..\src\imgui\imgui_impl_glfw.cpp" />
+    <ClCompile Include="..\..\src\imgui\imgui_impl_opengl3.cpp" />
     <ClCompile Include="..\..\src\main.cpp" />
     <ClCompile Include="..\..\src\NativeWindow.cpp" />
     <ClCompile Include="..\..\src\ResolvService.cpp" />
@@ -316,9 +316,9 @@
     <ClInclude Include="..\..\src\font\FontAwesomeSolid.hpp" />
     <ClInclude Include="..\..\src\HttpRequest.hpp" />
     <ClInclude Include="..\..\src\icon.hpp" />
-    <ClInclude Include="..\..\src\imgui_impl_glfw.h" />
-    <ClInclude Include="..\..\src\imgui_impl_opengl3.h" />
-    <ClInclude Include="..\..\src\imgui_impl_opengl3_loader.h" />
+    <ClInclude Include="..\..\src\imgui\imgui_impl_glfw.h" />
+    <ClInclude Include="..\..\src\imgui\imgui_impl_opengl3.h" />
+    <ClInclude Include="..\..\src\imgui\imgui_impl_opengl3_loader.h" />
     <ClInclude Include="..\..\src\NativeWindow.hpp" />
     <ClInclude Include="..\..\src\ResolvService.hpp" />
     <ClInclude Include="..\..\src\stb_image.h" />
diff --git a/profiler/build/win32/Tracy.vcxproj.filters b/profiler/build/win32/Tracy.vcxproj.filters
index 47c0f8df..99039d6f 100644
--- a/profiler/build/win32/Tracy.vcxproj.filters
+++ b/profiler/build/win32/Tracy.vcxproj.filters
@@ -37,6 +37,9 @@
     <Filter Include="src\font">
       <UniqueIdentifier>{0bd58d14-3948-47ea-b720-47560dd57338}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\imgui">
+      <UniqueIdentifier>{484838ce-9f95-4081-a87f-921ed0c9e7fa}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\server\TracyView.cpp">
@@ -66,12 +69,6 @@
     <ClCompile Include="..\..\..\server\TracyStorage.cpp">
       <Filter>server</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\imgui_impl_glfw.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\imgui_impl_opengl3.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\imgui\imgui.cpp">
       <Filter>imgui</Filter>
     </ClCompile>
@@ -330,6 +327,12 @@
     <ClCompile Include="..\..\..\public\common\TracySystem.cpp">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\imgui\imgui_impl_glfw.cpp">
+      <Filter>src\imgui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\imgui\imgui_impl_opengl3.cpp">
+      <Filter>src\imgui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\server\TracyEvent.hpp">
@@ -398,12 +401,6 @@
     <ClInclude Include="..\..\..\server\TracyStorage.hpp">
       <Filter>server</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\imgui_impl_glfw.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\imgui_impl_opengl3.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\imgui\imconfig.h">
       <Filter>imgui</Filter>
     </ClInclude>
@@ -602,9 +599,6 @@
     <ClInclude Include="..\..\..\server\TracyWeb.hpp">
       <Filter>server</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\imgui_impl_opengl3_loader.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\zstd\common\portability_macros.h">
       <Filter>zstd\common</Filter>
     </ClInclude>
@@ -674,6 +668,15 @@
     <ClInclude Include="..\..\src\font\FontAwesomeSolid.hpp">
       <Filter>src\font</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\imgui\imgui_impl_glfw.h">
+      <Filter>src\imgui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\imgui\imgui_impl_opengl3.h">
+      <Filter>src\imgui</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\imgui\imgui_impl_opengl3_loader.h">
+      <Filter>src\imgui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="DebugVis.natvis" />
diff --git a/profiler/src/imgui_impl_glfw.cpp b/profiler/src/imgui/imgui_impl_glfw.cpp
similarity index 100%
rename from profiler/src/imgui_impl_glfw.cpp
rename to profiler/src/imgui/imgui_impl_glfw.cpp
diff --git a/profiler/src/imgui_impl_glfw.h b/profiler/src/imgui/imgui_impl_glfw.h
similarity index 100%
rename from profiler/src/imgui_impl_glfw.h
rename to profiler/src/imgui/imgui_impl_glfw.h
diff --git a/profiler/src/imgui_impl_opengl3.cpp b/profiler/src/imgui/imgui_impl_opengl3.cpp
similarity index 100%
rename from profiler/src/imgui_impl_opengl3.cpp
rename to profiler/src/imgui/imgui_impl_opengl3.cpp
diff --git a/profiler/src/imgui_impl_opengl3.h b/profiler/src/imgui/imgui_impl_opengl3.h
similarity index 100%
rename from profiler/src/imgui_impl_opengl3.h
rename to profiler/src/imgui/imgui_impl_opengl3.h
diff --git a/profiler/src/imgui_impl_opengl3_loader.h b/profiler/src/imgui/imgui_impl_opengl3_loader.h
similarity index 100%
rename from profiler/src/imgui_impl_opengl3_loader.h
rename to profiler/src/imgui/imgui_impl_opengl3_loader.h
diff --git a/profiler/src/main.cpp b/profiler/src/main.cpp
index 25ee7937..0493986d 100644
--- a/profiler/src/main.cpp
+++ b/profiler/src/main.cpp
@@ -4,9 +4,9 @@
 #include <chrono>
 #include <inttypes.h>
 #include <imgui.h>
-#include "imgui_impl_glfw.h"
-#include "imgui_impl_opengl3.h"
-#include "imgui_impl_opengl3_loader.h"
+#include "imgui/imgui_impl_glfw.h"
+#include "imgui/imgui_impl_opengl3.h"
+#include "imgui/imgui_impl_opengl3_loader.h"
 #include <mutex>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/server/TracyTexture.cpp b/server/TracyTexture.cpp
index cdc2e489..8e4a9e63 100644
--- a/server/TracyTexture.cpp
+++ b/server/TracyTexture.cpp
@@ -1,6 +1,6 @@
 #include <inttypes.h>
 
-#include "../profiler/src/imgui_impl_opengl3_loader.h"
+#include "../profiler/src/imgui/imgui_impl_opengl3_loader.h"
 #include "TracyTexture.hpp"
 
 #ifndef COMPRESSED_RGB_S3TC_DXT1_EXT