diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 70343cf68..7cda17474 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -73,12 +73,12 @@ set(libdevilutionx_SRCS
   DiabloUI/credits_lines.cpp
   DiabloUI/diabloui.cpp
   DiabloUI/dialogs.cpp
+  DiabloUI/hero/selhero.cpp
   DiabloUI/mainmenu.cpp
+  DiabloUI/multi/selconn.cpp
+  DiabloUI/multi/selgame.cpp
   DiabloUI/progress.cpp
   DiabloUI/scrollbar.cpp
-  DiabloUI/selconn.cpp
-  DiabloUI/selgame.cpp
-  DiabloUI/selhero.cpp
   DiabloUI/selok.cpp
   DiabloUI/selstart.cpp
   DiabloUI/selyesno.cpp
diff --git a/Source/DiabloUI/selhero.cpp b/Source/DiabloUI/hero/selhero.cpp
similarity index 96%
rename from Source/DiabloUI/selhero.cpp
rename to Source/DiabloUI/hero/selhero.cpp
index 9b4ce67a1..844625bf7 100644
--- a/Source/DiabloUI/selhero.cpp
+++ b/Source/DiabloUI/hero/selhero.cpp
@@ -1,4 +1,4 @@
-#include "selhero.h"
+#include "DiabloUI/hero/selhero.h"
 
 #include <algorithm>
 #include <chrono>
@@ -8,8 +8,8 @@
 
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/dialogs.h"
+#include "DiabloUI/multi/selgame.h"
 #include "DiabloUI/scrollbar.h"
-#include "DiabloUI/selgame.h"
 #include "DiabloUI/selok.h"
 #include "DiabloUI/selyesno.h"
 #include "control.h"
diff --git a/Source/DiabloUI/selhero.h b/Source/DiabloUI/hero/selhero.h
similarity index 100%
rename from Source/DiabloUI/selhero.h
rename to Source/DiabloUI/hero/selhero.h
diff --git a/Source/DiabloUI/selconn.cpp b/Source/DiabloUI/multi/selconn.cpp
similarity index 100%
rename from Source/DiabloUI/selconn.cpp
rename to Source/DiabloUI/multi/selconn.cpp
diff --git a/Source/DiabloUI/selgame.cpp b/Source/DiabloUI/multi/selgame.cpp
similarity index 97%
rename from Source/DiabloUI/selgame.cpp
rename to Source/DiabloUI/multi/selgame.cpp
index f5e6b41dc..c8783e2ff 100644
--- a/Source/DiabloUI/selgame.cpp
+++ b/Source/DiabloUI/multi/selgame.cpp
@@ -1,11 +1,11 @@
-#include "selgame.h"
+#include "DiabloUI/multi/selgame.h"
 
 #include <fmt/format.h>
 
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/dialogs.h"
+#include "DiabloUI/hero/selhero.h"
 #include "DiabloUI/scrollbar.h"
-#include "DiabloUI/selhero.h"
 #include "DiabloUI/selok.h"
 #include "config.h"
 #include "control.h"
diff --git a/Source/DiabloUI/selgame.h b/Source/DiabloUI/multi/selgame.h
similarity index 100%
rename from Source/DiabloUI/selgame.h
rename to Source/DiabloUI/multi/selgame.h