diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt
index 8ffdb1c8..9881d463 100644
--- a/UnleashedRecomp/CMakeLists.txt
+++ b/UnleashedRecomp/CMakeLists.txt
@@ -87,9 +87,9 @@ set(SWA_CPU_CXX_SOURCES
 
 set(SWA_GPU_CXX_SOURCES
     "gpu/video.cpp"
-    "gpu/imgui_common.cpp"
-    "gpu/imgui_font_builder.cpp"
-    "gpu/imgui_snapshot.cpp"
+    "gpu/imgui/imgui_common.cpp"
+    "gpu/imgui/imgui_font_builder.cpp"
+    "gpu/imgui/imgui_snapshot.cpp"
     "gpu/rhi/plume_d3d12.cpp"
     "gpu/rhi/plume_vulkan.cpp"
 )
diff --git a/UnleashedRecomp/gpu/imgui_common.cpp b/UnleashedRecomp/gpu/imgui/imgui_common.cpp
similarity index 100%
rename from UnleashedRecomp/gpu/imgui_common.cpp
rename to UnleashedRecomp/gpu/imgui/imgui_common.cpp
diff --git a/UnleashedRecomp/gpu/imgui_common.h b/UnleashedRecomp/gpu/imgui/imgui_common.h
similarity index 100%
rename from UnleashedRecomp/gpu/imgui_common.h
rename to UnleashedRecomp/gpu/imgui/imgui_common.h
diff --git a/UnleashedRecomp/gpu/imgui_font_builder.cpp b/UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp
similarity index 100%
rename from UnleashedRecomp/gpu/imgui_font_builder.cpp
rename to UnleashedRecomp/gpu/imgui/imgui_font_builder.cpp
diff --git a/UnleashedRecomp/gpu/imgui_font_builder.h b/UnleashedRecomp/gpu/imgui/imgui_font_builder.h
similarity index 100%
rename from UnleashedRecomp/gpu/imgui_font_builder.h
rename to UnleashedRecomp/gpu/imgui/imgui_font_builder.h
diff --git a/UnleashedRecomp/gpu/imgui_snapshot.cpp b/UnleashedRecomp/gpu/imgui/imgui_snapshot.cpp
similarity index 100%
rename from UnleashedRecomp/gpu/imgui_snapshot.cpp
rename to UnleashedRecomp/gpu/imgui/imgui_snapshot.cpp
diff --git a/UnleashedRecomp/gpu/imgui_snapshot.h b/UnleashedRecomp/gpu/imgui/imgui_snapshot.h
similarity index 100%
rename from UnleashedRecomp/gpu/imgui_snapshot.h
rename to UnleashedRecomp/gpu/imgui/imgui_snapshot.h
diff --git a/UnleashedRecomp/gpu/shader/imgui_common.hlsli b/UnleashedRecomp/gpu/shader/imgui_common.hlsli
index 1e8db3d6..dbc812ec 100644
--- a/UnleashedRecomp/gpu/shader/imgui_common.hlsli
+++ b/UnleashedRecomp/gpu/shader/imgui_common.hlsli
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../imgui_common.h"
+#include "../imgui/imgui_common.h"
 
 struct PushConstants
 {
diff --git a/UnleashedRecomp/gpu/video.cpp b/UnleashedRecomp/gpu/video.cpp
index 374890c1..0f883646 100644
--- a/UnleashedRecomp/gpu/video.cpp
+++ b/UnleashedRecomp/gpu/video.cpp
@@ -1,8 +1,8 @@
 #include "video.h"
 
-#include "imgui_common.h"
-#include "imgui_snapshot.h"
-#include "imgui_font_builder.h"
+#include "imgui/imgui_common.h"
+#include "imgui/imgui_snapshot.h"
+#include "imgui/imgui_font_builder.h"
 
 #include <bc_diff.h>
 #include <cpu/code_cache.h>
diff --git a/UnleashedRecomp/ui/achievement_menu.cpp b/UnleashedRecomp/ui/achievement_menu.cpp
index 98dace2d..8fa1f50d 100644
--- a/UnleashedRecomp/ui/achievement_menu.cpp
+++ b/UnleashedRecomp/ui/achievement_menu.cpp
@@ -13,7 +13,7 @@
 #include <res/images/achievements_menu/trophy.dds.h>
 #include <res/images/common/general_window.dds.h>
 #include <res/images/common/select_fill.dds.h>
-#include <gpu/imgui_snapshot.h>
+#include <gpu/imgui/imgui_snapshot.h>
 
 constexpr double HEADER_CONTAINER_INTRO_MOTION_START = 0;
 constexpr double HEADER_CONTAINER_INTRO_MOTION_END = 15;
diff --git a/UnleashedRecomp/ui/achievement_overlay.cpp b/UnleashedRecomp/ui/achievement_overlay.cpp
index efa78207..bd2a3782 100644
--- a/UnleashedRecomp/ui/achievement_overlay.cpp
+++ b/UnleashedRecomp/ui/achievement_overlay.cpp
@@ -10,7 +10,7 @@
 #include <exports.h>
 #include <decompressor.h>
 #include <res/images/common/general_window.dds.h>
-#include <gpu/imgui_snapshot.h>
+#include <gpu/imgui/imgui_snapshot.h>
 
 constexpr double OVERLAY_CONTAINER_COMMON_MOTION_START = 0;
 constexpr double OVERLAY_CONTAINER_COMMON_MOTION_END = 11;
diff --git a/UnleashedRecomp/ui/button_guide.cpp b/UnleashedRecomp/ui/button_guide.cpp
index 88f710e4..7cbb2c10 100644
--- a/UnleashedRecomp/ui/button_guide.cpp
+++ b/UnleashedRecomp/ui/button_guide.cpp
@@ -1,6 +1,6 @@
 #include "button_guide.h"
 #include "imgui_utils.h"
-#include <gpu/imgui_snapshot.h>
+#include <gpu/imgui/imgui_snapshot.h>
 #include <gpu/video.h>
 #include <hid/hid_detail.h>
 #include <user/config.h>
diff --git a/UnleashedRecomp/ui/imgui_utils.h b/UnleashedRecomp/ui/imgui_utils.h
index dba911ea..cdb458c0 100644
--- a/UnleashedRecomp/ui/imgui_utils.h
+++ b/UnleashedRecomp/ui/imgui_utils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <gpu/imgui_common.h>
+#include <gpu/imgui/imgui_common.h>
 #include <gpu/video.h>
 #include <app.h>
 
diff --git a/UnleashedRecomp/ui/installer_wizard.cpp b/UnleashedRecomp/ui/installer_wizard.cpp
index dfb316af..8eb3474c 100644
--- a/UnleashedRecomp/ui/installer_wizard.cpp
+++ b/UnleashedRecomp/ui/installer_wizard.cpp
@@ -4,7 +4,7 @@
 
 #include <install/installer.h>
 #include <gpu/video.h>
-#include <gpu/imgui_snapshot.h>
+#include <gpu/imgui/imgui_snapshot.h>
 #include <hid/hid.h>
 #include <hid/hid_detail.h>
 #include <locale/locale.h>
diff --git a/UnleashedRecomp/ui/message_window.cpp b/UnleashedRecomp/ui/message_window.cpp
index d00f6106..081ed2ac 100644
--- a/UnleashedRecomp/ui/message_window.cpp
+++ b/UnleashedRecomp/ui/message_window.cpp
@@ -11,7 +11,7 @@
 #include <res/images/common/general_window.dds.h>
 #include <decompressor.h>
 #include <res/images/common/select_fade.dds.h>
-#include <gpu/imgui_snapshot.h>
+#include <gpu/imgui/imgui_snapshot.h>
 
 constexpr double OVERLAY_CONTAINER_COMMON_MOTION_START = 0;
 constexpr double OVERLAY_CONTAINER_COMMON_MOTION_END = 11;
diff --git a/UnleashedRecomp/ui/options_menu.cpp b/UnleashedRecomp/ui/options_menu.cpp
index 1d78fe72..f31b88aa 100644
--- a/UnleashedRecomp/ui/options_menu.cpp
+++ b/UnleashedRecomp/ui/options_menu.cpp
@@ -5,9 +5,9 @@
 #include "exports.h"
 
 #include <api/SWA/System/InputState.h>
-#include <gpu/imgui_common.h>
+#include <gpu/imgui/imgui_common.h>
 #include <gpu/video.h>
-#include <gpu/imgui_snapshot.h>
+#include <gpu/imgui/imgui_snapshot.h>
 #include <kernel/heap.h>
 #include <kernel/memory.h>
 #include <locale/locale.h>