diff --git a/engines/wintermute/base/BFileManager.cpp b/engines/wintermute/base/BFileManager.cpp
index 80b3d7a8dfa..35dde203c75 100644
--- a/engines/wintermute/base/BFileManager.cpp
+++ b/engines/wintermute/base/BFileManager.cpp
@@ -32,10 +32,10 @@
 #include "engines/wintermute/utils/PathUtil.h"
 #include "engines/wintermute/base/file/BDiskFile.h"
 #include "engines/wintermute/base/file/BSaveThumbFile.h"
-#include "engines/wintermute/base/BFileEntry.h"
+#include "engines/wintermute/base/file/BFileEntry.h"
+#include "engines/wintermute/base/file/BPackage.h"
 #include "engines/wintermute/base/file/BPkgFile.h"
 #include "engines/wintermute/base/BResources.h"
-#include "engines/wintermute/base/BPackage.h"
 #include "engines/wintermute/base/BRegistry.h"
 #include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/dcpackage.h"
diff --git a/engines/wintermute/base/BFileManager.h b/engines/wintermute/base/BFileManager.h
index 8e7551480d2..7ea9ff56113 100644
--- a/engines/wintermute/base/BFileManager.h
+++ b/engines/wintermute/base/BFileManager.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BFILEMANAGER_H
 #define WINTERMUTE_BFILEMANAGER_H
 
-#include "engines/wintermute/base/BFileEntry.h"
+#include "engines/wintermute/base/file/BFileEntry.h"
 #include "common/archive.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/base/BFileEntry.cpp b/engines/wintermute/base/file/BFileEntry.cpp
similarity index 93%
rename from engines/wintermute/base/BFileEntry.cpp
rename to engines/wintermute/base/file/BFileEntry.cpp
index 39223bfb8e2..b00ecb6f9d5 100644
--- a/engines/wintermute/base/BFileEntry.cpp
+++ b/engines/wintermute/base/file/BFileEntry.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BFileEntry.h"
+#include "engines/wintermute/base/file/BFileEntry.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/base/BFileEntry.h b/engines/wintermute/base/file/BFileEntry.h
similarity index 100%
rename from engines/wintermute/base/BFileEntry.h
rename to engines/wintermute/base/file/BFileEntry.h
diff --git a/engines/wintermute/base/BPackage.cpp b/engines/wintermute/base/file/BPackage.cpp
similarity index 95%
rename from engines/wintermute/base/BPackage.cpp
rename to engines/wintermute/base/file/BPackage.cpp
index 020b7b902f1..bddf1abc1e0 100644
--- a/engines/wintermute/base/BPackage.cpp
+++ b/engines/wintermute/base/file/BPackage.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BPackage.h"
+#include "engines/wintermute/base/file/BPackage.h"
 #include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/base/BFileManager.h"
 #include "common/file.h"
diff --git a/engines/wintermute/base/BPackage.h b/engines/wintermute/base/file/BPackage.h
similarity index 100%
rename from engines/wintermute/base/BPackage.h
rename to engines/wintermute/base/file/BPackage.h
diff --git a/engines/wintermute/base/file/BPkgFile.cpp b/engines/wintermute/base/file/BPkgFile.cpp
index 7eafe7919e6..b7878512906 100644
--- a/engines/wintermute/base/file/BPkgFile.cpp
+++ b/engines/wintermute/base/file/BPkgFile.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/base/BPackage.h"
+#include "engines/wintermute/base/file/BPackage.h"
 #include "engines/wintermute/base/file/BPkgFile.h"
 #include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/base/BFileManager.h"
diff --git a/engines/wintermute/base/file/BPkgFile.h b/engines/wintermute/base/file/BPkgFile.h
index f8a58314850..dc8b4b684f5 100644
--- a/engines/wintermute/base/file/BPkgFile.h
+++ b/engines/wintermute/base/file/BPkgFile.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BPKGFILE_H
 #define WINTERMUTE_BPKGFILE_H
 
-#include "engines/wintermute/base/BFileEntry.h"
+#include "engines/wintermute/base/file/BFileEntry.h"
 
 namespace Common {
 class SeekableReadStream;
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index ccda7ffffe2..0063d072b18 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -40,6 +40,8 @@ MODULE_OBJS := \
 	base/scriptables/SXString.o \
 	base/file/BDiskFile.o \
 	base/file/BFile.o \
+	base/file/BFileEntry.o \
+	base/file/BPackage.o \
 	base/file/BSaveThumbFile.o \
 	base/file/BPkgFile.o \
 	base/font/BFontBitmap.o \
@@ -59,14 +61,12 @@ MODULE_OBJS := \
 	base/BDebugger.o \
 	base/BDynBuffer.o \
 	base/BFader.o \
-	base/BFileEntry.o \
 	base/BFileManager.o \
 	base/BGame.o \
 	base/BFrame.o \
 	base/BKeyboardState.o \
 	base/BNamedObject.o \
 	base/BObject.o \
-	base/BPackage.o \
 	base/BParser.o \
 	base/BPersistMgr.o \
 	base/BPoint.o \