diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e82d70e..a78486d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,14 +52,14 @@ add_executable(tomato
 	./sdl_clipboard_utils.hpp
 	./sdl_clipboard_utils.cpp
 
-	./file_selector.hpp
-	./file_selector.cpp
+	./chat_gui/file_selector.hpp
+	./chat_gui/file_selector.cpp
 
-	./send_image_popup.hpp
-	./send_image_popup.cpp
+	./chat_gui/send_image_popup.hpp
+	./chat_gui/send_image_popup.cpp
 
-	./settings_window.hpp
-	./settings_window.cpp
+	./chat_gui/settings_window.hpp
+	./chat_gui/settings_window.cpp
 
 	./tox_ui_utils.hpp
 	./tox_ui_utils.cpp
diff --git a/src/file_selector.cpp b/src/chat_gui/file_selector.cpp
similarity index 100%
rename from src/file_selector.cpp
rename to src/chat_gui/file_selector.cpp
diff --git a/src/file_selector.hpp b/src/chat_gui/file_selector.hpp
similarity index 100%
rename from src/file_selector.hpp
rename to src/chat_gui/file_selector.hpp
diff --git a/src/send_image_popup.cpp b/src/chat_gui/send_image_popup.cpp
similarity index 98%
rename from src/send_image_popup.cpp
rename to src/chat_gui/send_image_popup.cpp
index dba7bd4..555cba1 100644
--- a/src/send_image_popup.cpp
+++ b/src/chat_gui/send_image_popup.cpp
@@ -1,10 +1,10 @@
 #include "./send_image_popup.hpp"
 
-#include "./image_loader_sdl_bmp.hpp"
-#include "./image_loader_stb.hpp"
-#include "./image_loader_webp.hpp"
-#include "./image_loader_qoi.hpp"
-#include "./image_loader_sdl_image.hpp"
+#include "../image_loader_sdl_bmp.hpp"
+#include "../image_loader_stb.hpp"
+#include "../image_loader_webp.hpp"
+#include "../image_loader_qoi.hpp"
+#include "../image_loader_sdl_image.hpp"
 
 #include <imgui/imgui.h>
 
diff --git a/src/send_image_popup.hpp b/src/chat_gui/send_image_popup.hpp
similarity index 96%
rename from src/send_image_popup.hpp
rename to src/chat_gui/send_image_popup.hpp
index 2e5f000..1465b79 100644
--- a/src/send_image_popup.hpp
+++ b/src/chat_gui/send_image_popup.hpp
@@ -5,8 +5,8 @@
 #include <memory>
 #include <vector>
 
-#include "./image_loader.hpp"
-#include "./texture_cache.hpp"
+#include "../image_loader.hpp"
+#include "../texture_cache.hpp"
 
 struct SendImagePopup {
 	TextureUploaderI& _tu;
diff --git a/src/settings_window.cpp b/src/chat_gui/settings_window.cpp
similarity index 100%
rename from src/settings_window.cpp
rename to src/chat_gui/settings_window.cpp
diff --git a/src/settings_window.hpp b/src/chat_gui/settings_window.hpp
similarity index 100%
rename from src/settings_window.hpp
rename to src/chat_gui/settings_window.hpp
diff --git a/src/chat_gui4.cpp b/src/chat_gui4.cpp
index aa9c2e5..571e8dc 100644
--- a/src/chat_gui4.cpp
+++ b/src/chat_gui4.cpp
@@ -1,7 +1,5 @@
 #include "./chat_gui4.hpp"
 
-#include "./file_selector.hpp"
-
 #include <solanaceae/message3/components.hpp>
 #include <solanaceae/tox_messages/components.hpp>
 #include <solanaceae/contact/components.hpp>
diff --git a/src/chat_gui4.hpp b/src/chat_gui4.hpp
index 9de29e2..645c692 100644
--- a/src/chat_gui4.hpp
+++ b/src/chat_gui4.hpp
@@ -7,8 +7,8 @@
 #include "./texture_cache.hpp"
 #include "./tox_avatar_loader.hpp"
 #include "./message_image_loader.hpp"
-#include "./file_selector.hpp"
-#include "./send_image_popup.hpp"
+#include "./chat_gui/file_selector.hpp"
+#include "./chat_gui/send_image_popup.hpp"
 
 #include <entt/container/dense_map.hpp>
 
diff --git a/src/main_screen.hpp b/src/main_screen.hpp
index fbda690..5d6f29e 100644
--- a/src/main_screen.hpp
+++ b/src/main_screen.hpp
@@ -28,7 +28,7 @@
 #include "./message_image_loader.hpp"
 
 #include "./chat_gui4.hpp"
-#include "./settings_window.hpp"
+#include "./chat_gui/settings_window.hpp"
 #include "./tox_ui_utils.hpp"
 #include "./tox_dht_cap_histo.hpp"
 #include "./tox_friend_faux_offline_messaging.hpp"
diff --git a/src/start_screen.hpp b/src/start_screen.hpp
index 429a501..77fc570 100644
--- a/src/start_screen.hpp
+++ b/src/start_screen.hpp
@@ -2,7 +2,7 @@
 
 #include "./screen.hpp"
 
-#include "./file_selector.hpp"
+#include "./chat_gui/file_selector.hpp"
 
 #include <vector>
 #include <string>