45 files changed, 173 insertions, 173 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp
index 9b30d16221..17c7b317a1 100644
--- a/engines/wintermute/Ad/AdActor.cpp
+++ b/engines/wintermute/Ad/AdActor.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/dctypes.h"
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/BObject.h"
+#include "engines/wintermute/Base/BObject.h"
 #include "engines/wintermute/Ad/AdActor.h"
 #include "engines/wintermute/Ad/AdGame.h"
 #include "engines/wintermute/Ad/AdScene.h"
@@ -38,14 +38,14 @@
 #include "engines/wintermute/Ad/AdWaypointGroup.h"
 #include "engines/wintermute/Ad/AdPath.h"
 #include "engines/wintermute/Ad/AdSentence.h"
-#include "engines/wintermute/BObject.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BSound.h"
-#include "engines/wintermute/BRegion.h"
-#include "engines/wintermute/BFileManager.h"
-#include "engines/wintermute/scriptables/ScScript.h"
-#include "engines/wintermute/scriptables/ScValue.h"
-#include "engines/wintermute/scriptables/ScStack.h"
+#include "engines/wintermute/Base/BObject.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BSound.h"
+#include "engines/wintermute/Base/BRegion.h"
+#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/Base/scriptables/ScScript.h"
+#include "engines/wintermute/Base/scriptables/ScValue.h"
+#include "engines/wintermute/Base/scriptables/ScStack.h"
 #include "engines/wintermute/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include <math.h>
diff --git a/engines/wintermute/Ad/AdActor.h b/engines/wintermute/Ad/AdActor.h
index cbe5e2161e..0c00b19157 100644
--- a/engines/wintermute/Ad/AdActor.h
+++ b/engines/wintermute/Ad/AdActor.h
@@ -33,7 +33,7 @@
 #include "engines/wintermute/dctypes.h"    // Added by ClassView
 #include "engines/wintermute/Ad/AdTypes.h"    // Added by ClassView
 #include "engines/wintermute/Ad/AdTalkHolder.h"
-#include "engines/wintermute/BPoint.h" // Added by ClassView
+#include "engines/wintermute/Base/BPoint.h" // Added by ClassView
 #include "engines/wintermute/persistent.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Ad/AdActorDir.h b/engines/wintermute/Ad/AdActorDir.h
index 6408c51ad9..f3579ed72c 100644
--- a/engines/wintermute/Ad/AdActorDir.h
+++ b/engines/wintermute/Ad/AdActorDir.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADACTORDIR_H
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/BBase.h"
+#include "engines/wintermute/Base/BBase.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp
index 1e492bbdca..6f628dfd72 100644
--- a/engines/wintermute/Ad/AdEntity.cpp
+++ b/engines/wintermute/Ad/AdEntity.cpp
@@ -30,26 +30,26 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdEntity.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/BActiveRect.h"
-#include "engines/wintermute/BSurfaceStorage.h"
-#include "engines/wintermute/BGame.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/BActiveRect.h"
+#include "engines/wintermute/Base/BSurfaceStorage.h"
+#include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Ad/AdGame.h"
 #include "engines/wintermute/Ad/AdScene.h"
-#include "engines/wintermute/BSound.h"
+#include "engines/wintermute/Base/BSound.h"
 #include "engines/wintermute/Ad/AdWaypointGroup.h"
-#include "engines/wintermute/BFontStorage.h"
-#include "engines/wintermute/BFont.h"
+#include "engines/wintermute/Base/BFontStorage.h"
+#include "engines/wintermute/Base/BFont.h"
 #include "engines/wintermute/Ad/AdSentence.h"
-#include "engines/wintermute/BRegion.h"
-#include "engines/wintermute/BSprite.h"
-#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/Base/BRegion.h"
+#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/Base/BFileManager.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "engines/wintermute/utils.h"
-#include "engines/wintermute/scriptables/ScValue.h"
-#include "engines/wintermute/scriptables/ScScript.h"
-#include "engines/wintermute/scriptables/ScStack.h"
+#include "engines/wintermute/Base/scriptables/ScValue.h"
+#include "engines/wintermute/Base/scriptables/ScScript.h"
+#include "engines/wintermute/Base/scriptables/ScStack.h"
 #include "common/str.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index 4de2e70dae..bc0ba6a4e8 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -31,14 +31,14 @@
 #include "engines/wintermute/Ad/AdResponseBox.h"
 #include "engines/wintermute/Ad/AdInventoryBox.h"
 #include "engines/wintermute/Ad/AdSceneState.h"
-#include "engines/wintermute/PartEmitter.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BSurfaceStorage.h"
-#include "engines/wintermute/BTransitionMgr.h"
-#include "engines/wintermute/BObject.h"
-#include "engines/wintermute/BSound.h"
+#include "engines/wintermute/Base/PartEmitter.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BSurfaceStorage.h"
+#include "engines/wintermute/Base/BTransitionMgr.h"
+#include "engines/wintermute/Base/BObject.h"
+#include "engines/wintermute/Base/BSound.h"
 #include "engines/wintermute/UIWindow.h"
-#include "engines/wintermute/scriptables/ScValue.h"
+#include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "engines/wintermute/UIEntity.h"
 #include "engines/wintermute/Ad/AdScene.h"
 #include "engines/wintermute/Ad/AdEntity.h"
@@ -46,16 +46,16 @@
 #include "engines/wintermute/Ad/AdInventory.h"
 #include "engines/wintermute/Ad/AdResponseContext.h"
 #include "engines/wintermute/Ad/AdItem.h"
-#include "engines/wintermute/BViewport.h"
-#include "engines/wintermute/BFont.h"
-#include "engines/wintermute/scriptables/ScEngine.h"
-#include "engines/wintermute/BStringTable.h"
+#include "engines/wintermute/Base/BViewport.h"
+#include "engines/wintermute/Base/BFont.h"
+#include "engines/wintermute/Base/scriptables/ScEngine.h"
+#include "engines/wintermute/Base/BStringTable.h"
 #include "engines/wintermute/Ad/AdSentence.h"
 #include "engines/wintermute/Ad/AdResponse.h"
-#include "engines/wintermute/scriptables/ScScript.h"
-#include "engines/wintermute/scriptables/ScStack.h"
-#include "engines/wintermute/BSprite.h"
-#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/Base/scriptables/ScScript.h"
+#include "engines/wintermute/Base/scriptables/ScStack.h"
+#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/Base/BFileManager.h"
 #include "engines/wintermute/utils.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Ad/AdGame.h b/engines/wintermute/Ad/AdGame.h
index 8c146d1af3..d4c6ae3b6f 100644
--- a/engines/wintermute/Ad/AdGame.h
+++ b/engines/wintermute/Ad/AdGame.h
@@ -29,7 +29,7 @@
 #define WINTERMUTE_ADGAME_H
 
 #include "engines/wintermute/Ad/AdTypes.h"
-#include "engines/wintermute/BGame.h"
+#include "engines/wintermute/Base/BGame.h"
 
 namespace WinterMute {
 class CAdItem;
diff --git a/engines/wintermute/Ad/AdInventory.h b/engines/wintermute/Ad/AdInventory.h
index b6f0c6399a..12aca999f7 100644
--- a/engines/wintermute/Ad/AdInventory.h
+++ b/engines/wintermute/Ad/AdInventory.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADINVENTORY_H
 #define WINTERMUTE_ADINVENTORY_H
 
-#include "engines/wintermute/BObject.h"
+#include "engines/wintermute/Base/BObject.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdInventoryBox.cpp b/engines/wintermute/Ad/AdInventoryBox.cpp
index 5de9f54493..4c6d2523d7 100644
--- a/engines/wintermute/Ad/AdInventoryBox.cpp
+++ b/engines/wintermute/Ad/AdInventoryBox.cpp
@@ -30,11 +30,11 @@
 #include "engines/wintermute/Ad/AdInventoryBox.h"
 #include "engines/wintermute/Ad/AdInventory.h"
 #include "engines/wintermute/Ad/AdItem.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BFileManager.h"
-#include "engines/wintermute/BViewport.h"
-#include "engines/wintermute/BDynBuffer.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/Base/BViewport.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
 #include "engines/wintermute/UIButton.h"
 #include "engines/wintermute/UIWindow.h"
 #include "engines/wintermute/PlatformSDL.h"
diff --git a/engines/wintermute/Ad/AdInventoryBox.h b/engines/wintermute/Ad/AdInventoryBox.h
index b7838607d2..c7aeca6eab 100644
--- a/engines/wintermute/Ad/AdInventoryBox.h
+++ b/engines/wintermute/Ad/AdInventoryBox.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADINVENTORYBOX_H
 #define WINTERMUTE_ADINVENTORYBOX_H
 
-#include "engines/wintermute/BObject.h"
+#include "engines/wintermute/Base/BObject.h"
 
 namespace WinterMute {
 class CUIButton;
diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp
index efd655c500..343bc6c6fc 100644
--- a/engines/wintermute/Ad/AdItem.cpp
+++ b/engines/wintermute/Ad/AdItem.cpp
@@ -30,18 +30,18 @@
 #include "engines/wintermute/Ad/AdItem.h"
 #include "engines/wintermute/Ad/AdGame.h"
 #include "engines/wintermute/Ad/AdSentence.h"
-#include "engines/wintermute/BFontStorage.h"
-#include "engines/wintermute/BFont.h"
-#include "engines/wintermute/BFileManager.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BSound.h"
-#include "engines/wintermute/BSprite.h"
+#include "engines/wintermute/Base/BFontStorage.h"
+#include "engines/wintermute/Base/BFont.h"
+#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BSound.h"
+#include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/scriptables/ScScript.h"
-#include "engines/wintermute/scriptables/ScStack.h"
-#include "engines/wintermute/scriptables/ScValue.h"
+#include "engines/wintermute/Base/scriptables/ScScript.h"
+#include "engines/wintermute/Base/scriptables/ScStack.h"
+#include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "common/str.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdLayer.cpp b/engines/wintermute/Ad/AdLayer.cpp
index b6e7a8527e..8198bf492b 100644
--- a/engines/wintermute/Ad/AdLayer.cpp
+++ b/engines/wintermute/Ad/AdLayer.cpp
@@ -27,15 +27,15 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/BGame.h"
+#include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Ad/AdLayer.h"
 #include "engines/wintermute/Ad/AdSceneNode.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/scriptables/ScValue.h"
-#include "engines/wintermute/scriptables/ScScript.h"
-#include "engines/wintermute/scriptables/ScStack.h"
-#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/scriptables/ScValue.h"
+#include "engines/wintermute/Base/scriptables/ScScript.h"
+#include "engines/wintermute/Base/scriptables/ScStack.h"
+#include "engines/wintermute/Base/BFileManager.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Ad/AdNodeState.cpp b/engines/wintermute/Ad/AdNodeState.cpp
index 05ff99f7e0..bd4dc1906c 100644
--- a/engines/wintermute/Ad/AdNodeState.cpp
+++ b/engines/wintermute/Ad/AdNodeState.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/BGame.h"
+#include "engines/wintermute/Base/BGame.h"
 #include "engines/wintermute/Ad/AdNodeState.h"
 #include "engines/wintermute/Ad/AdEntity.h"
-#include "engines/wintermute/BStringTable.h"
-#include "engines/wintermute/BSprite.h"
+#include "engines/wintermute/Base/BStringTable.h"
+#include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/Ad/AdObject.cpp
index 34903a8ccf..1f892f7eae 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/Ad/AdObject.cpp
@@ -36,19 +36,19 @@
 #include "engines/wintermute/Ad/AdSceneNode.h"
 #include "engines/wintermute/Ad/AdSentence.h"
 #include "engines/wintermute/Ad/AdWaypointGroup.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BFrame.h"
-#include "engines/wintermute/BSound.h"
-#include "engines/wintermute/BSurfaceStorage.h"
-#include "engines/wintermute/BSubFrame.h"
-#include "engines/wintermute/BFont.h"
-#include "engines/wintermute/BFontStorage.h"
-#include "engines/wintermute/BSprite.h"
-#include "engines/wintermute/BStringTable.h"
-#include "engines/wintermute/scriptables/ScEngine.h"
-#include "engines/wintermute/scriptables/ScScript.h"
-#include "engines/wintermute/scriptables/ScStack.h"
-#include "engines/wintermute/scriptables/ScValue.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BFrame.h"
+#include "engines/wintermute/Base/BSound.h"
+#include "engines/wintermute/Base/BSurfaceStorage.h"
+#include "engines/wintermute/Base/BSubFrame.h"
+#include "engines/wintermute/Base/BFont.h"
+#include "engines/wintermute/Base/BFontStorage.h"
+#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/Base/BStringTable.h"
+#include "engines/wintermute/Base/scriptables/ScEngine.h"
+#include "engines/wintermute/Base/scriptables/ScScript.h"
+#include "engines/wintermute/Base/scriptables/ScStack.h"
+#include "engines/wintermute/Base/scriptables/ScValue.h"
 #include "common/str.h"
 #include "common/util.h"
 
diff --git a/engines/wintermute/Ad/AdObject.h b/engines/wintermute/Ad/AdObject.h
index 5f47c0d394..34873c89fc 100644
--- a/engines/wintermute/Ad/AdObject.h
+++ b/engines/wintermute/Ad/AdObject.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADOBJECT_H
 
 #include "engines/wintermute/Ad/AdTypes.h"
-#include "engines/wintermute/PartEmitter.h"
+#include "engines/wintermute/Base/PartEmitter.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdPath.cpp b/engines/wintermute/Ad/AdPath.cpp
index 210f13f68b..9d2f1d555b 100644
--- a/engines/wintermute/Ad/AdPath.cpp
+++ b/engines/wintermute/Ad/AdPath.cpp
@@ -28,7 +28,7 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdPath.h"
-#include "engines/wintermute/BPoint.h"
+#include "engines/wintermute/Base/BPoint.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdPath.h b/engines/wintermute/Ad/AdPath.h
index d921e78c0a..dbc769117a 100644
--- a/engines/wintermute/Ad/AdPath.h
+++ b/engines/wintermute/Ad/AdPath.h
@@ -31,7 +31,7 @@
 
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/BBase.h"
+#include "engines/wintermute/Base/BBase.h"
 
 namespace WinterMute {
 class CBPoint;
diff --git a/engines/wintermute/Ad/AdPathPoint.cpp b/engines/wintermute/Ad/AdPathPoint.cpp
index c66a7769f5..73d4976a6e 100644
--- a/engines/wintermute/Ad/AdPathPoint.cpp
+++ b/engines/wintermute/Ad/AdPathPoint.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/Ad/AdPathPoint.h"
-#include "engines/wintermute/BPersistMgr.h"
+#include "engines/wintermute/Base/BPersistMgr.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdPathPoint.h b/engines/wintermute/Ad/AdPathPoint.h
index bb31223dbb..cfa08d319b 100644
--- a/engines/wintermute/Ad/AdPathPoint.h
+++ b/engines/wintermute/Ad/AdPathPoint.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADPATHPOINT_H
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/BPoint.h"
+#include "engines/wintermute/Base/BPoint.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdRegion.cpp b/engines/wintermute/Ad/AdRegion.cpp
index 41022a85aa..5ed3097b30 100644
--- a/engines/wintermute/Ad/AdRegion.cpp
+++ b/engines/wintermute/Ad/AdRegion.cpp
@@ -28,12 +28,12 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdRegion.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/scriptables/ScValue.h"
-#include "engines/wintermute/scriptables/ScScript.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/scriptables/ScValue.h"
+#include "engines/wintermute/Base/scriptables/ScScript.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BFileManager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdRegion.h b/engines/wintermute/Ad/AdRegion.h
index 37be803a9e..0d119b1ac3 100644
--- a/engines/wintermute/Ad/AdRegion.h
+++ b/engines/wintermute/Ad/AdRegion.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADREGION_H
 #define WINTERMUTE_ADREGION_H
 
-#include "engines/wintermute/BRegion.h"
+#include "engines/wintermute/Base/BRegion.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdResponse.cpp b/engines/wintermute/Ad/AdResponse.cpp
index 3db37385b6..656d38f247 100644
--- a/engines/wintermute/Ad/AdResponse.cpp
+++ b/engines/wintermute/Ad/AdResponse.cpp
@@ -28,9 +28,9 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdResponse.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BFontStorage.h"
-#include "engines/wintermute/BSprite.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BFontStorage.h"
+#include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/utils.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdResponse.h b/engines/wintermute/Ad/AdResponse.h
index 88f6fc03a8..42f2f90b14 100644
--- a/engines/wintermute/Ad/AdResponse.h
+++ b/engines/wintermute/Ad/AdResponse.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADRESPONSE_H
 
 
-#include "engines/wintermute/BObject.h"
+#include "engines/wintermute/Base/BObject.h"
 #include "engines/wintermute/Ad/AdTypes.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index d50e25e088..d81d1b5add 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -29,18 +29,18 @@
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdGame.h"
 #include "engines/wintermute/Ad/AdResponseBox.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BSurfaceStorage.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BSurfaceStorage.h"
 #include "engines/wintermute/UIButton.h"
 #include "engines/wintermute/UIWindow.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/BFontStorage.h"
-#include "engines/wintermute/BFont.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/BFontStorage.h"
+#include "engines/wintermute/Base/BFont.h"
 #include "engines/wintermute/Ad/AdResponse.h"
-#include "engines/wintermute/scriptables/ScScript.h"
-#include "engines/wintermute/scriptables/ScStack.h"
-#include "engines/wintermute/BSprite.h"
-#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/Base/scriptables/ScScript.h"
+#include "engines/wintermute/Base/scriptables/ScStack.h"
+#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/Base/BFileManager.h"
 #include "engines/wintermute/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
diff --git a/engines/wintermute/Ad/AdResponseBox.h b/engines/wintermute/Ad/AdResponseBox.h
index cf98cfadca..8f26940d0a 100644
--- a/engines/wintermute/Ad/AdResponseBox.h
+++ b/engines/wintermute/Ad/AdResponseBox.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADRESPONSEBOX_H
 
 
-#include "engines/wintermute/BObject.h"
+#include "engines/wintermute/Base/BObject.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdResponseContext.cpp b/engines/wintermute/Ad/AdResponseContext.cpp
index 482edbcb4d..03904a1037 100644
--- a/engines/wintermute/Ad/AdResponseContext.cpp
+++ b/engines/wintermute/Ad/AdResponseContext.cpp
@@ -28,7 +28,7 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdResponseContext.h"
-#include "engines/wintermute/BPersistMgr.h"
+#include "engines/wintermute/Base/BPersistMgr.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdResponseContext.h b/engines/wintermute/Ad/AdResponseContext.h
index 84ca44ef6f..f29d943e19 100644
--- a/engines/wintermute/Ad/AdResponseContext.h
+++ b/engines/wintermute/Ad/AdResponseContext.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADRESPONSECONTEXT_H
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/BBase.h"
+#include "engines/wintermute/Base/BBase.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdRotLevel.cpp b/engines/wintermute/Ad/AdRotLevel.cpp
index ea1681660a..fb1167f426 100644
--- a/engines/wintermute/Ad/AdRotLevel.cpp
+++ b/engines/wintermute/Ad/AdRotLevel.cpp
@@ -28,11 +28,11 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdRotLevel.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BSprite.h"
-#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/Base/BFileManager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdRotLevel.h b/engines/wintermute/Ad/AdRotLevel.h
index dd3b318a34..94612c15b5 100644
--- a/engines/wintermute/Ad/AdRotLevel.h
+++ b/engines/wintermute/Ad/AdRotLevel.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADROTLEVEL_H
 #define WINTERMUTE_ADROTLEVEL_H
 
-#include "engines/wintermute/BObject.h"
+#include "engines/wintermute/Base/BObject.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdScaleLevel.cpp b/engines/wintermute/Ad/AdScaleLevel.cpp
index 06729c6435..d417358c0c 100644
--- a/engines/wintermute/Ad/AdScaleLevel.cpp
+++ b/engines/wintermute/Ad/AdScaleLevel.cpp
@@ -28,10 +28,10 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdScaleLevel.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BFileManager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdScaleLevel.h b/engines/wintermute/Ad/AdScaleLevel.h
index 9cda5cf4d0..28fdbceb41 100644
--- a/engines/wintermute/Ad/AdScaleLevel.h
+++ b/engines/wintermute/Ad/AdScaleLevel.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSCALELEVEL_H
 
 
-#include "engines/wintermute/BObject.h"
+#include "engines/wintermute/Base/BObject.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index f7cd60c555..c71d10207f 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -41,21 +41,21 @@
 #include "engines/wintermute/Ad/AdSceneState.h"
 #include "engines/wintermute/Ad/AdSentence.h"
 #include "engines/wintermute/Ad/AdWaypointGroup.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/BFileManager.h"
-#include "engines/wintermute/BFont.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BObject.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BPoint.h"
-#include "engines/wintermute/BRegion.h"
-#include "engines/wintermute/BScriptable.h"
-#include "engines/wintermute/BSprite.h"
-#include "engines/wintermute/BViewport.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/Base/BFont.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BObject.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BPoint.h"
+#include "engines/wintermute/Base/BRegion.h"
+#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/Base/BViewport.h"
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/scriptables/ScStack.h"
-#include "engines/wintermute/scriptables/ScValue.h"
-#include "engines/wintermute/scriptables/ScScript.h"
+#include "engines/wintermute/Base/scriptables/ScStack.h"
+#include "engines/wintermute/Base/scriptables/ScValue.h"
+#include "engines/wintermute/Base/scriptables/ScScript.h"
 #include "engines/wintermute/UIWindow.h"
 #include "engines/wintermute/utils.h"
 #include <math.h>
diff --git a/engines/wintermute/Ad/AdScene.h b/engines/wintermute/Ad/AdScene.h
index 87bd290970..046db15b21 100644
--- a/engines/wintermute/Ad/AdScene.h
+++ b/engines/wintermute/Ad/AdScene.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADSCENE_H
 #define WINTERMUTE_ADSCENE_H
 
-#include "engines/wintermute/BFader.h"
+#include "engines/wintermute/Base/BFader.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdSceneNode.cpp b/engines/wintermute/Ad/AdSceneNode.cpp
index d7d0ae98cc..aceff64873 100644
--- a/engines/wintermute/Ad/AdSceneNode.cpp
+++ b/engines/wintermute/Ad/AdSceneNode.cpp
@@ -28,7 +28,7 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdSceneNode.h"
-#include "engines/wintermute/BGame.h"
+#include "engines/wintermute/Base/BGame.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdSceneState.h b/engines/wintermute/Ad/AdSceneState.h
index 264106b599..6aa03792d2 100644
--- a/engines/wintermute/Ad/AdSceneState.h
+++ b/engines/wintermute/Ad/AdSceneState.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSCENESTATE_H
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/BBase.h"
+#include "engines/wintermute/Base/BBase.h"
 #include "engines/wintermute/coll_templ.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdSentence.cpp b/engines/wintermute/Ad/AdSentence.cpp
index 2395a4996c..a280916734 100644
--- a/engines/wintermute/Ad/AdSentence.cpp
+++ b/engines/wintermute/Ad/AdSentence.cpp
@@ -32,12 +32,12 @@
 #include "engines/wintermute/Ad/AdTalkNode.h"
 #include "engines/wintermute/Ad/AdGame.h"
 #include "engines/wintermute/PathUtil.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BSound.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BSound.h"
 #include "engines/wintermute/Ad/AdScene.h"
-#include "engines/wintermute/BFont.h"
-#include "engines/wintermute/BSprite.h"
-#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/Base/BFont.h"
+#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/Base/BFileManager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdSentence.h b/engines/wintermute/Ad/AdSentence.h
index 495edceee0..310be3e3e5 100644
--- a/engines/wintermute/Ad/AdSentence.h
+++ b/engines/wintermute/Ad/AdSentence.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSENTENCE_H
 
 
-#include "engines/wintermute/BBase.h"
+#include "engines/wintermute/Base/BBase.h"
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/dctypes.h"    // Added by ClassView
 
diff --git a/engines/wintermute/Ad/AdSpriteSet.cpp b/engines/wintermute/Ad/AdSpriteSet.cpp
index 8ea4849e1c..4fc5a12c4c 100644
--- a/engines/wintermute/Ad/AdSpriteSet.cpp
+++ b/engines/wintermute/Ad/AdSpriteSet.cpp
@@ -28,10 +28,10 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdSpriteSet.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BFileManager.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdSpriteSet.h b/engines/wintermute/Ad/AdSpriteSet.h
index 4da0fded12..07d2097215 100644
--- a/engines/wintermute/Ad/AdSpriteSet.h
+++ b/engines/wintermute/Ad/AdSpriteSet.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_ADSPRITESET_H
 
 
-#include "engines/wintermute/BObject.h"
-#include "engines/wintermute/BSprite.h"    // Added by ClassView
+#include "engines/wintermute/Base/BObject.h"
+#include "engines/wintermute/Base/BSprite.h"    // Added by ClassView
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdTalkDef.cpp b/engines/wintermute/Ad/AdTalkDef.cpp
index 7a5091432f..d3c655bebe 100644
--- a/engines/wintermute/Ad/AdTalkDef.cpp
+++ b/engines/wintermute/Ad/AdTalkDef.cpp
@@ -29,12 +29,12 @@
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdTalkDef.h"
 #include "engines/wintermute/Ad/AdTalkNode.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/BSprite.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/Ad/AdSpriteSet.h"
-#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/Base/BFileManager.h"
 #include "engines/wintermute/utils.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdTalkDef.h b/engines/wintermute/Ad/AdTalkDef.h
index 7eaafcd6ec..08abcaf32b 100644
--- a/engines/wintermute/Ad/AdTalkDef.h
+++ b/engines/wintermute/Ad/AdTalkDef.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADTALKDEF_H
 
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/BObject.h"
+#include "engines/wintermute/Base/BObject.h"
 
 namespace WinterMute {
 class CAdTalkNode;
diff --git a/engines/wintermute/Ad/AdTalkHolder.cpp b/engines/wintermute/Ad/AdTalkHolder.cpp
index f5ae27967d..61e012b261 100644
--- a/engines/wintermute/Ad/AdTalkHolder.cpp
+++ b/engines/wintermute/Ad/AdTalkHolder.cpp
@@ -29,12 +29,12 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_rand
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdTalkHolder.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/scriptables/ScValue.h"
-#include "engines/wintermute/scriptables/ScScript.h"
-#include "engines/wintermute/scriptables/ScStack.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BSprite.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/scriptables/ScValue.h"
+#include "engines/wintermute/Base/scriptables/ScScript.h"
+#include "engines/wintermute/Base/scriptables/ScStack.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Ad/AdTalkNode.cpp b/engines/wintermute/Ad/AdTalkNode.cpp
index f2f35539ff..2c68b188e6 100644
--- a/engines/wintermute/Ad/AdTalkNode.cpp
+++ b/engines/wintermute/Ad/AdTalkNode.cpp
@@ -28,10 +28,10 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/Ad/AdTalkNode.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BSprite.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BSprite.h"
 #include "engines/wintermute/Ad/AdSpriteSet.h"
 #include "engines/wintermute/utils.h"
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdTalkNode.h b/engines/wintermute/Ad/AdTalkNode.h
index 18781f90da..519b57add0 100644
--- a/engines/wintermute/Ad/AdTalkNode.h
+++ b/engines/wintermute/Ad/AdTalkNode.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADTALKNODE_H
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/BBase.h"
+#include "engines/wintermute/Base/BBase.h"
 
 namespace WinterMute {
 class CAdSpriteSet;
diff --git a/engines/wintermute/Ad/AdWaypointGroup.cpp b/engines/wintermute/Ad/AdWaypointGroup.cpp
index 982079269e..7748cdca02 100644
--- a/engines/wintermute/Ad/AdWaypointGroup.cpp
+++ b/engines/wintermute/Ad/AdWaypointGroup.cpp
@@ -27,12 +27,12 @@
  */
 
 #include "engines/wintermute/Ad/AdWaypointGroup.h"
-#include "engines/wintermute/BParser.h"
-#include "engines/wintermute/BDynBuffer.h"
-#include "engines/wintermute/scriptables/ScValue.h"
-#include "engines/wintermute/BGame.h"
-#include "engines/wintermute/BRegion.h"
-#include "engines/wintermute/BFileManager.h"
+#include "engines/wintermute/Base/BParser.h"
+#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/Base/scriptables/ScValue.h"
+#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/Base/BRegion.h"
+#include "engines/wintermute/Base/BFileManager.h"
 #include <limits.h>
 
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdWaypointGroup.h b/engines/wintermute/Ad/AdWaypointGroup.h
index ea76bb50fa..2c7d981c58 100644
--- a/engines/wintermute/Ad/AdWaypointGroup.h
+++ b/engines/wintermute/Ad/AdWaypointGroup.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADWAYPOINTGROUP_H
 #define WINTERMUTE_ADWAYPOINTGROUP_H
 
-#include "engines/wintermute/BObject.h"
+#include "engines/wintermute/Base/BObject.h"
 
 namespace WinterMute {
 class CBPoint;