diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f1679ea7..3e7e77649 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -469,6 +469,9 @@ set(libdevilutionx_SRCS
   Source/engine/render/dun_render.cpp
   Source/engine/render/text_render.cpp
   Source/engine/surface.cpp
+  Source/mpq/mpq_reader.cpp
+  Source/mpq/mpq_sdl_rwops.cpp
+  Source/mpq/mpq_writer.cpp
   Source/qol/autopickup.cpp
   Source/qol/common.cpp
   Source/qol/monhealthbar.cpp
@@ -479,9 +482,6 @@ set(libdevilutionx_SRCS
   Source/utils/file_util.cpp
   Source/utils/language.cpp
   Source/utils/logged_fstream.cpp
-  Source/utils/mpq.cpp
-  Source/utils/mpq_sdl_rwops.cpp
-  Source/utils/mpq_writer.cpp
   Source/utils/paths.cpp
   Source/utils/sdl_bilinear_scale.cpp
   Source/utils/sdl_rwops_file_wrapper.cpp
@@ -1198,7 +1198,7 @@ if(NINTENDO_3DS)
   add_custom_target(romfs_files
     COMMAND ${CMAKE_COMMAND} -E copy ${APP_ROMFS_FILES} ${APP_ROMFS}
     DEPENDS ${APP_ROMFS_FILES})
-    
+
   add_dependencies(romfs_files romfs_directory devilutionx_mpq)
 
   include(Tools3DS)
diff --git a/Source/engine/game_assets.cpp b/Source/engine/game_assets.cpp
index 82aab57fe..5d6e4a3ce 100644
--- a/Source/engine/game_assets.cpp
+++ b/Source/engine/game_assets.cpp
@@ -5,9 +5,9 @@
 #include <cstring>
 
 #include "init.h"
+#include "mpq/mpq_sdl_rwops.hpp"
 #include "utils/file_util.h"
 #include "utils/log.hpp"
-#include "utils/mpq_sdl_rwops.hpp"
 #include "utils/paths.h"
 
 namespace devilution {
diff --git a/Source/init.cpp b/Source/init.cpp
index 3ff40db27..f3e366607 100644
--- a/Source/init.cpp
+++ b/Source/init.cpp
@@ -17,9 +17,9 @@
 #include "options.h"
 #include "pfile.h"
 #include "engine/game_assets.hpp"
+#include "mpq/mpq_reader.hpp"
 #include "utils/language.h"
 #include "utils/log.hpp"
-#include "utils/mpq.hpp"
 #include "utils/paths.h"
 #include "utils/ui_fwd.h"
 
diff --git a/Source/init.h b/Source/init.h
index 0dff783df..1175ac8de 100644
--- a/Source/init.h
+++ b/Source/init.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "miniwin/miniwin.h"
-#include "utils/mpq.hpp"
+#include "mpq/mpq_reader.hpp"
 
 namespace devilution {
 
diff --git a/Source/loadsave.cpp b/Source/loadsave.cpp
index 92b6c4d79..10aa07dfe 100644
--- a/Source/loadsave.cpp
+++ b/Source/loadsave.cpp
@@ -25,9 +25,9 @@
 #include "missiles.h"
 #include "pfile.h"
 #include "stores.h"
+#include "mpq/mpq_writer.hpp"
 #include "utils/endian.hpp"
 #include "utils/language.h"
-#include "utils/mpq_writer.hpp"
 
 namespace devilution {
 
diff --git a/Source/utils/mpq.cpp b/Source/mpq/mpq_reader.cpp
similarity index 95%
rename from Source/utils/mpq.cpp
rename to Source/mpq/mpq_reader.cpp
index 8aa07c83e..a0bcdd99c 100644
--- a/Source/utils/mpq.cpp
+++ b/Source/mpq/mpq_reader.cpp
@@ -1,4 +1,4 @@
-#include "utils/mpq.hpp"
+#include "mpq/mpq_reader.hpp"
 
 #include <libmpq/mpq.h>
 
diff --git a/Source/utils/mpq.hpp b/Source/mpq/mpq_reader.hpp
similarity index 100%
rename from Source/utils/mpq.hpp
rename to Source/mpq/mpq_reader.hpp
diff --git a/Source/utils/mpq_sdl_rwops.cpp b/Source/mpq/mpq_sdl_rwops.cpp
similarity index 95%
rename from Source/utils/mpq_sdl_rwops.cpp
rename to Source/mpq/mpq_sdl_rwops.cpp
index bf26b3d6c..55718918b 100644
--- a/Source/utils/mpq_sdl_rwops.cpp
+++ b/Source/mpq/mpq_sdl_rwops.cpp
@@ -1,4 +1,4 @@
-#include "utils/mpq_sdl_rwops.hpp"
+#include "mpq/mpq_sdl_rwops.hpp"
 
 #include <cstring>
 #include <memory>
diff --git a/Source/utils/mpq_sdl_rwops.hpp b/Source/mpq/mpq_sdl_rwops.hpp
similarity index 83%
rename from Source/utils/mpq_sdl_rwops.hpp
rename to Source/mpq/mpq_sdl_rwops.hpp
index 0b4bd30b2..e5ead283b 100644
--- a/Source/utils/mpq_sdl_rwops.hpp
+++ b/Source/mpq/mpq_sdl_rwops.hpp
@@ -4,7 +4,7 @@
 
 #include <SDL.h>
 
-#include "utils/mpq.hpp"
+#include "mpq/mpq_reader.hpp"
 
 namespace devilution {
 
diff --git a/Source/utils/mpq_writer.cpp b/Source/mpq/mpq_writer.cpp
similarity index 95%
rename from Source/utils/mpq_writer.cpp
rename to Source/mpq/mpq_writer.cpp
index 94191d4c5..0cc7c5b17 100644
--- a/Source/utils/mpq_writer.cpp
+++ b/Source/mpq/mpq_writer.cpp
@@ -1,9 +1,4 @@
-/**
- * @file mpqapi.cpp
- *
- * Implementation of functions for creating and editing MPQ files.
- */
-#include "utils/mpq_writer.hpp"
+#include "mpq/mpq_writer.hpp"
 
 #include <cstddef>
 #include <cstdint>
diff --git a/Source/utils/mpq_writer.hpp b/Source/mpq/mpq_writer.hpp
similarity index 94%
rename from Source/utils/mpq_writer.hpp
rename to Source/mpq/mpq_writer.hpp
index d09b03c40..876812008 100644
--- a/Source/utils/mpq_writer.hpp
+++ b/Source/mpq/mpq_writer.hpp
@@ -1,5 +1,5 @@
 /**
- * @file utils/mpq_writer.hpp
+ * @file mpq/mpq_writer.hpp
  *
  * Interface of functions for creating and editing MPQ files.
  */
diff --git a/Source/pfile.cpp b/Source/pfile.cpp
index 5a66dd656..1ecb3afca 100644
--- a/Source/pfile.cpp
+++ b/Source/pfile.cpp
@@ -12,11 +12,11 @@
 #include "init.h"
 #include "loadsave.h"
 #include "menu.h"
+#include "mpq/mpq_reader.hpp"
 #include "pack.h"
 #include "utils/endian.hpp"
 #include "utils/file_util.h"
 #include "utils/language.h"
-#include "utils/mpq.hpp"
 #include "utils/paths.h"
 
 namespace devilution {
diff --git a/Source/pfile.h b/Source/pfile.h
index c860630d2..50c3fa3ce 100644
--- a/Source/pfile.h
+++ b/Source/pfile.h
@@ -5,9 +5,9 @@
  */
 #pragma once
 
+#include "mpq/mpq_writer.hpp"
 #include "player.h"
 #include "DiabloUI/diabloui.h"
-#include "utils/mpq_writer.hpp"
 
 namespace devilution {