18 files changed, 25 insertions, 25 deletions
diff --git a/engines/wintermute/Base/BFileManager.cpp b/engines/wintermute/Base/BFileManager.cpp
index 8a8de885c0..06130092ac 100644
--- a/engines/wintermute/Base/BFileManager.cpp
+++ b/engines/wintermute/Base/BFileManager.cpp
@@ -32,11 +32,11 @@
 #include "engines/wintermute/Base/BFileManager.h"
 #include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/Base/BDiskFile.h"
-#include "engines/wintermute/Base/BResourceFile.h"
-#include "engines/wintermute/Base/BSaveThumbFile.h"
+#include "engines/wintermute/Base/file/BDiskFile.h"
+#include "engines/wintermute/Base/file/BResourceFile.h"
+#include "engines/wintermute/Base/file/BSaveThumbFile.h"
 #include "engines/wintermute/Base/BFileEntry.h"
-#include "engines/wintermute/Base/BPkgFile.h"
+#include "engines/wintermute/Base/file/BPkgFile.h"
 #include "engines/wintermute/Base/BPackage.h"
 #include "engines/wintermute/Base/BRegistry.h"
 #include "engines/wintermute/Base/BGame.h"
diff --git a/engines/wintermute/Base/BFontTT.cpp b/engines/wintermute/Base/BFontTT.cpp
index 003cada4c7..6ec9382a63 100644
--- a/engines/wintermute/Base/BFontTT.cpp
+++ b/engines/wintermute/Base/BFontTT.cpp
@@ -29,7 +29,7 @@
 //#include <ft2build.h>
 //#include FT_FREETYPE_H
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/file/BFile.h"
 #include "engines/wintermute/Base/BFontTT.h"
 #include "engines/wintermute/FontGlyphCache.h"
 #include "engines/wintermute/utils/PathUtil.h"
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index 7febffbab5..287092e02d 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -30,7 +30,7 @@
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BFader.h"
-#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/file/BFile.h"
 #include "engines/wintermute/Base/BFileManager.h"
 #include "engines/wintermute/Base/BFontTT.h"
 #include "engines/wintermute/Base/BFontStorage.h"
diff --git a/engines/wintermute/Base/BSoundBuffer.cpp b/engines/wintermute/Base/BSoundBuffer.cpp
index 2a3daf144a..dd269d5b4e 100644
--- a/engines/wintermute/Base/BSoundBuffer.cpp
+++ b/engines/wintermute/Base/BSoundBuffer.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/file/BFile.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BSoundMgr.h"
 #include "engines/wintermute/Base/BSoundBuffer.h"
diff --git a/engines/wintermute/Base/BSurfaceSDL.cpp b/engines/wintermute/Base/BSurfaceSDL.cpp
index e4fc48d1e3..166fbc171b 100644
--- a/engines/wintermute/Base/BSurfaceSDL.cpp
+++ b/engines/wintermute/Base/BSurfaceSDL.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/file/BFile.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BSurfaceSDL.h"
 #include "engines/wintermute/Base/BRenderSDL.h"
diff --git a/engines/wintermute/Base/BDiskFile.cpp b/engines/wintermute/Base/file/BDiskFile.cpp
index 0d2b41f870..b807925772 100644
--- a/engines/wintermute/Base/BDiskFile.cpp
+++ b/engines/wintermute/Base/file/BDiskFile.cpp
@@ -29,8 +29,8 @@
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/wintypes.h"
-#include "engines/wintermute/Base/BPkgFile.h"
-#include "engines/wintermute/Base/BDiskFile.h"
+#include "engines/wintermute/Base/file/BPkgFile.h"
+#include "engines/wintermute/Base/file/BDiskFile.h"
 #include "engines/wintermute/Base/BFileManager.h"
 #include "common/stream.h"
 #include "common/file.h"
diff --git a/engines/wintermute/Base/BDiskFile.h b/engines/wintermute/Base/file/BDiskFile.h
index 967e902dff..89fd81b858 100644
--- a/engines/wintermute/Base/BDiskFile.h
+++ b/engines/wintermute/Base/file/BDiskFile.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BDISKFILE_H
 
 
-#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/file/BFile.h"
 
 namespace Common {
 class SeekableReadStream;
diff --git a/engines/wintermute/Base/BFile.cpp b/engines/wintermute/Base/file/BFile.cpp
index ba75023c7f..f3a37614a3 100644
--- a/engines/wintermute/Base/BFile.cpp
+++ b/engines/wintermute/Base/file/BFile.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/file/BFile.h"
 #include "common/memstream.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/BFile.h b/engines/wintermute/Base/file/BFile.h
index ba20975b46..ba20975b46 100644
--- a/engines/wintermute/Base/BFile.h
+++ b/engines/wintermute/Base/file/BFile.h
diff --git a/engines/wintermute/Base/BPkgFile.cpp b/engines/wintermute/Base/file/BPkgFile.cpp
index a48ccf7555..d1802f36a9 100644
--- a/engines/wintermute/Base/BPkgFile.cpp
+++ b/engines/wintermute/Base/file/BPkgFile.cpp
@@ -28,7 +28,7 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/BPackage.h"
-#include "engines/wintermute/Base/BPkgFile.h"
+#include "engines/wintermute/Base/file/BPkgFile.h"
 #include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Base/BFileManager.h"
 #include "common/util.h"
diff --git a/engines/wintermute/Base/BPkgFile.h b/engines/wintermute/Base/file/BPkgFile.h
index e2817f8a00..e4acdf1eb9 100644
--- a/engines/wintermute/Base/BPkgFile.h
+++ b/engines/wintermute/Base/file/BPkgFile.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BPKGFILE_H
 
 
-#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/file/BFile.h"
 #include "engines/wintermute/Base/BFileEntry.h"
 #include <zlib.h>   // Added by ClassView
 
diff --git a/engines/wintermute/Base/BResourceFile.cpp b/engines/wintermute/Base/file/BResourceFile.cpp
index 805868e5c8..8ec47f72c3 100644
--- a/engines/wintermute/Base/BResourceFile.cpp
+++ b/engines/wintermute/Base/file/BResourceFile.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BResourceFile.h"
+#include "engines/wintermute/Base/file/BResourceFile.h"
 #include "engines/wintermute/Base/BResources.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/BResourceFile.h b/engines/wintermute/Base/file/BResourceFile.h
index 721134dd84..77d8b629b1 100644
--- a/engines/wintermute/Base/BResourceFile.h
+++ b/engines/wintermute/Base/file/BResourceFile.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BRESOURCEFILE_H
 #define WINTERMUTE_BRESOURCEFILE_H
 
-#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/file/BFile.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BSaveThumbFile.cpp b/engines/wintermute/Base/file/BSaveThumbFile.cpp
index 66f1e8a95f..357a9606c7 100644
--- a/engines/wintermute/Base/BSaveThumbFile.cpp
+++ b/engines/wintermute/Base/file/BSaveThumbFile.cpp
@@ -28,7 +28,7 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BSaveThumbFile.h"
+#include "engines/wintermute/Base/file/BSaveThumbFile.h"
 #include "engines/wintermute/PlatformSDL.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/BSaveThumbFile.h b/engines/wintermute/Base/file/BSaveThumbFile.h
index 71bdb46431..0531d6a873 100644
--- a/engines/wintermute/Base/BSaveThumbFile.h
+++ b/engines/wintermute/Base/file/BSaveThumbFile.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSAVETHUMBFILE_H
 
 
-#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/file/BFile.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/scriptables/SXFile.cpp b/engines/wintermute/Base/scriptables/SXFile.cpp
index 7761246ed6..ebdb436235 100644
--- a/engines/wintermute/Base/scriptables/SXFile.cpp
+++ b/engines/wintermute/Base/scriptables/SXFile.cpp
@@ -33,7 +33,7 @@
 #include "engines/wintermute/Base/scriptables/ScScript.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/file/BFile.h"
 #include "engines/wintermute/Base/BFileManager.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "engines/wintermute/Base/scriptables/SXFile.h"
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index 59caef82b1..47c41be5cc 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -40,13 +40,16 @@ MODULE_OBJS := \
 	Base/scriptables/SXMemBuffer.o \
 	Base/scriptables/SXStore.o \
 	Base/scriptables/SXString.o \
+	Base/file/BDiskFile.o \
+	Base/file/BFile.o \
+	Base/file/BResourceFile.o \
+	Base/file/BSaveThumbFile.o \
+	Base/file/BPkgFile.o \
 	Base/BActiveRect.o \
 	Base/BBase.o \
 	Base/BDebugger.o \
-	Base/BDiskFile.o \
 	Base/BDynBuffer.o \
 	Base/BFader.o \
-	Base/BFile.o \
 	Base/BFileEntry.o \
 	Base/BFileManager.o \
 	Base/BGame.o \
@@ -62,7 +65,6 @@ MODULE_OBJS := \
 	Base/BPackage.o \
 	Base/BParser.o \
 	Base/BPersistMgr.o \
-	Base/BPkgFile.o \
 	Base/BPoint.o \
 	Base/BQuickMsg.o \
 	Base/BRegion.o \
@@ -70,8 +72,6 @@ MODULE_OBJS := \
 	Base/BRenderer.o \
 	Base/BRenderSDL.o \
 	Base/BResources.o \
-	Base/BResourceFile.o \
-	Base/BSaveThumbFile.o \
 	Base/BSaveThumbHelper.o \
 	Base/BScriptable.o \
 	Base/BScriptHolder.o \
diff --git a/engines/wintermute/video/VidTheoraPlayer.h b/engines/wintermute/video/VidTheoraPlayer.h
index 38f3fe85ae..9766988656 100644
--- a/engines/wintermute/video/VidTheoraPlayer.h
+++ b/engines/wintermute/video/VidTheoraPlayer.h
@@ -21,7 +21,7 @@
 #define WINTERMUTE_VIDTHEORAPLAYER_H
 
 #include "engines/wintermute/Base/BBase.h"
-#include "engines/wintermute/Base/BFile.h"
+#include "engines/wintermute/Base/file/BFile.h"
 #include "engines/wintermute/Base/BSurface.h"
 #include "engines/wintermute/Base/BImage.h"
 //#include <theora/theora.h>