12 files changed, 13 insertions, 13 deletions
diff --git a/engines/zvision/utility/lzss_read_stream.cpp b/engines/zvision/file/lzss_read_stream.cpp
index bbe6e35f76..6f27eaa765 100644
--- a/engines/zvision/utility/lzss_read_stream.cpp
+++ b/engines/zvision/file/lzss_read_stream.cpp
@@ -22,7 +22,7 @@
 
 #include "common/scummsys.h"
 
-#include "zvision/utility/lzss_read_stream.h"
+#include "zvision/file/lzss_read_stream.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/utility/lzss_read_stream.h b/engines/zvision/file/lzss_read_stream.h
index 1420621f13..1420621f13 100644
--- a/engines/zvision/utility/lzss_read_stream.h
+++ b/engines/zvision/file/lzss_read_stream.h
diff --git a/engines/zvision/core/search_manager.cpp b/engines/zvision/file/search_manager.cpp
index 1523319c94..752b52b01f 100644
--- a/engines/zvision/core/search_manager.cpp
+++ b/engines/zvision/file/search_manager.cpp
@@ -24,8 +24,8 @@
 #include "common/fs.h"
 #include "common/stream.h"
 
-#include "zvision/core/search_manager.h"
-#include "zvision/utility/zfs_archive.h"
+#include "zvision/file/search_manager.h"
+#include "zvision/file/zfs_archive.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/core/search_manager.h b/engines/zvision/file/search_manager.h
index fdd70fd381..fdd70fd381 100644
--- a/engines/zvision/core/search_manager.h
+++ b/engines/zvision/file/search_manager.h
diff --git a/engines/zvision/utility/zfs_archive.cpp b/engines/zvision/file/zfs_archive.cpp
index 13b0168e1c..9b55a366ed 100644
--- a/engines/zvision/utility/zfs_archive.cpp
+++ b/engines/zvision/file/zfs_archive.cpp
@@ -25,7 +25,7 @@
 #include "common/debug.h"
 #include "common/file.h"
 
-#include "zvision/utility/zfs_archive.h"
+#include "zvision/file/zfs_archive.h"
 
 namespace ZVision {
 
diff --git a/engines/zvision/utility/zfs_archive.h b/engines/zvision/file/zfs_archive.h
index 571591a6d1..571591a6d1 100644
--- a/engines/zvision/utility/zfs_archive.h
+++ b/engines/zvision/file/zfs_archive.h
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 97d47e3920..e2ad13a330 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -27,7 +27,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/text/text.h"
 
-#include "zvision/utility/lzss_read_stream.h"
+#include "zvision/file/lzss_read_stream.h"
 
 #include "common/file.h"
 #include "common/system.h"
diff --git a/engines/zvision/graphics/subtitles.cpp b/engines/zvision/graphics/subtitles.cpp
index 784721562a..d2c56f0991 100644
--- a/engines/zvision/graphics/subtitles.cpp
+++ b/engines/zvision/graphics/subtitles.cpp
@@ -22,7 +22,7 @@
 
 #include "zvision/graphics/render_manager.h"
 #include "zvision/graphics/subtitles.h"
-#include "zvision/core/search_manager.h"
+#include "zvision/file/search_manager.h"
 #include "zvision/text/text.h"
 
 namespace ZVision {
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index c9a1cb7187..1d89e22584 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -5,8 +5,10 @@ MODULE_OBJS := \
 	core/events.o \
 	core/menu.o \
 	core/save_manager.o \
-	core/search_manager.o \
 	detection.o \
+	file/lzss_read_stream.o \
+	file/search_manager.o \
+	file/zfs_archive.o \
 	graphics/cursors/cursor_manager.o \
 	graphics/cursors/cursor.o \
 	graphics/effects/fog.o \
@@ -43,9 +45,7 @@ MODULE_OBJS := \
 	text/string_manager.o \
 	text/text.o \
 	utility/clock.o \
-	utility/lzss_read_stream.o \
 	utility/utility.o \
-	utility/zfs_archive.o \
 	video/rlf_decoder.o \
 	video/video.o \
 	video/zork_avi_decoder.o \
diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp
index 1a04c67988..d275bc8769 100644
--- a/engines/zvision/text/string_manager.cpp
+++ b/engines/zvision/text/string_manager.cpp
@@ -28,7 +28,7 @@
 #include "graphics/colormasks.h"
 
 #include "zvision/zvision.h"
-#include "zvision/core/search_manager.h"
+#include "zvision/file/search_manager.h"
 #include "zvision/text/string_manager.h"
 #include "zvision/graphics/truetype_font.h"
 
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 45dc124b58..f9d6bb3e85 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -31,11 +31,11 @@
 #include "zvision/text/string_manager.h"
 #include "zvision/detection.h"
 #include "zvision/core/menu.h"
-#include "zvision/core/search_manager.h"
+#include "zvision/file/search_manager.h"
 #include "zvision/text/text.h"
 #include "zvision/graphics/truetype_font.h"
 #include "zvision/sound/midi.h"
-#include "zvision/utility/zfs_archive.h"
+#include "zvision/file/zfs_archive.h"
 
 #include "common/config-manager.h"
 #include "common/str.h"
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 82030e6944..55dddd4f21 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -26,7 +26,7 @@
 
 #include "zvision/detection.h"
 #include "zvision/utility/clock.h"
-#include "zvision/core/search_manager.h"
+#include "zvision/file/search_manager.h"
 
 #include "common/random.h"
 #include "common/events.h"