diff --git a/CMakeLists.txt b/CMakeLists.txt
index 212e5b60f..a28abbc7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,16 +211,7 @@ add_library(PKWare STATIC
   3rdParty/PKWare/explode.cpp
   3rdParty/PKWare/implode.cpp)
 
-set(SourceS_SRCS
-  SourceS/console.cpp
-  SourceS/paths.cpp
-)
-if(USE_SDL1)
-  list(APPEND SourceS_SRCS SourceS/sdl2_to_1_2_backports.cpp)
-endif()
-add_library(SourceS STATIC ${SourceS_SRCS})
-
-add_library(devilution STATIC
+set(devilutionx_SRCS
   Source/appfat.cpp
   Source/automap.cpp
   Source/capture.cpp
@@ -235,8 +226,8 @@ add_library(devilution STATIC
   Source/drlg_l2.cpp
   Source/drlg_l3.cpp
   Source/drlg_l4.cpp
-  Source/dx.cpp
   Source/dthread.cpp
+  Source/dx.cpp
   Source/effects.cpp
   Source/encrypt.cpp
   Source/engine.cpp
@@ -252,6 +243,7 @@ add_library(devilution STATIC
   Source/items.cpp
   Source/lighting.cpp
   Source/loadsave.cpp
+  Source/main.cpp
   Source/mainmenu.cpp
   Source/minitext.cpp
   Source/misdat.cpp
@@ -272,6 +264,7 @@ add_library(devilution STATIC
   Source/player.cpp
   Source/plrmsg.cpp
   Source/portal.cpp
+  Source/qol.cpp
   Source/quests.cpp
   Source/render.cpp
   Source/restrict.cpp
@@ -289,96 +282,98 @@ add_library(devilution STATIC
   Source/town.cpp
   Source/towners.cpp
   Source/track.cpp
-  Source/trigs.cpp)
-
-set(devilutionx_SRCS
-  SourceX/qol.cpp
-  SourceX/controls/devices/game_controller.cpp
-  SourceX/controls/devices/joystick.cpp
-  SourceX/controls/devices/kbcontroller.cpp
-  SourceX/controls/axis_direction.cpp
-  SourceX/controls/controller.cpp
-  SourceX/controls/controller_motion.cpp
-  SourceX/controls/game_controls.cpp
-  SourceX/controls/menu_controls.cpp
-  SourceX/controls/modifier_hints.cpp
-  SourceX/controls/plrctrls.cpp
-  SourceX/controls/touch.cpp
-  SourceX/display.cpp
-  SourceX/miniwin/misc_msg.cpp
-  SourceX/thread.cpp
-  SourceX/soundsample.cpp
-  SourceX/storm_sdl_rw.cpp
-  SourceX/storm/storm.cpp
-  SourceX/storm/storm_net.cpp
-  SourceX/dvlnet/abstract_net.cpp
-  SourceX/dvlnet/loopback.cpp
-  SourceX/dvlnet/packet.cpp
-  SourceX/dvlnet/base.cpp
-  SourceX/dvlnet/frame_queue.cpp
-  SourceX/dvlnet/cdwrap.cpp
-  SourceX/DiabloUI/art_draw.cpp
-  SourceX/DiabloUI/errorart.cpp
-  SourceX/DiabloUI/art.cpp
-  SourceX/DiabloUI/button.cpp
-  SourceX/DiabloUI/credits.cpp
-  SourceX/DiabloUI/credits_lines.cpp
-  SourceX/DiabloUI/support_lines.cpp
-  SourceX/DiabloUI/diabloui.cpp
-  SourceX/DiabloUI/dialogs.cpp
-  SourceX/DiabloUI/fonts.cpp
-  SourceX/DiabloUI/mainmenu.cpp
-  SourceX/DiabloUI/progress.cpp
-  SourceX/DiabloUI/scrollbar.cpp
-  SourceX/DiabloUI/selconn.cpp
-  SourceX/DiabloUI/selgame.cpp
-  SourceX/DiabloUI/selhero.cpp
-  SourceX/DiabloUI/selyesno.cpp
-  SourceX/DiabloUI/selok.cpp
-  SourceX/DiabloUI/text_draw.cpp
-  SourceX/DiabloUI/text.cpp
-  SourceX/DiabloUI/title.cpp
-  SourceX/DiabloUI/ttf_render_wrapped.cpp
-  SourceX/main.cpp
-  SourceX/devilutionx.exe.manifest
+  Source/trigs.cpp
+  Source/controls/axis_direction.cpp
+  Source/controls/controller.cpp
+  Source/controls/controller_motion.cpp
+  Source/controls/devices/game_controller.cpp
+  Source/controls/devices/joystick.cpp
+  Source/controls/devices/kbcontroller.cpp
+  Source/controls/game_controls.cpp
+  Source/controls/menu_controls.cpp
+  Source/controls/modifier_hints.cpp
+  Source/controls/plrctrls.cpp
+  Source/controls/touch.cpp
+  Source/utils/console.cpp
+  Source/utils/display.cpp
+  Source/utils/paths.cpp
+  Source/utils/soundsample.cpp
+  Source/utils/thread.cpp
+  Source/DiabloUI/art.cpp
+  Source/DiabloUI/art_draw.cpp
+  Source/DiabloUI/button.cpp
+  Source/DiabloUI/credits.cpp
+  Source/DiabloUI/credits_lines.cpp
+  Source/DiabloUI/diabloui.cpp
+  Source/DiabloUI/dialogs.cpp
+  Source/DiabloUI/errorart.cpp
+  Source/DiabloUI/fonts.cpp
+  Source/DiabloUI/mainmenu.cpp
+  Source/DiabloUI/progress.cpp
+  Source/DiabloUI/scrollbar.cpp
+  Source/DiabloUI/selconn.cpp
+  Source/DiabloUI/selgame.cpp
+  Source/DiabloUI/selhero.cpp
+  Source/DiabloUI/selok.cpp
+  Source/DiabloUI/selyesno.cpp
+  Source/DiabloUI/support_lines.cpp
+  Source/DiabloUI/text.cpp
+  Source/DiabloUI/text_draw.cpp
+  Source/DiabloUI/title.cpp
+  Source/DiabloUI/ttf_render_wrapped.cpp
+  Source/dvlnet/abstract_net.cpp
+  Source/dvlnet/base.cpp
+  Source/dvlnet/cdwrap.cpp
+  Source/dvlnet/frame_queue.cpp
+  Source/dvlnet/loopback.cpp
+  Source/dvlnet/packet.cpp
+  Source/storm/storm.cpp
+  Source/storm/storm_net.cpp
+  Source/storm/storm_sdl_rw.cpp
+  Source/miniwin/misc_msg.cpp
+  Source/devilutionx.exe.manifest
   Packaging/macOS/AppIcon.icns
   Packaging/resources/CharisSILB.ttf
   Packaging/windows/devilutionx.rc)
 
+if(USE_SDL1)
+  list(APPEND devilutionx_SRCS Source/utils/sdl2_to_1_2_backports.cpp)
+endif()
+
 if(NOT NONET)
   list(APPEND devilutionx_SRCS
-    SourceX/dvlnet/tcp_client.cpp
-    SourceX/dvlnet/tcp_server.cpp
-    SourceX/dvlnet/protocol_zt.cpp
-    SourceX/dvlnet/base_protocol.cpp
-    SourceX/dvlnet/zerotier_native.cpp
-    SourceX/dvlnet/zerotier_lwip.cpp)
+    Source/dvlnet/tcp_client.cpp
+    Source/dvlnet/tcp_server.cpp
+    Source/dvlnet/protocol_zt.cpp
+    Source/dvlnet/base_protocol.cpp
+    Source/dvlnet/zerotier_native.cpp
+    Source/dvlnet/zerotier_lwip.cpp)
 endif()
 
 set(BIN_TARGET devilutionx)
 
 if(SWITCH)
   list(APPEND devilutionx_SRCS
-    SourceX/platform/switch/network.cpp
-    SourceX/platform/switch/keyboard.cpp
-    SourceX/platform/switch/docking.cpp)
+    Source/platform/switch/network.cpp
+    Source/platform/switch/keyboard.cpp
+    Source/platform/switch/docking.cpp)
   set(BIN_TARGET devilutionx.elf)
 endif()
 
 if(VITA)
   list(APPEND devilutionx_SRCS
-    SourceX/platform/vita/keyboard.cpp)
+    Source/platform/vita/keyboard.cpp)
 endif()
 
 if(VITA)
   list(APPEND devilutionx_SRCS
-    SourceX/platform/vita/keyboard.cpp)
+    Source/platform/vita/keyboard.cpp)
 endif()
 
 if(N3DS)
   list(APPEND devilutionx_SRCS
-    SourceX/platform/ctr/system.cpp
-    SourceX/platform/ctr/keyboard.cpp)
+    Source/platform/ctr/system.cpp
+    Source/platform/ctr/keyboard.cpp)
   set(BIN_TARGET ${BIN_TARGET}.elf)
 endif()
 
@@ -419,7 +414,6 @@ file(COPY "Packaging/resources/devilutionx.mpq" DESTINATION "${CMAKE_CURRENT_BIN
 get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if(is_multi_config)
   set(CONFIG_PATH $<CONFIG>/config.h)
-  target_include_directories(devilution PRIVATE ${CMAKE_BINARY_DIR}/$<CONFIG>)
   target_include_directories(${BIN_TARGET} PRIVATE ${CMAKE_BINARY_DIR}/$<CONFIG>)
 else()
   set(CONFIG_PATH config.h)
@@ -447,26 +441,20 @@ if(GPERF)
   find_package(Gperftools REQUIRED)
 endif()
 
-target_include_directories(devilution PUBLIC 3rdParty/PKWare Source SourceS SourceX ${CMAKE_CURRENT_BINARY_DIR})
 target_include_directories(${BIN_TARGET} PRIVATE
-  SourceS
-  SourceX
+  Source
+  3rdParty/PKWare
   3rdParty/asio/include
   3rdParty/Radon/Radon/include
-  3rdParty/libsmacker)
+  3rdParty/libsmacker
+  ${CMAKE_CURRENT_BINARY_DIR})
 
-if(N3DS)
-  target_link_libraries(devilution PUBLIC
-  SourceS)
-else()
-  target_link_libraries(devilution PUBLIC
-  Threads::Threads
-  SourceS)
+if(NOT N3DS)
+  target_link_libraries(${BIN_TARGET} PUBLIC
+  Threads::Threads)
 endif()
 
 target_link_libraries(${BIN_TARGET} PRIVATE
-  devilution
-  SourceS
   PKWare
   StormLib
   smacker
@@ -477,7 +465,7 @@ if(NOT NONET)
 endif()
 
 genex_for_option(DEBUG)
-target_compile_definitions(devilution PUBLIC "$<${DEBUG_GENEX}:_DEBUG>")
+target_compile_definitions(${BIN_TARGET} PUBLIC "$<${DEBUG_GENEX}:_DEBUG>")
 target_compile_definitions(${BIN_TARGET} PRIVATE ASIO_STANDALONE)
 
 # Defines without value
@@ -556,81 +544,79 @@ endforeach(def_name)
 
 genex_for_option(ASAN)
 genex_for_option(UBSAN)
-foreach(target devilution ${BIN_TARGET} SourceS)
-  target_compile_options(${target} PUBLIC "$<${ASAN_GENEX}:-fsanitize=address;-fsanitize-recover=address>")
-  target_link_libraries(${target} PUBLIC "$<${ASAN_GENEX}:-fsanitize=address;-fsanitize-recover=address>")
-  target_compile_options(${target} PUBLIC $<${UBSAN_GENEX}:-fsanitize=undefined>)
-  target_link_libraries(${target} PUBLIC $<${UBSAN_GENEX}:-fsanitize=undefined>)
-
-  if(USE_SDL1)
-    target_link_libraries(${target} PRIVATE
-      ${SDL_TTF_LIBRARY}
-      ${SDL_MIXER_LIBRARY}
-      ${SDL_LIBRARY})
-    target_compile_definitions(${target} PRIVATE USE_SDL1)
-  else()
-    target_link_libraries(${target} PRIVATE
-      SDL2::SDL2
-      SDL2::SDL2main
-      SDL2::SDL2_ttf
-      SDL2::SDL2_mixer)
-  endif()
+target_compile_options(${BIN_TARGET} PUBLIC "$<${ASAN_GENEX}:-fsanitize=address;-fsanitize-recover=address>")
+target_link_libraries(${BIN_TARGET} PUBLIC "$<${ASAN_GENEX}:-fsanitize=address;-fsanitize-recover=address>")
+target_compile_options(${BIN_TARGET} PUBLIC $<${UBSAN_GENEX}:-fsanitize=undefined>)
+target_link_libraries(${BIN_TARGET} PUBLIC $<${UBSAN_GENEX}:-fsanitize=undefined>)
 
-  if(SWITCH)
-    target_link_libraries(${target} PRIVATE switch::libnx
-      -lfreetype -lvorbisfile -lvorbis -logg -lmodplug -lmpg123 -lSDL2 -lopusfile -lopus -lEGL -lglapi -ldrm_nouveau -lpng -lbz2 -lz -lnx)
-  endif()
+if(USE_SDL1)
+  target_link_libraries(${BIN_TARGET} PRIVATE
+    ${SDL_TTF_LIBRARY}
+    ${SDL_MIXER_LIBRARY}
+    ${SDL_LIBRARY})
+  target_compile_definitions(${BIN_TARGET} PRIVATE USE_SDL1)
+else()
+  target_link_libraries(${BIN_TARGET} PRIVATE
+    SDL2::SDL2
+    SDL2::SDL2main
+    SDL2::SDL2_ttf
+    SDL2::SDL2_mixer)
+endif()
 
-  if(AMIGA)
-    target_link_libraries(${target} PRIVATE
-      ${FREETYPE_LIBRARY}
-      ${ZLIB_LIBRARY})
-    if(NOT WARPOS)
-      target_link_libraries(${target} PRIVATE -ldebug)
-    endif()
-  endif()
+if(SWITCH)
+  target_link_libraries(${BIN_TARGET} PRIVATE switch::libnx
+    -lfreetype -lvorbisfile -lvorbis -logg -lmodplug -lmpg123 -lSDL2 -lopusfile -lopus -lEGL -lglapi -ldrm_nouveau -lpng -lbz2 -lz -lnx)
+endif()
 
-  if (VITA)
-    target_link_libraries(${target} PRIVATE
-          SceAppMgr_stub
-          SceAudio_stub
-          SceCommonDialog_stub
-          SceCtrl_stub
-          SceDisplay_stub
-          SceGxm_stub
-          SceHid_stub
-          SceIofilemgr_stub
-          SceMotion_stub
-          ScePower_stub
-          SceSysmodule_stub
-          SceTouch_stub
-          freetype
-          png
-          m
-          z
-          FLAC
-          vorbisfile
-          vorbis
-          ogg
-          mikmod
-          mpg123
-    )
-    target_compile_definitions(${target} PRIVATE VITA)
+if(AMIGA)
+  target_link_libraries(${BIN_TARGET} PRIVATE
+    ${FREETYPE_LIBRARY}
+    ${ZLIB_LIBRARY})
+  if(NOT WARPOS)
+    target_link_libraries(${BIN_TARGET} PRIVATE -ldebug)
   endif()
+endif()
 
-  if(N3DS)
-    target_link_libraries(${target} PRIVATE ${TREMOR_LIBRARIES})
-    target_include_directories(${target} PRIVATE ${TREMOR_INCLUDE_DIRS})
-    target_link_libraries(${target} PRIVATE 3ds::ogg 3ds::mikmod 3ds::mad 3ds::freetype 3ds::bzip2 3ds::png)
-    target_link_libraries(${target} PRIVATE 3ds::citro3d 3ds::ctrulib)
-  endif()
+if (VITA)
+  target_link_libraries(${BIN_TARGET} PRIVATE
+        SceAppMgr_stub
+        SceAudio_stub
+        SceCommonDialog_stub
+        SceCtrl_stub
+        SceDisplay_stub
+        SceGxm_stub
+        SceHid_stub
+        SceIofilemgr_stub
+        SceMotion_stub
+        ScePower_stub
+        SceSysmodule_stub
+        SceTouch_stub
+        freetype
+        png
+        m
+        z
+        FLAC
+        vorbisfile
+        vorbis
+        ogg
+        mikmod
+        mpg123
+  )
+  target_compile_definitions(${BIN_TARGET} PRIVATE VITA)
+endif()
+
+if(N3DS)
+  target_link_libraries(${BIN_TARGET} PRIVATE ${TREMOR_LIBRARIES})
+  target_include_directories(${BIN_TARGET} PRIVATE ${TREMOR_INCLUDE_DIRS})
+  target_link_libraries(${BIN_TARGET} PRIVATE 3ds::ogg 3ds::mikmod 3ds::mad 3ds::freetype 3ds::bzip2 3ds::png)
+  target_link_libraries(${BIN_TARGET} PRIVATE 3ds::citro3d 3ds::ctrulib)
+endif()
 
-  target_compile_definitions(${target} PRIVATE ${def_list})
+target_compile_definitions(${BIN_TARGET} PRIVATE ${def_list})
 
-  if (GPERF)
-    target_link_libraries(${target} PRIVATE ${GPERFTOOLS_LIBRARIES})
-  endif()
-endforeach(target)
+if (GPERF)
+  target_link_libraries(${BIN_TARGET} PRIVATE ${GPERFTOOLS_LIBRARIES})
+endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND NOT HAIKU AND NOT VITA)
   target_link_libraries(${BIN_TARGET} PUBLIC "$<$<NOT:$<CONFIG:Debug>>:-static-libgcc;-static-libstdc++>")
@@ -640,7 +626,7 @@ if(WIN32)
   target_link_libraries(${BIN_TARGET} PRIVATE wsock32 ws2_32 wininet)
 
   if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    target_compile_options(devilution PUBLIC $<$<CONFIG:Debug>:-gstabs>)
+    target_compile_options(${BIN_TARGET} PUBLIC $<$<CONFIG:Debug>:-gstabs>)
   endif()
 endif()
 
@@ -655,8 +641,8 @@ endif()
 
 if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   # Change __FILE__ to only show the path relative to the project folder
-  get_target_property(devilution_SRCS devilution SOURCES)
-  foreach(SOURCE_FILE ${devilution_SRCS} ${devilutionx_SRCS})
+  get_target_property(devilutionx_SRCS ${BIN_TARGET} SOURCES)
+  foreach(SOURCE_FILE ${devilutionx_SRCS})
     set_source_files_properties(${SOURCE_FILE} PROPERTIES
       COMPILE_DEFINITIONS __FILE__="${SOURCE_FILE}"
     )
@@ -666,18 +652,17 @@ if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
 
   # Note: For Valgrind support.
   genex_for_option(DEBUG)
-  target_compile_options(devilution PUBLIC $<${DEBUG_GENEX}:-fno-omit-frame-pointer>)
+  target_compile_options(${BIN_TARGET} PUBLIC $<${DEBUG_GENEX}:-fno-omit-frame-pointer>)
 
   # Warnings for devilutionX
   target_compile_options(${BIN_TARGET} PRIVATE -Wall -Wextra -Wno-unused-parameter)
 
   # For ARM and other default unsigned char platforms
-  target_compile_options(devilution PRIVATE -fsigned-char)
   target_compile_options(${BIN_TARGET} PRIVATE -fsigned-char)
 endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-  target_compile_options(devilution PRIVATE "/W0")
+  target_compile_options(${BIN_TARGET} PRIVATE "/W0")
 endif()
 
 if(APPLE)
diff --git a/.clang-tidy b/Source/.clang-tidy
similarity index 100%
rename from .clang-tidy
rename to Source/.clang-tidy
diff --git a/SourceX/DiabloUI/art.cpp b/Source/DiabloUI/art.cpp
similarity index 92%
rename from SourceX/DiabloUI/art.cpp
rename to Source/DiabloUI/art.cpp
index 829c94e5a..949455589 100644
--- a/SourceX/DiabloUI/art.cpp
+++ b/Source/DiabloUI/art.cpp
@@ -1,7 +1,7 @@
 #include "DiabloUI/art.h"
-#include "display.h"
 #include "storm/storm.h"
-#include "sdl_compat.h"
+#include "utils/display.h"
+#include "utils/sdl_compat.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/art.h b/Source/DiabloUI/art.h
similarity index 91%
rename from SourceX/DiabloUI/art.h
rename to Source/DiabloUI/art.h
index 7a97e4e31..fd6f3cd13 100644
--- a/SourceX/DiabloUI/art.h
+++ b/Source/DiabloUI/art.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "sdl_ptrs.h"
 #include "storm/storm.h"
+#include "utils/sdl_ptrs.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/art_draw.cpp b/Source/DiabloUI/art_draw.cpp
similarity index 94%
rename from SourceX/DiabloUI/art_draw.cpp
rename to Source/DiabloUI/art_draw.cpp
index d046f47f3..9dc11c04b 100644
--- a/SourceX/DiabloUI/art_draw.cpp
+++ b/Source/DiabloUI/art_draw.cpp
@@ -1,9 +1,9 @@
 #include "DiabloUI/art_draw.h"
 
 #include "DiabloUI/diabloui.h"
-#include "display.h"
 #include "render.h"
-#include "sdl_compat.h"
+#include "utils/display.h"
+#include "utils/sdl_compat.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/art_draw.h b/Source/DiabloUI/art_draw.h
similarity index 100%
rename from SourceX/DiabloUI/art_draw.h
rename to Source/DiabloUI/art_draw.h
diff --git a/SourceX/DiabloUI/button.cpp b/Source/DiabloUI/button.cpp
similarity index 93%
rename from SourceX/DiabloUI/button.cpp
rename to Source/DiabloUI/button.cpp
index ac17997e1..4985bc2bd 100644
--- a/SourceX/DiabloUI/button.cpp
+++ b/Source/DiabloUI/button.cpp
@@ -1,8 +1,8 @@
-#include "DiabloUI/button.h"
 #include "DiabloUI/art_draw.h"
-#include "DiabloUI/text_draw.h"
+#include "DiabloUI/button.h"
 #include "DiabloUI/errorart.h"
-#include "display.h"
+#include "DiabloUI/text_draw.h"
+#include "utils/display.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/button.h b/Source/DiabloUI/button.h
similarity index 100%
rename from SourceX/DiabloUI/button.h
rename to Source/DiabloUI/button.h
diff --git a/SourceX/DiabloUI/credits.cpp b/Source/DiabloUI/credits.cpp
similarity index 94%
rename from SourceX/DiabloUI/credits.cpp
rename to Source/DiabloUI/credits.cpp
index bbde7348a..bc3e0c101 100644
--- a/SourceX/DiabloUI/credits.cpp
+++ b/Source/DiabloUI/credits.cpp
@@ -10,9 +10,9 @@
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/fonts.h"
 #include "DiabloUI/support_lines.h"
-#include "display.h"
-#include "sdl_compat.h"
-#include "sdl_ptrs.h"
+#include "utils/display.h"
+#include "utils/sdl_compat.h"
+#include "utils/sdl_ptrs.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/credits_lines.cpp b/Source/DiabloUI/credits_lines.cpp
similarity index 100%
rename from SourceX/DiabloUI/credits_lines.cpp
rename to Source/DiabloUI/credits_lines.cpp
diff --git a/SourceX/DiabloUI/credits_lines.h b/Source/DiabloUI/credits_lines.h
similarity index 100%
rename from SourceX/DiabloUI/credits_lines.h
rename to Source/DiabloUI/credits_lines.h
diff --git a/SourceX/DiabloUI/diabloui.cpp b/Source/DiabloUI/diabloui.cpp
similarity index 95%
rename from SourceX/DiabloUI/diabloui.cpp
rename to Source/DiabloUI/diabloui.cpp
index b24344b50..6c52e2740 100644
--- a/SourceX/DiabloUI/diabloui.cpp
+++ b/Source/DiabloUI/diabloui.cpp
@@ -11,14 +11,14 @@
 #include "DiabloUI/fonts.h"
 #include "DiabloUI/scrollbar.h"
 #include "DiabloUI/text_draw.h"
-#include "display.h"
 #include "dx.h"
 #include "palette.h"
-#include "sdl_compat.h"
-#include "sdl_ptrs.h"
 #include "storm/storm.h"
-#include "stubs.h"
-#include "utf8.h"
+#include "utils/display.h"
+#include "utils/sdl_compat.h"
+#include "utils/sdl_ptrs.h"
+#include "utils/stubs.h"
+#include "utils/utf8.h"
 
 #ifdef __SWITCH__
 // for virtual keyboard on Switch
diff --git a/SourceX/DiabloUI/diabloui.h b/Source/DiabloUI/diabloui.h
similarity index 96%
rename from SourceX/DiabloUI/diabloui.h
rename to Source/DiabloUI/diabloui.h
index 25abb5d58..2698f907d 100644
--- a/SourceX/DiabloUI/diabloui.h
+++ b/Source/DiabloUI/diabloui.h
@@ -7,8 +7,8 @@
 
 #include "DiabloUI/art.h"
 #include "DiabloUI/ui_item.h"
-#include "display.h"
 #include "player.h"
+#include "utils/display.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/dialogs.cpp b/Source/DiabloUI/dialogs.cpp
similarity index 96%
rename from SourceX/DiabloUI/dialogs.cpp
rename to Source/DiabloUI/dialogs.cpp
index 98c31dbcc..b751561a8 100644
--- a/SourceX/DiabloUI/dialogs.cpp
+++ b/Source/DiabloUI/dialogs.cpp
@@ -6,9 +6,9 @@
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/errorart.h"
 #include "DiabloUI/fonts.h"
-#include "display.h"
 #include "dx.h"
 #include "palette.h"
+#include "utils/display.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/dialogs.h b/Source/DiabloUI/dialogs.h
similarity index 100%
rename from SourceX/DiabloUI/dialogs.h
rename to Source/DiabloUI/dialogs.h
diff --git a/SourceX/DiabloUI/errorart.cpp b/Source/DiabloUI/errorart.cpp
similarity index 100%
rename from SourceX/DiabloUI/errorart.cpp
rename to Source/DiabloUI/errorart.cpp
diff --git a/SourceX/DiabloUI/errorart.h b/Source/DiabloUI/errorart.h
similarity index 100%
rename from SourceX/DiabloUI/errorart.h
rename to Source/DiabloUI/errorart.h
diff --git a/SourceX/DiabloUI/fonts.cpp b/Source/DiabloUI/fonts.cpp
similarity index 94%
rename from SourceX/DiabloUI/fonts.cpp
rename to Source/DiabloUI/fonts.cpp
index 18a9facaa..558521bcb 100644
--- a/SourceX/DiabloUI/fonts.cpp
+++ b/Source/DiabloUI/fonts.cpp
@@ -1,8 +1,8 @@
 #include "DiabloUI/fonts.h"
 
 #include "diablo.h"
-#include "file_util.h"
-#include "paths.h"
+#include "utils/file_util.h"
+#include "utils/paths.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/fonts.h b/Source/DiabloUI/fonts.h
similarity index 100%
rename from SourceX/DiabloUI/fonts.h
rename to Source/DiabloUI/fonts.h
diff --git a/SourceX/DiabloUI/mainmenu.cpp b/Source/DiabloUI/mainmenu.cpp
similarity index 100%
rename from SourceX/DiabloUI/mainmenu.cpp
rename to Source/DiabloUI/mainmenu.cpp
diff --git a/SourceX/DiabloUI/progress.cpp b/Source/DiabloUI/progress.cpp
similarity index 94%
rename from SourceX/DiabloUI/progress.cpp
rename to Source/DiabloUI/progress.cpp
index 690937457..0a756eaf0 100644
--- a/SourceX/DiabloUI/progress.cpp
+++ b/Source/DiabloUI/progress.cpp
@@ -4,9 +4,9 @@
 #include "DiabloUI/button.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/fonts.h"
-#include "display.h"
 #include "dx.h"
 #include "palette.h"
+#include "utils/display.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/scrollbar.cpp b/Source/DiabloUI/scrollbar.cpp
similarity index 100%
rename from SourceX/DiabloUI/scrollbar.cpp
rename to Source/DiabloUI/scrollbar.cpp
diff --git a/SourceX/DiabloUI/scrollbar.h b/Source/DiabloUI/scrollbar.h
similarity index 100%
rename from SourceX/DiabloUI/scrollbar.h
rename to Source/DiabloUI/scrollbar.h
diff --git a/SourceX/DiabloUI/selconn.cpp b/Source/DiabloUI/selconn.cpp
similarity index 100%
rename from SourceX/DiabloUI/selconn.cpp
rename to Source/DiabloUI/selconn.cpp
diff --git a/SourceX/DiabloUI/selconn.h b/Source/DiabloUI/selconn.h
similarity index 100%
rename from SourceX/DiabloUI/selconn.h
rename to Source/DiabloUI/selconn.h
diff --git a/SourceX/DiabloUI/selgame.cpp b/Source/DiabloUI/selgame.cpp
similarity index 100%
rename from SourceX/DiabloUI/selgame.cpp
rename to Source/DiabloUI/selgame.cpp
diff --git a/SourceX/DiabloUI/selgame.h b/Source/DiabloUI/selgame.h
similarity index 100%
rename from SourceX/DiabloUI/selgame.h
rename to Source/DiabloUI/selgame.h
diff --git a/SourceX/DiabloUI/selhero.cpp b/Source/DiabloUI/selhero.cpp
similarity index 100%
rename from SourceX/DiabloUI/selhero.cpp
rename to Source/DiabloUI/selhero.cpp
diff --git a/SourceX/DiabloUI/selhero.h b/Source/DiabloUI/selhero.h
similarity index 100%
rename from SourceX/DiabloUI/selhero.h
rename to Source/DiabloUI/selhero.h
diff --git a/SourceX/DiabloUI/selok.cpp b/Source/DiabloUI/selok.cpp
similarity index 100%
rename from SourceX/DiabloUI/selok.cpp
rename to Source/DiabloUI/selok.cpp
diff --git a/SourceX/DiabloUI/selok.h b/Source/DiabloUI/selok.h
similarity index 100%
rename from SourceX/DiabloUI/selok.h
rename to Source/DiabloUI/selok.h
diff --git a/SourceX/DiabloUI/selyesno.cpp b/Source/DiabloUI/selyesno.cpp
similarity index 100%
rename from SourceX/DiabloUI/selyesno.cpp
rename to Source/DiabloUI/selyesno.cpp
diff --git a/SourceX/DiabloUI/selyesno.h b/Source/DiabloUI/selyesno.h
similarity index 100%
rename from SourceX/DiabloUI/selyesno.h
rename to Source/DiabloUI/selyesno.h
diff --git a/SourceX/DiabloUI/support_lines.cpp b/Source/DiabloUI/support_lines.cpp
similarity index 100%
rename from SourceX/DiabloUI/support_lines.cpp
rename to Source/DiabloUI/support_lines.cpp
diff --git a/SourceX/DiabloUI/support_lines.h b/Source/DiabloUI/support_lines.h
similarity index 100%
rename from SourceX/DiabloUI/support_lines.h
rename to Source/DiabloUI/support_lines.h
diff --git a/SourceX/DiabloUI/text.cpp b/Source/DiabloUI/text.cpp
similarity index 100%
rename from SourceX/DiabloUI/text.cpp
rename to Source/DiabloUI/text.cpp
diff --git a/SourceX/DiabloUI/text.h b/Source/DiabloUI/text.h
similarity index 100%
rename from SourceX/DiabloUI/text.h
rename to Source/DiabloUI/text.h
diff --git a/SourceX/DiabloUI/text_draw.cpp b/Source/DiabloUI/text_draw.cpp
similarity index 95%
rename from SourceX/DiabloUI/text_draw.cpp
rename to Source/DiabloUI/text_draw.cpp
index e212759de..6253f651e 100644
--- a/SourceX/DiabloUI/text_draw.cpp
+++ b/Source/DiabloUI/text_draw.cpp
@@ -4,9 +4,9 @@
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/fonts.h"
 #include "DiabloUI/text.h"
-#include "DiabloUI/ui_item.h"
 #include "DiabloUI/ttf_render_wrapped.h"
-#include "display.h"
+#include "DiabloUI/ui_item.h"
+#include "utils/display.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/text_draw.h b/Source/DiabloUI/text_draw.h
similarity index 90%
rename from SourceX/DiabloUI/text_draw.h
rename to Source/DiabloUI/text_draw.h
index b97ca22fd..9070ba5e2 100644
--- a/SourceX/DiabloUI/text_draw.h
+++ b/Source/DiabloUI/text_draw.h
@@ -2,7 +2,7 @@
 
 #include <SDL.h>
 
-#include "sdl_ptrs.h"
+#include "utils/sdl_ptrs.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/title.cpp b/Source/DiabloUI/title.cpp
similarity index 100%
rename from SourceX/DiabloUI/title.cpp
rename to Source/DiabloUI/title.cpp
diff --git a/SourceX/DiabloUI/ttf_render_wrapped.cpp b/Source/DiabloUI/ttf_render_wrapped.cpp
similarity index 93%
rename from SourceX/DiabloUI/ttf_render_wrapped.cpp
rename to Source/DiabloUI/ttf_render_wrapped.cpp
index d014667ba..cc0950120 100644
--- a/SourceX/DiabloUI/ttf_render_wrapped.cpp
+++ b/Source/DiabloUI/ttf_render_wrapped.cpp
@@ -5,12 +5,12 @@
 
 #include <SDL.h>
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #else
-#include "sdl2_backports.h"
+#include "utils/sdl2_backports.h"
 #endif
 
-#include "sdl_compat.h"
+#include "utils/sdl_compat.h"
 
 namespace devilution {
 
diff --git a/SourceX/DiabloUI/ttf_render_wrapped.h b/Source/DiabloUI/ttf_render_wrapped.h
similarity index 100%
rename from SourceX/DiabloUI/ttf_render_wrapped.h
rename to Source/DiabloUI/ttf_render_wrapped.h
diff --git a/SourceX/DiabloUI/ui_item.h b/Source/DiabloUI/ui_item.h
similarity index 94%
rename from SourceX/DiabloUI/ui_item.h
rename to Source/DiabloUI/ui_item.h
index b89350eb0..9886e8a91 100644
--- a/SourceX/DiabloUI/ui_item.h
+++ b/Source/DiabloUI/ui_item.h
@@ -5,10 +5,9 @@
 #include <string>
 #include <vector>
 
-#include "stubs.h"
-
 #include "DiabloUI/art.h"
 #include "DiabloUI/text_draw.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 
diff --git a/Source/appfat.cpp b/Source/appfat.cpp
index 18fa411a8..bcd578c87 100644
--- a/Source/appfat.cpp
+++ b/Source/appfat.cpp
@@ -8,7 +8,7 @@
 
 #include "diablo.h"
 #include "storm/storm.h"
-#include "ui_fwd.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 
diff --git a/Source/appfat.h b/Source/appfat.h
index b1d99e24c..16c6c4c26 100644
--- a/Source/appfat.h
+++ b/Source/appfat.h
@@ -7,7 +7,7 @@
 
 #include <SDL.h>
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/automap.cpp b/Source/automap.cpp
index 821bc1558..c6756bc36 100644
--- a/Source/automap.cpp
+++ b/Source/automap.cpp
@@ -5,13 +5,13 @@
  */
 #include "automap.h"
 #include "control.h"
-#include "player.h"
-#include "palette.h"
 #include "inv.h"
+#include "miniwin/miniwin.h"
 #include "monster.h"
+#include "palette.h"
+#include "player.h"
 #include "setmaps.h"
-#include "miniwin.h"
-#include "ui_fwd.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 
diff --git a/Source/capture.cpp b/Source/capture.cpp
index ab45ac400..92366bb55 100644
--- a/Source/capture.cpp
+++ b/Source/capture.cpp
@@ -7,12 +7,12 @@
 
 #include "DiabloUI/diabloui.h"
 #include "dx.h"
-#include "file_util.h"
 #include "palette.h"
-#include "paths.h"
 #include "render.h"
 #include "storm/storm.h"
-#include "ui_fwd.h"
+#include "utils/file_util.h"
+#include "utils/paths.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 
diff --git a/Source/codec.cpp b/Source/codec.cpp
index 70139fb31..035e18db0 100644
--- a/Source/codec.cpp
+++ b/Source/codec.cpp
@@ -8,7 +8,7 @@
 #include <cstdint>
 
 #include "appfat.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 #include "sha.h"
 
 namespace devilution {
diff --git a/Source/codec.h b/Source/codec.h
index 35e8359e4..a49207c16 100644
--- a/Source/codec.h
+++ b/Source/codec.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/control.h b/Source/control.h
index dc3478b52..2e98bb30e 100644
--- a/Source/control.h
+++ b/Source/control.h
@@ -10,7 +10,7 @@
 #include "engine.h"
 #include "spelldat.h"
 #include "spells.h"
-#include "ui_fwd.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 
diff --git a/SourceX/controls/README.md b/Source/controls/README.md
similarity index 100%
rename from SourceX/controls/README.md
rename to Source/controls/README.md
diff --git a/SourceX/controls/axis_direction.cpp b/Source/controls/axis_direction.cpp
similarity index 100%
rename from SourceX/controls/axis_direction.cpp
rename to Source/controls/axis_direction.cpp
diff --git a/SourceX/controls/axis_direction.h b/Source/controls/axis_direction.h
similarity index 100%
rename from SourceX/controls/axis_direction.h
rename to Source/controls/axis_direction.h
diff --git a/SourceX/controls/controller.cpp b/Source/controls/controller.cpp
similarity index 100%
rename from SourceX/controls/controller.cpp
rename to Source/controls/controller.cpp
diff --git a/SourceX/controls/controller.h b/Source/controls/controller.h
similarity index 100%
rename from SourceX/controls/controller.h
rename to Source/controls/controller.h
diff --git a/SourceX/controls/controller_buttons.h b/Source/controls/controller_buttons.h
similarity index 100%
rename from SourceX/controls/controller_buttons.h
rename to Source/controls/controller_buttons.h
diff --git a/SourceX/controls/controller_motion.cpp b/Source/controls/controller_motion.cpp
similarity index 100%
rename from SourceX/controls/controller_motion.cpp
rename to Source/controls/controller_motion.cpp
diff --git a/SourceX/controls/controller_motion.h b/Source/controls/controller_motion.h
similarity index 100%
rename from SourceX/controls/controller_motion.h
rename to Source/controls/controller_motion.h
diff --git a/SourceX/controls/devices/game_controller.cpp b/Source/controls/devices/game_controller.cpp
similarity index 96%
rename from SourceX/controls/devices/game_controller.cpp
rename to Source/controls/devices/game_controller.cpp
index 9807839ba..bb52ea36f 100644
--- a/SourceX/controls/devices/game_controller.cpp
+++ b/Source/controls/devices/game_controller.cpp
@@ -6,8 +6,8 @@
 
 #include "controls/controller_motion.h"
 #include "controls/devices/joystick.h"
-#include "sdl_ptrs.h"
-#include "stubs.h"
+#include "utils/sdl_ptrs.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 
diff --git a/SourceX/controls/devices/game_controller.h b/Source/controls/devices/game_controller.h
similarity index 100%
rename from SourceX/controls/devices/game_controller.h
rename to Source/controls/devices/game_controller.h
diff --git a/SourceX/controls/devices/joystick.cpp b/Source/controls/devices/joystick.cpp
similarity index 96%
rename from SourceX/controls/devices/joystick.cpp
rename to Source/controls/devices/joystick.cpp
index bf88dd560..8cff0ffd0 100644
--- a/SourceX/controls/devices/joystick.cpp
+++ b/Source/controls/devices/joystick.cpp
@@ -3,7 +3,7 @@
 #include <cstddef>
 
 #include "controls/controller_motion.h"
-#include "stubs.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 
diff --git a/SourceX/controls/devices/joystick.h b/Source/controls/devices/joystick.h
similarity index 92%
rename from SourceX/controls/devices/joystick.h
rename to Source/controls/devices/joystick.h
index 9b64ae8ca..cb6ff8471 100644
--- a/SourceX/controls/devices/joystick.h
+++ b/Source/controls/devices/joystick.h
@@ -6,11 +6,11 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #endif
 
-#include "controls/controller.h"
 #include "controls/controller_buttons.h"
+#include "controls/controller.h"
 
 namespace devilution {
 
diff --git a/SourceX/controls/devices/kbcontroller.cpp b/Source/controls/devices/kbcontroller.cpp
similarity index 94%
rename from SourceX/controls/devices/kbcontroller.cpp
rename to Source/controls/devices/kbcontroller.cpp
index 433f68065..415328003 100644
--- a/SourceX/controls/devices/kbcontroller.cpp
+++ b/Source/controls/devices/kbcontroller.cpp
@@ -3,8 +3,8 @@
 #if HAS_KBCTRL == 1
 
 #include "controls/controller_motion.h"
-#include "sdl_compat.h"
-#include "stubs.h"
+#include "utils/sdl_compat.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 
diff --git a/SourceX/controls/devices/kbcontroller.h b/Source/controls/devices/kbcontroller.h
similarity index 100%
rename from SourceX/controls/devices/kbcontroller.h
rename to Source/controls/devices/kbcontroller.h
diff --git a/SourceX/controls/game_controls.cpp b/Source/controls/game_controls.cpp
similarity index 100%
rename from SourceX/controls/game_controls.cpp
rename to Source/controls/game_controls.cpp
diff --git a/SourceX/controls/game_controls.h b/Source/controls/game_controls.h
similarity index 100%
rename from SourceX/controls/game_controls.h
rename to Source/controls/game_controls.h
diff --git a/SourceX/controls/menu_controls.cpp b/Source/controls/menu_controls.cpp
similarity index 95%
rename from SourceX/controls/menu_controls.cpp
rename to Source/controls/menu_controls.cpp
index c5c1b5ce9..0218dffed 100644
--- a/SourceX/controls/menu_controls.cpp
+++ b/Source/controls/menu_controls.cpp
@@ -5,7 +5,7 @@
 #include "controls/controller_motion.h"
 #include "controls/remap_keyboard.h"
 #include "DiabloUI/diabloui.h"
-#include "sdl_compat.h"
+#include "utils/sdl_compat.h"
 
 namespace devilution {
 
diff --git a/SourceX/controls/menu_controls.h b/Source/controls/menu_controls.h
similarity index 100%
rename from SourceX/controls/menu_controls.h
rename to Source/controls/menu_controls.h
diff --git a/SourceX/controls/modifier_hints.cpp b/Source/controls/modifier_hints.cpp
similarity index 100%
rename from SourceX/controls/modifier_hints.cpp
rename to Source/controls/modifier_hints.cpp
diff --git a/SourceX/controls/modifier_hints.h b/Source/controls/modifier_hints.h
similarity index 100%
rename from SourceX/controls/modifier_hints.h
rename to Source/controls/modifier_hints.h
diff --git a/SourceX/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp
similarity index 100%
rename from SourceX/controls/plrctrls.cpp
rename to Source/controls/plrctrls.cpp
diff --git a/SourceX/controls/plrctrls.h b/Source/controls/plrctrls.h
similarity index 100%
rename from SourceX/controls/plrctrls.h
rename to Source/controls/plrctrls.h
diff --git a/SourceX/controls/remap_keyboard.h b/Source/controls/remap_keyboard.h
similarity index 88%
rename from SourceX/controls/remap_keyboard.h
rename to Source/controls/remap_keyboard.h
index 2b3418f36..f569a16bf 100644
--- a/SourceX/controls/remap_keyboard.h
+++ b/Source/controls/remap_keyboard.h
@@ -5,7 +5,7 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #endif
 
 namespace devilution {
diff --git a/SourceX/controls/touch.cpp b/Source/controls/touch.cpp
similarity index 96%
rename from SourceX/controls/touch.cpp
rename to Source/controls/touch.cpp
index f508a8e0e..dfeb567af 100644
--- a/SourceX/controls/touch.cpp
+++ b/Source/controls/touch.cpp
@@ -1,9 +1,10 @@
 #ifndef USE_SDL1
-#include "display.h"
+#include <math.h>
+
 #include "options.h"
 #include "touch.h"
-#include "ui_fwd.h"
-#include <math.h>
+#include "utils/display.h"
+#include "utils/ui_fwd.h"
 
 static int visible_width;
 static int visible_height;
diff --git a/SourceX/controls/touch.h b/Source/controls/touch.h
similarity index 100%
rename from SourceX/controls/touch.h
rename to Source/controls/touch.h
diff --git a/Source/cursor.h b/Source/cursor.h
index 75045b007..cb554acba 100644
--- a/Source/cursor.h
+++ b/Source/cursor.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/debug.h b/Source/debug.h
index 22b3523e9..69f3df164 100644
--- a/Source/debug.h
+++ b/Source/debug.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/SourceX/devilutionx.exe.manifest b/Source/devilutionx.exe.manifest
similarity index 100%
rename from SourceX/devilutionx.exe.manifest
rename to Source/devilutionx.exe.manifest
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index f615e6861..142bb69fa 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -7,7 +7,6 @@
 
 #include "automap.h"
 #include "capture.h"
-#include "console.h"
 #include "control.h"
 #include "cursor.h"
 #include "dead.h"
@@ -36,13 +35,12 @@
 #include "multi.h"
 #include "nthread.h"
 #include "options.h"
-#include "paths.h"
 #include "pfile.h"
 #include "plrmsg.h"
+#include "qol.h"
 #include "restrict.h"
 #include "setmaps.h"
 #include "sound.h"
-#include "qol.h"
 #include "stores.h"
 #include "storm/storm.h"
 #include "themes.h"
@@ -50,6 +48,8 @@
 #include "town.h"
 #include "track.h"
 #include "trigs.h"
+#include "utils/console.h"
+#include "utils/paths.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l1.h b/Source/drlg_l1.h
index 334deec3f..2c0c136f0 100644
--- a/Source/drlg_l1.h
+++ b/Source/drlg_l1.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l2.h b/Source/drlg_l2.h
index 468d74a3a..47e802fff 100644
--- a/Source/drlg_l2.h
+++ b/Source/drlg_l2.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l3.h b/Source/drlg_l3.h
index eef112399..fc64cd2a9 100644
--- a/Source/drlg_l3.h
+++ b/Source/drlg_l3.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/drlg_l4.h b/Source/drlg_l4.h
index a57b6b773..a77d5f349 100644
--- a/Source/drlg_l4.h
+++ b/Source/drlg_l4.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "gendung.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/dthread.cpp b/Source/dthread.cpp
index 9812c656f..226e65792 100644
--- a/Source/dthread.cpp
+++ b/Source/dthread.cpp
@@ -6,7 +6,7 @@
 
 #include "nthread.h"
 #include "storm/storm.h"
-#include "thread.h"
+#include "utils/thread.h"
 
 namespace devilution {
 
diff --git a/SourceX/dvlnet/abstract_net.cpp b/Source/dvlnet/abstract_net.cpp
similarity index 92%
rename from SourceX/dvlnet/abstract_net.cpp
rename to Source/dvlnet/abstract_net.cpp
index c9258c26a..d34787d49 100644
--- a/SourceX/dvlnet/abstract_net.cpp
+++ b/Source/dvlnet/abstract_net.cpp
@@ -1,6 +1,6 @@
 #include "dvlnet/abstract_net.h"
 
-#include "stubs.h"
+#include "utils/stubs.h"
 #ifndef NONET
 #include "dvlnet/cdwrap.h"
 #include "dvlnet/tcp_client.h"
diff --git a/SourceX/dvlnet/abstract_net.h b/Source/dvlnet/abstract_net.h
similarity index 100%
rename from SourceX/dvlnet/abstract_net.h
rename to Source/dvlnet/abstract_net.h
diff --git a/SourceX/dvlnet/base.cpp b/Source/dvlnet/base.cpp
similarity index 100%
rename from SourceX/dvlnet/base.cpp
rename to Source/dvlnet/base.cpp
diff --git a/SourceX/dvlnet/base.h b/Source/dvlnet/base.h
similarity index 100%
rename from SourceX/dvlnet/base.h
rename to Source/dvlnet/base.h
diff --git a/SourceX/dvlnet/base_protocol.cpp b/Source/dvlnet/base_protocol.cpp
similarity index 76%
rename from SourceX/dvlnet/base_protocol.cpp
rename to Source/dvlnet/base_protocol.cpp
index 443e647c1..05dbb2fdb 100644
--- a/SourceX/dvlnet/base_protocol.cpp
+++ b/Source/dvlnet/base_protocol.cpp
@@ -4,7 +4,7 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #endif
 
 namespace devilution {
diff --git a/SourceX/dvlnet/base_protocol.h b/Source/dvlnet/base_protocol.h
similarity index 100%
rename from SourceX/dvlnet/base_protocol.h
rename to Source/dvlnet/base_protocol.h
diff --git a/SourceX/dvlnet/cdwrap.cpp b/Source/dvlnet/cdwrap.cpp
similarity index 100%
rename from SourceX/dvlnet/cdwrap.cpp
rename to Source/dvlnet/cdwrap.cpp
diff --git a/SourceX/dvlnet/cdwrap.h b/Source/dvlnet/cdwrap.h
similarity index 100%
rename from SourceX/dvlnet/cdwrap.h
rename to Source/dvlnet/cdwrap.h
diff --git a/SourceX/dvlnet/frame_queue.cpp b/Source/dvlnet/frame_queue.cpp
similarity index 100%
rename from SourceX/dvlnet/frame_queue.cpp
rename to Source/dvlnet/frame_queue.cpp
diff --git a/SourceX/dvlnet/frame_queue.h b/Source/dvlnet/frame_queue.h
similarity index 100%
rename from SourceX/dvlnet/frame_queue.h
rename to Source/dvlnet/frame_queue.h
diff --git a/SourceX/dvlnet/loopback.cpp b/Source/dvlnet/loopback.cpp
similarity index 94%
rename from SourceX/dvlnet/loopback.cpp
rename to Source/dvlnet/loopback.cpp
index e21ae025f..ea053fb8f 100644
--- a/SourceX/dvlnet/loopback.cpp
+++ b/Source/dvlnet/loopback.cpp
@@ -1,5 +1,5 @@
 #include "dvlnet/loopback.h"
-#include "stubs.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 namespace net {
diff --git a/SourceX/dvlnet/loopback.h b/Source/dvlnet/loopback.h
similarity index 100%
rename from SourceX/dvlnet/loopback.h
rename to Source/dvlnet/loopback.h
diff --git a/SourceX/dvlnet/packet.cpp b/Source/dvlnet/packet.cpp
similarity index 100%
rename from SourceX/dvlnet/packet.cpp
rename to Source/dvlnet/packet.cpp
diff --git a/SourceX/dvlnet/packet.h b/Source/dvlnet/packet.h
similarity index 95%
rename from SourceX/dvlnet/packet.h
rename to Source/dvlnet/packet.h
index 4b856a454..58053b1fa 100644
--- a/SourceX/dvlnet/packet.h
+++ b/Source/dvlnet/packet.h
@@ -10,7 +10,7 @@
 #endif
 
 #include "dvlnet/abstract_net.h"
-#include "stubs.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 namespace net {
diff --git a/SourceX/dvlnet/protocol_zt.cpp b/Source/dvlnet/protocol_zt.cpp
similarity index 94%
rename from SourceX/dvlnet/protocol_zt.cpp
rename to Source/dvlnet/protocol_zt.cpp
index ceb01a096..88127ed31 100644
--- a/SourceX/dvlnet/protocol_zt.cpp
+++ b/Source/dvlnet/protocol_zt.cpp
@@ -5,9 +5,9 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #else
-#include "sdl2_backports.h"
+#include "utils/sdl2_backports.h"
 #endif
 
 #include <lwip/sockets.h>
diff --git a/SourceX/dvlnet/protocol_zt.h b/Source/dvlnet/protocol_zt.h
similarity index 100%
rename from SourceX/dvlnet/protocol_zt.h
rename to Source/dvlnet/protocol_zt.h
diff --git a/SourceX/dvlnet/tcp_client.cpp b/Source/dvlnet/tcp_client.cpp
similarity index 100%
rename from SourceX/dvlnet/tcp_client.cpp
rename to Source/dvlnet/tcp_client.cpp
diff --git a/SourceX/dvlnet/tcp_client.h b/Source/dvlnet/tcp_client.h
similarity index 100%
rename from SourceX/dvlnet/tcp_client.h
rename to Source/dvlnet/tcp_client.h
diff --git a/SourceX/dvlnet/tcp_server.cpp b/Source/dvlnet/tcp_server.cpp
similarity index 100%
rename from SourceX/dvlnet/tcp_server.cpp
rename to Source/dvlnet/tcp_server.cpp
diff --git a/SourceX/dvlnet/tcp_server.h b/Source/dvlnet/tcp_server.h
similarity index 100%
rename from SourceX/dvlnet/tcp_server.h
rename to Source/dvlnet/tcp_server.h
diff --git a/SourceX/dvlnet/zerotier_lwip.cpp b/Source/dvlnet/zerotier_lwip.cpp
similarity index 90%
rename from SourceX/dvlnet/zerotier_lwip.cpp
rename to Source/dvlnet/zerotier_lwip.cpp
index 811d5df50..d6a151309 100644
--- a/SourceX/dvlnet/zerotier_lwip.cpp
+++ b/Source/dvlnet/zerotier_lwip.cpp
@@ -8,9 +8,9 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #else
-#include "sdl2_backports.h"
+#include "utils/sdl2_backports.h"
 #endif
 
 #include "dvlnet/zerotier_native.h"
diff --git a/SourceX/dvlnet/zerotier_lwip.h b/Source/dvlnet/zerotier_lwip.h
similarity index 100%
rename from SourceX/dvlnet/zerotier_lwip.h
rename to Source/dvlnet/zerotier_lwip.h
diff --git a/SourceX/dvlnet/zerotier_native.cpp b/Source/dvlnet/zerotier_native.cpp
similarity index 94%
rename from SourceX/dvlnet/zerotier_native.cpp
rename to Source/dvlnet/zerotier_native.cpp
index bc8da769b..d3c35896b 100644
--- a/SourceX/dvlnet/zerotier_native.cpp
+++ b/Source/dvlnet/zerotier_native.cpp
@@ -4,15 +4,15 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #else
-#include "sdl2_backports.h"
+#include "utils/sdl2_backports.h"
 #endif
 
 #include <cstdlib>
 #include <ZeroTierSockets.h>
 
-#include "paths.h"
+#include "utils/paths.h"
 
 #include "dvlnet/zerotier_lwip.h"
 
diff --git a/SourceX/dvlnet/zerotier_native.h b/Source/dvlnet/zerotier_native.h
similarity index 100%
rename from SourceX/dvlnet/zerotier_native.h
rename to Source/dvlnet/zerotier_native.h
diff --git a/Source/dx.cpp b/Source/dx.cpp
index 3ca8438a8..6a382232f 100644
--- a/Source/dx.cpp
+++ b/Source/dx.cpp
@@ -7,10 +7,10 @@
 
 #include <SDL.h>
 
-#include "display.h"
 #include "options.h"
 #include "render.h"
 #include "storm/storm.h"
+#include "utils/display.h"
 
 #ifdef __3DS__
 #include <3ds.h>
diff --git a/Source/encrypt.h b/Source/encrypt.h
index 3fe5cd350..2d1edda7f 100644
--- a/Source/encrypt.h
+++ b/Source/encrypt.h
@@ -7,7 +7,7 @@
 
 #include <SDL.h>
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/engine.h b/Source/engine.h
index 2dd12c0bd..195c0af15 100644
--- a/Source/engine.h
+++ b/Source/engine.h
@@ -19,11 +19,11 @@
 #include <stdint.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #endif
 
 #include "appfat.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/gmenu.cpp b/Source/gmenu.cpp
index b66ac68a4..2df52eb31 100644
--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@@ -9,7 +9,7 @@
 #include "controls/axis_direction.h"
 #include "controls/controller_motion.h"
 #include "stores.h"
-#include "ui_fwd.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 
diff --git a/Source/init.cpp b/Source/init.cpp
index 56ac50923..127bfb0a8 100644
--- a/Source/init.cpp
+++ b/Source/init.cpp
@@ -10,10 +10,10 @@
 
 #include "DiabloUI/diabloui.h"
 #include "dx.h"
-#include "paths.h"
 #include "pfile.h"
 #include "storm/storm.h"
-#include "ui_fwd.h"
+#include "utils/paths.h"
+#include "utils/ui_fwd.h"
 
 #ifdef __vita__
 // increase default allowed heap size on Vita
diff --git a/Source/init.h b/Source/init.h
index 137a0d37e..87ebccd6d 100644
--- a/Source/init.h
+++ b/Source/init.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/interfac.h b/Source/interfac.h
index 28d2e8903..75decd14b 100644
--- a/Source/interfac.h
+++ b/Source/interfac.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "ui_fwd.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 
diff --git a/Source/lighting.h b/Source/lighting.h
index bfc900da8..adf2ea9b9 100644
--- a/Source/lighting.h
+++ b/Source/lighting.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/SourceX/main.cpp b/Source/main.cpp
similarity index 100%
rename from SourceX/main.cpp
rename to Source/main.cpp
diff --git a/SourceS/miniwin/misc.h b/Source/miniwin/miniwin.h
similarity index 92%
rename from SourceS/miniwin/misc.h
rename to Source/miniwin/miniwin.h
index 9a2abcff3..17267e3bd 100644
--- a/SourceS/miniwin/misc.h
+++ b/Source/miniwin/miniwin.h
@@ -2,8 +2,22 @@
 
 #include <stdint.h>
 
+#include <ctype.h>
+#include <math.h>
+#include "utils/stdarg_compat.h"
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include "storm/storm_full.h"
+
 namespace devilution {
 
+#ifndef MAX_PATH
+#define MAX_PATH 260
+#endif
 #ifdef __has_attribute
 #define DVL_HAVE_ATTRIBUTE(x) __has_attribute(x)
 #else
diff --git a/SourceX/miniwin/misc_msg.cpp b/Source/miniwin/misc_msg.cpp
similarity index 95%
rename from SourceX/miniwin/misc_msg.cpp
rename to Source/miniwin/misc_msg.cpp
index c7c4ec392..1a089f104 100644
--- a/SourceX/miniwin/misc_msg.cpp
+++ b/Source/miniwin/misc_msg.cpp
@@ -10,11 +10,11 @@
 #include "controls/remap_keyboard.h"
 #include "controls/touch.h"
 #include "cursor.h"
-#include "display.h"
 #include "inv.h"
 #include "movie.h"
-#include "sdl_compat.h"
-#include "stubs.h"
+#include "utils/display.h"
+#include "utils/sdl_compat.h"
+#include "utils/stubs.h"
 
 #ifdef __SWITCH__
 #include "platform/switch/docking.h"
diff --git a/Source/missiles.h b/Source/missiles.h
index c310dc504..658c0613c 100644
--- a/Source/missiles.h
+++ b/Source/missiles.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 #include "misdat.h"
 #include "spelldat.h"
 
diff --git a/Source/monster.h b/Source/monster.h
index 7c236b482..3e2cf7748 100644
--- a/Source/monster.h
+++ b/Source/monster.h
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 #include "monstdat.h"
 #include "sound.h"
 
diff --git a/Source/movie.cpp b/Source/movie.cpp
index 6676b2afb..4b947e11a 100644
--- a/Source/movie.cpp
+++ b/Source/movie.cpp
@@ -5,8 +5,8 @@
  */
 
 #include "diablo.h"
-#include "display.h"
 #include "storm/storm.h"
+#include "utils/display.h"
 
 namespace devilution {
 
diff --git a/Source/movie.h b/Source/movie.h
index 1f6b2b825..ce665dda2 100644
--- a/Source/movie.h
+++ b/Source/movie.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/mpqapi.cpp b/Source/mpqapi.cpp
index 2dd52311d..7ee880330 100644
--- a/Source/mpqapi.cpp
+++ b/Source/mpqapi.cpp
@@ -16,7 +16,7 @@
 #include "appfat.h"
 #include "encrypt.h"
 #include "engine.h"
-#include "file_util.h"
+#include "utils/file_util.h"
 
 namespace devilution {
 
diff --git a/Source/mpqapi.h b/Source/mpqapi.h
index 9a44453c7..4603858ed 100644
--- a/Source/mpqapi.h
+++ b/Source/mpqapi.h
@@ -8,7 +8,7 @@
 #include <SDL.h>
 #include <stdint.h>
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/nthread.cpp b/Source/nthread.cpp
index 6cb4a244e..279142a43 100644
--- a/Source/nthread.cpp
+++ b/Source/nthread.cpp
@@ -7,7 +7,7 @@
 #include "diablo.h"
 #include "gmenu.h"
 #include "storm/storm.h"
-#include "thread.h"
+#include "utils/thread.h"
 
 namespace devilution {
 
diff --git a/Source/nthread.h b/Source/nthread.h
index 5873fc42e..e3d76e46f 100644
--- a/Source/nthread.h
+++ b/Source/nthread.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 #include "player.h"
 
 namespace devilution {
diff --git a/Source/palette.cpp b/Source/palette.cpp
index 7bea3a6c2..6a696bb77 100644
--- a/Source/palette.cpp
+++ b/Source/palette.cpp
@@ -4,12 +4,12 @@
  * Implementation of functions for handling the engines color palette.
  */
 
-#include "display.h"
 #include "dx.h"
 #include "options.h"
 #include "render.h"
-#include "sdl_compat.h"
 #include "storm/storm.h"
+#include "utils/display.h"
+#include "utils/sdl_compat.h"
 
 namespace devilution {
 
diff --git a/Source/palette.h b/Source/palette.h
index 4a7a54c60..f86dcb920 100644
--- a/Source/palette.h
+++ b/Source/palette.h
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/pfile.cpp b/Source/pfile.cpp
index 630833667..ab4a178ba 100644
--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@@ -8,14 +8,14 @@
 #include <string>
 
 #include "codec.h"
-#include "file_util.h"
 #include "init.h"
 #include "loadsave.h"
 #include "mainmenu.h"
 #include "mpqapi.h"
 #include "pack.h"
-#include "paths.h"
 #include "storm/storm.h"
+#include "utils/file_util.h"
+#include "utils/paths.h"
 
 namespace devilution {
 
diff --git a/SourceX/platform/ctr/keyboard.cpp b/Source/platform/ctr/keyboard.cpp
similarity index 100%
rename from SourceX/platform/ctr/keyboard.cpp
rename to Source/platform/ctr/keyboard.cpp
diff --git a/SourceX/platform/ctr/keyboard.h b/Source/platform/ctr/keyboard.h
similarity index 100%
rename from SourceX/platform/ctr/keyboard.h
rename to Source/platform/ctr/keyboard.h
diff --git a/SourceX/platform/ctr/system.cpp b/Source/platform/ctr/system.cpp
similarity index 100%
rename from SourceX/platform/ctr/system.cpp
rename to Source/platform/ctr/system.cpp
diff --git a/SourceX/platform/ctr/system.h b/Source/platform/ctr/system.h
similarity index 100%
rename from SourceX/platform/ctr/system.h
rename to Source/platform/ctr/system.h
diff --git a/SourceX/platform/switch/docking.cpp b/Source/platform/switch/docking.cpp
similarity index 93%
rename from SourceX/platform/switch/docking.cpp
rename to Source/platform/switch/docking.cpp
index 515e7c149..6dce9d7a8 100644
--- a/SourceX/platform/switch/docking.cpp
+++ b/Source/platform/switch/docking.cpp
@@ -4,7 +4,7 @@
 #include <SDL.h>
 
 #include "diablo.h"
-#include "display.h"
+#include "utils/display.h"
 
 namespace devilution {
 
diff --git a/SourceX/platform/switch/docking.h b/Source/platform/switch/docking.h
similarity index 100%
rename from SourceX/platform/switch/docking.h
rename to Source/platform/switch/docking.h
diff --git a/SourceX/platform/switch/keyboard.cpp b/Source/platform/switch/keyboard.cpp
similarity index 100%
rename from SourceX/platform/switch/keyboard.cpp
rename to Source/platform/switch/keyboard.cpp
diff --git a/SourceX/platform/switch/keyboard.h b/Source/platform/switch/keyboard.h
similarity index 100%
rename from SourceX/platform/switch/keyboard.h
rename to Source/platform/switch/keyboard.h
diff --git a/SourceX/platform/switch/network.cpp b/Source/platform/switch/network.cpp
similarity index 100%
rename from SourceX/platform/switch/network.cpp
rename to Source/platform/switch/network.cpp
diff --git a/SourceX/platform/switch/network.h b/Source/platform/switch/network.h
similarity index 100%
rename from SourceX/platform/switch/network.h
rename to Source/platform/switch/network.h
diff --git a/SourceX/platform/vita/keyboard.cpp b/Source/platform/vita/keyboard.cpp
similarity index 100%
rename from SourceX/platform/vita/keyboard.cpp
rename to Source/platform/vita/keyboard.cpp
diff --git a/SourceX/platform/vita/keyboard.h b/Source/platform/vita/keyboard.h
similarity index 100%
rename from SourceX/platform/vita/keyboard.h
rename to Source/platform/vita/keyboard.h
diff --git a/SourceX/qol.cpp b/Source/qol.cpp
similarity index 100%
rename from SourceX/qol.cpp
rename to Source/qol.cpp
diff --git a/SourceX/qol.h b/Source/qol.h
similarity index 100%
rename from SourceX/qol.h
rename to Source/qol.h
diff --git a/Source/restrict.cpp b/Source/restrict.cpp
index bf1f6a9b8..ceff13ac9 100644
--- a/Source/restrict.cpp
+++ b/Source/restrict.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "appfat.h"
-#include "paths.h"
+#include "utils/paths.h"
 
 namespace devilution {
 
diff --git a/Source/scrollrt.h b/Source/scrollrt.h
index 7f7048503..0c23c37fd 100644
--- a/Source/scrollrt.h
+++ b/Source/scrollrt.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 
 #include "engine.h"
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/Source/sound.cpp b/Source/sound.cpp
index d53433dc8..ff24e95e0 100644
--- a/Source/sound.cpp
+++ b/Source/sound.cpp
@@ -8,9 +8,9 @@
 
 #include "init.h"
 #include "options.h"
-#include "storm_sdl_rw.h"
 #include "storm/storm.h"
-#include "stubs.h"
+#include "storm/storm_sdl_rw.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 
diff --git a/Source/sound.h b/Source/sound.h
index 37b6fb634..a57f0a737 100644
--- a/Source/sound.h
+++ b/Source/sound.h
@@ -7,8 +7,8 @@
 
 #include <stdint.h>
 
-#include "miniwin.h"
-#include "soundsample.h"
+#include "miniwin/miniwin.h"
+#include "utils/soundsample.h"
 
 namespace devilution {
 
diff --git a/SourceX/storm/storm.cpp b/Source/storm/storm.cpp
similarity index 95%
rename from SourceX/storm/storm.cpp
rename to Source/storm/storm.cpp
index ca3442077..89a3855a1 100644
--- a/SourceX/storm/storm.cpp
+++ b/Source/storm/storm.cpp
@@ -6,6 +6,7 @@
 #include <SDL.h>
 #include <SDL_mixer.h>
 #include <smacker.h>
+#include <stdint.h>
 #include <string>
 
 #if !SDL_VERSION_ATLEAST(2, 0, 4)
@@ -15,16 +16,16 @@
 #include "Radon.hpp"
 
 #include "DiabloUI/diabloui.h"
-#include "display.h"
 #include "dx.h"
 #include "options.h"
-#include "paths.h"
-#include "sdl_compat.h"
-#include "stubs.h"
+#include "utils/display.h"
+#include "utils/paths.h"
+#include "utils/sdl_compat.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 
-DWORD nLastError = 0;
+uint32_t nLastError = 0;
 
 namespace {
 
diff --git a/SourceX/storm/storm.h b/Source/storm/storm.h
similarity index 100%
rename from SourceX/storm/storm.h
rename to Source/storm/storm.h
diff --git a/SourceX/storm/storm_dvlnet.h b/Source/storm/storm_dvlnet.h
similarity index 100%
rename from SourceX/storm/storm_dvlnet.h
rename to Source/storm/storm_dvlnet.h
diff --git a/SourceS/storm_full.h b/Source/storm/storm_full.h
similarity index 52%
rename from SourceS/storm_full.h
rename to Source/storm/storm_full.h
index e9b7d2e96..d2304a6b7 100644
--- a/SourceS/storm_full.h
+++ b/Source/storm/storm_full.h
@@ -1,7 +1,9 @@
 #pragma once
 
+#include <stdint.h>
+
 namespace devilution {
 
-extern DWORD nLastError;
+extern uint32_t nLastError;
 
 } // namespace devilution
diff --git a/SourceX/storm/storm_net.cpp b/Source/storm/storm_net.cpp
similarity index 95%
rename from SourceX/storm/storm_net.cpp
rename to Source/storm/storm_net.cpp
index ea192015a..b80a4272f 100644
--- a/SourceX/storm/storm_net.cpp
+++ b/Source/storm/storm_net.cpp
@@ -8,7 +8,7 @@
 #include "mainmenu.h"
 #include "options.h"
 #include "storm/storm_dvlnet.h"
-#include "stubs.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 
diff --git a/SourceX/storm_sdl_rw.cpp b/Source/storm/storm_sdl_rw.cpp
similarity index 94%
rename from SourceX/storm_sdl_rw.cpp
rename to Source/storm/storm_sdl_rw.cpp
index 2b47e84bd..3616e6767 100644
--- a/SourceX/storm_sdl_rw.cpp
+++ b/Source/storm/storm_sdl_rw.cpp
@@ -1,4 +1,4 @@
-#include "storm_sdl_rw.h"
+#include "storm/storm_sdl_rw.h"
 
 #include <cstdint>
 #include <cstring>
diff --git a/SourceX/storm_sdl_rw.h b/Source/storm/storm_sdl_rw.h
similarity index 85%
rename from SourceX/storm_sdl_rw.h
rename to Source/storm/storm_sdl_rw.h
index f9e2f095b..d380d9155 100644
--- a/SourceX/storm_sdl_rw.h
+++ b/Source/storm/storm_sdl_rw.h
@@ -2,7 +2,7 @@
 
 #include <SDL.h>
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/SourceS/console.cpp b/Source/utils/console.cpp
similarity index 100%
rename from SourceS/console.cpp
rename to Source/utils/console.cpp
diff --git a/SourceS/console.h b/Source/utils/console.h
similarity index 86%
rename from SourceS/console.h
rename to Source/utils/console.h
index 196d37c6a..97632f456 100644
--- a/SourceS/console.h
+++ b/Source/utils/console.h
@@ -3,7 +3,7 @@
 #include <cstdarg>
 #include <cstddef>
 
-#include "miniwin/misc.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/SourceX/display.cpp b/Source/utils/display.cpp
similarity index 95%
rename from SourceX/display.cpp
rename to Source/utils/display.cpp
index 210b72912..ea6a67ee5 100644
--- a/SourceX/display.cpp
+++ b/Source/utils/display.cpp
@@ -1,4 +1,4 @@
-#include "display.h"
+#include "utils/display.h"
 
 #ifdef __vita__
 #include <psp2/power.h>
diff --git a/SourceX/display.h b/Source/utils/display.h
similarity index 90%
rename from SourceX/display.h
rename to Source/utils/display.h
index 08b1a04fe..4eaa8e765 100644
--- a/SourceX/display.h
+++ b/Source/utils/display.h
@@ -5,13 +5,13 @@
 
 #include <SDL.h>
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #else
-#include "sdl2_backports.h"
+#include "utils/sdl2_backports.h"
 #endif
 
-#include "ui_fwd.h"
-#include "sdl_ptrs.h"
+#include "utils/sdl_ptrs.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 
diff --git a/SourceS/file_util.h b/Source/utils/file_util.h
similarity index 95%
rename from SourceS/file_util.h
rename to Source/utils/file_util.h
index 38bace787..879db38a9 100644
--- a/SourceS/file_util.h
+++ b/Source/utils/file_util.h
@@ -7,7 +7,7 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #endif
 
 #if defined(_WIN64) || defined(_WIN32)
diff --git a/SourceS/paths.cpp b/Source/utils/paths.cpp
similarity index 92%
rename from SourceS/paths.cpp
rename to Source/utils/paths.cpp
index c089e964b..ab178540d 100644
--- a/SourceS/paths.cpp
+++ b/Source/utils/paths.cpp
@@ -1,9 +1,9 @@
-#include "paths.h"
+#include "utils/paths.h"
 
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #endif
 
 #ifndef TTF_FONT_DIR
diff --git a/SourceS/paths.h b/Source/utils/paths.h
similarity index 100%
rename from SourceS/paths.h
rename to Source/utils/paths.h
diff --git a/SourceS/sdl2_backports.h b/Source/utils/sdl2_backports.h
similarity index 100%
rename from SourceS/sdl2_backports.h
rename to Source/utils/sdl2_backports.h
diff --git a/SourceS/sdl2_to_1_2_backports.cpp b/Source/utils/sdl2_to_1_2_backports.cpp
similarity index 100%
rename from SourceS/sdl2_to_1_2_backports.cpp
rename to Source/utils/sdl2_to_1_2_backports.cpp
diff --git a/SourceS/sdl2_to_1_2_backports.h b/Source/utils/sdl2_to_1_2_backports.h
similarity index 95%
rename from SourceS/sdl2_to_1_2_backports.h
rename to Source/utils/sdl2_to_1_2_backports.h
index b2a5949ac..a951f2c28 100644
--- a/SourceS/sdl2_to_1_2_backports.h
+++ b/Source/utils/sdl2_to_1_2_backports.h
@@ -9,8 +9,8 @@
 #include <math.h>
 #include <cstddef>
 
-#include "console.h"
-#include "../SourceX/stubs.h"
+#include "utils/console.h"
+#include "utils/stubs.h"
 
 #define WINDOW_ICON_NAME 0
 
diff --git a/SourceS/sdl_compat.h b/Source/utils/sdl_compat.h
similarity index 100%
rename from SourceS/sdl_compat.h
rename to Source/utils/sdl_compat.h
diff --git a/SourceX/sdl_ptrs.h b/Source/utils/sdl_ptrs.h
similarity index 100%
rename from SourceX/sdl_ptrs.h
rename to Source/utils/sdl_ptrs.h
diff --git a/SourceX/soundsample.cpp b/Source/utils/soundsample.cpp
similarity index 89%
rename from SourceX/soundsample.cpp
rename to Source/utils/soundsample.cpp
index f97fd8e9a..4108d140a 100644
--- a/SourceX/soundsample.cpp
+++ b/Source/utils/soundsample.cpp
@@ -1,14 +1,14 @@
-#include "soundsample.h"
+#include "utils/soundsample.h"
 
 #include <SDL.h>
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #else
-#include "sdl2_backports.h"
+#include "utils/sdl2_backports.h"
 #endif
 
-#include "storm_sdl_rw.h"
-#include "stubs.h"
+#include "storm/storm_sdl_rw.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 
diff --git a/SourceS/soundsample.h b/Source/utils/soundsample.h
similarity index 87%
rename from SourceS/soundsample.h
rename to Source/utils/soundsample.h
index cd00bee8b..1bf38ac5d 100644
--- a/SourceS/soundsample.h
+++ b/Source/utils/soundsample.h
@@ -2,7 +2,7 @@
 
 #include <SDL_mixer.h>
 
-#include "miniwin.h"
+#include "miniwin/miniwin.h"
 
 namespace devilution {
 
diff --git a/SourceS/stdarg_compat.h b/Source/utils/stdarg_compat.h
similarity index 100%
rename from SourceS/stdarg_compat.h
rename to Source/utils/stdarg_compat.h
diff --git a/SourceX/stubs.h b/Source/utils/stubs.h
similarity index 100%
rename from SourceX/stubs.h
rename to Source/utils/stubs.h
diff --git a/SourceX/thread.cpp b/Source/utils/thread.cpp
similarity index 92%
rename from SourceX/thread.cpp
rename to Source/utils/thread.cpp
index af14b4f0b..0477d94da 100644
--- a/SourceX/thread.cpp
+++ b/Source/utils/thread.cpp
@@ -1,10 +1,10 @@
-#include "thread.h"
+#include "utils/thread.h"
 
 #include <SDL.h>
 #include <set>
 
 #include "appfat.h"
-#include "stubs.h"
+#include "utils/stubs.h"
 
 namespace devilution {
 
diff --git a/SourceS/thread.h b/Source/utils/thread.h
similarity index 86%
rename from SourceS/thread.h
rename to Source/utils/thread.h
index ad7428107..c36785668 100644
--- a/SourceS/thread.h
+++ b/Source/utils/thread.h
@@ -3,7 +3,7 @@
 #include <SDL.h>
 
 #ifdef USE_SDL1
-#include "sdl2_to_1_2_backports.h"
+#include "utils/sdl2_to_1_2_backports.h"
 #endif
 
 namespace devilution {
diff --git a/SourceS/ui_fwd.h b/Source/utils/ui_fwd.h
similarity index 100%
rename from SourceS/ui_fwd.h
rename to Source/utils/ui_fwd.h
diff --git a/SourceX/utf8.h b/Source/utils/utf8.h
similarity index 100%
rename from SourceX/utf8.h
rename to Source/utils/utf8.h
diff --git a/SourceS/.clang-format b/SourceS/.clang-format
deleted file mode 100644
index 6af8a9627..000000000
--- a/SourceS/.clang-format
+++ /dev/null
@@ -1,10 +0,0 @@
-BasedOnStyle: webkit
-AlignTrailingComments: true
-AllowShortBlocksOnASingleLine: true
-AllowShortFunctionsOnASingleLine: None
-PointerAlignment: Right
-TabWidth: 4
-UseTab: ForIndentation
-SortIncludes: false
-NamespaceIndentation: None
-FixNamespaceComments: true
diff --git a/SourceS/miniwin.h b/SourceS/miniwin.h
deleted file mode 100644
index 7a2b35ce2..000000000
--- a/SourceS/miniwin.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <ctype.h>
-#include <math.h>
-#include "stdarg_compat.h"
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "miniwin/misc.h"
-#include "storm_full.h"
-
-#ifndef MAX_PATH
-#define MAX_PATH 260
-#endif
diff --git a/SourceX/.clang-format b/SourceX/.clang-format
deleted file mode 100644
index 6af8a9627..000000000
--- a/SourceX/.clang-format
+++ /dev/null
@@ -1,10 +0,0 @@
-BasedOnStyle: webkit
-AlignTrailingComments: true
-AllowShortBlocksOnASingleLine: true
-AllowShortFunctionsOnASingleLine: None
-PointerAlignment: Right
-TabWidth: 4
-UseTab: ForIndentation
-SortIncludes: false
-NamespaceIndentation: None
-FixNamespaceComments: true
diff --git a/test/file_util_test.cpp b/test/file_util_test.cpp
index e7ba61ef8..f71f169a1 100644
--- a/test/file_util_test.cpp
+++ b/test/file_util_test.cpp
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <fstream>
 
-#include "file_util.h"
+#include "utils/file_util.h"
 
 using namespace devilution;
 
diff --git a/test/scrollrt_test.cpp b/test/scrollrt_test.cpp
index 47a9d575b..8139298bd 100644
--- a/test/scrollrt_test.cpp
+++ b/test/scrollrt_test.cpp
@@ -2,7 +2,7 @@
 
 #include "diablo.h"
 #include "scrollrt.h"
-#include "ui_fwd.h"
+#include "utils/ui_fwd.h"
 
 using namespace devilution;
 
diff --git a/test/writehero_test.cpp b/test/writehero_test.cpp
index 5e050bacf..a329df7a3 100644
--- a/test/writehero_test.cpp
+++ b/test/writehero_test.cpp
@@ -5,8 +5,8 @@
 
 #include "loadsave.h"
 #include "pack.h"
-#include "paths.h"
 #include "pfile.h"
+#include "utils/paths.h"
 
 #include "picosha2.h"