202 files changed, 890 insertions, 890 deletions
diff --git a/engines/wintermute/PlatformSDL.cpp b/engines/wintermute/PlatformSDL.cpp
index b3834bf465..5bb757eee7 100644
--- a/engines/wintermute/PlatformSDL.cpp
+++ b/engines/wintermute/PlatformSDL.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/gfx/osystem/base_render_osystem.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
 #include "engines/wintermute/utils/PathUtil.h"
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/Base/BRegistry.h"
-#include "engines/wintermute/Base/BSoundMgr.h"
-#include "engines/wintermute/Base/scriptables/ScEngine.h"
+#include "engines/wintermute/base/BRegistry.h"
+#include "engines/wintermute/base/BSoundMgr.h"
+#include "engines/wintermute/base/scriptables/ScEngine.h"
 #include "common/str.h"
 #include "common/textconsole.h"
 #include "common/system.h"
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/ad/AdActor.cpp
index 17bd166796..480851d21f 100644
--- a/engines/wintermute/Ad/AdActor.cpp
+++ b/engines/wintermute/ad/AdActor.cpp
@@ -29,23 +29,23 @@
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/dctypes.h"
 #include "engines/wintermute/persistent.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"
-#include "engines/wintermute/Ad/AdEntity.h"
-#include "engines/wintermute/Ad/AdSpriteSet.h"
-#include "engines/wintermute/Ad/AdWaypointGroup.h"
-#include "engines/wintermute/Ad/AdPath.h"
-#include "engines/wintermute/Ad/AdSentence.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/base/BObject.h"
+#include "engines/wintermute/ad/AdActor.h"
+#include "engines/wintermute/ad/AdGame.h"
+#include "engines/wintermute/ad/AdScene.h"
+#include "engines/wintermute/ad/AdEntity.h"
+#include "engines/wintermute/ad/AdSpriteSet.h"
+#include "engines/wintermute/ad/AdWaypointGroup.h"
+#include "engines/wintermute/ad/AdPath.h"
+#include "engines/wintermute/ad/AdSentence.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/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/Ad/AdActor.h b/engines/wintermute/ad/AdActor.h
index 114ee04ae8..1be8b8131d 100644
--- a/engines/wintermute/Ad/AdActor.h
+++ b/engines/wintermute/ad/AdActor.h
@@ -31,9 +31,9 @@
 
 
 #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/Base/BPoint.h" // Added by ClassView
+#include "engines/wintermute/ad/AdTypes.h"    // Added by ClassView
+#include "engines/wintermute/ad/AdTalkHolder.h"
+#include "engines/wintermute/base/BPoint.h" // Added by ClassView
 #include "engines/wintermute/persistent.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/ad/AdEntity.cpp
index 20c16e3dd5..c559e99abb 100644
--- a/engines/wintermute/Ad/AdEntity.cpp
+++ b/engines/wintermute/ad/AdEntity.cpp
@@ -29,27 +29,27 @@
 
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdEntity.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/Base/BSound.h"
-#include "engines/wintermute/Ad/AdWaypointGroup.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Ad/AdSentence.h"
-#include "engines/wintermute/Base/BRegion.h"
-#include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/ad/AdEntity.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/base/BSound.h"
+#include "engines/wintermute/ad/AdWaypointGroup.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/ad/AdSentence.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/utils.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/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
 #include "engines/wintermute/video/VidTheoraPlayer.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Ad/AdEntity.h b/engines/wintermute/ad/AdEntity.h
index 43007c645a..a260ca3329 100644
--- a/engines/wintermute/Ad/AdEntity.h
+++ b/engines/wintermute/ad/AdEntity.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADENTITY_H
 #define WINTERMUTE_ADENTITY_H
 
-#include "engines/wintermute/Ad/AdTalkHolder.h"
+#include "engines/wintermute/ad/AdTalkHolder.h"
 
 namespace WinterMute {
 class CVidTheoraPlayer;
diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/ad/AdGame.cpp
index af752e3ced..87e3fe14d9 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/ad/AdGame.cpp
@@ -27,35 +27,35 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdActor.h"
-#include "engines/wintermute/Ad/AdGame.h"
-#include "engines/wintermute/Ad/AdEntity.h"
-#include "engines/wintermute/Ad/AdInventory.h"
-#include "engines/wintermute/Ad/AdInventoryBox.h"
-#include "engines/wintermute/Ad/AdItem.h"
-#include "engines/wintermute/Ad/AdResponse.h"
-#include "engines/wintermute/Ad/AdResponseBox.h"
-#include "engines/wintermute/Ad/AdResponseContext.h"
-#include "engines/wintermute/Ad/AdScene.h"
-#include "engines/wintermute/Ad/AdSceneState.h"
-#include "engines/wintermute/Ad/AdSentence.h"
-#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Base/BObject.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BSound.h"
-#include "engines/wintermute/Base/BStringTable.h"
-#include "engines/wintermute/Base/BSurfaceStorage.h"
-#include "engines/wintermute/Base/BTransitionMgr.h"
-#include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/Base/BViewport.h"
-#include "engines/wintermute/Base/particles/PartEmitter.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 "engines/wintermute/UI/UIEntity.h"
-#include "engines/wintermute/UI/UIWindow.h"
+#include "engines/wintermute/ad/AdActor.h"
+#include "engines/wintermute/ad/AdGame.h"
+#include "engines/wintermute/ad/AdEntity.h"
+#include "engines/wintermute/ad/AdInventory.h"
+#include "engines/wintermute/ad/AdInventoryBox.h"
+#include "engines/wintermute/ad/AdItem.h"
+#include "engines/wintermute/ad/AdResponse.h"
+#include "engines/wintermute/ad/AdResponseBox.h"
+#include "engines/wintermute/ad/AdResponseContext.h"
+#include "engines/wintermute/ad/AdScene.h"
+#include "engines/wintermute/ad/AdSceneState.h"
+#include "engines/wintermute/ad/AdSentence.h"
+#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/base/BStringTable.h"
+#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/BTransitionMgr.h"
+#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/BViewport.h"
+#include "engines/wintermute/base/particles/PartEmitter.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 "engines/wintermute/ui/UIEntity.h"
+#include "engines/wintermute/ui/UIWindow.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/video/VidPlayer.h"
 #include "engines/wintermute/video/VidTheoraPlayer.h"
diff --git a/engines/wintermute/Ad/AdGame.h b/engines/wintermute/ad/AdGame.h
index d677083db0..4a89fa97d2 100644
--- a/engines/wintermute/Ad/AdGame.h
+++ b/engines/wintermute/ad/AdGame.h
@@ -28,8 +28,8 @@
 #ifndef WINTERMUTE_ADGAME_H
 #define WINTERMUTE_ADGAME_H
 
-#include "engines/wintermute/Ad/AdTypes.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/ad/AdTypes.h"
+#include "engines/wintermute/base/BGame.h"
 
 namespace WinterMute {
 class CAdItem;
diff --git a/engines/wintermute/Ad/AdInventory.cpp b/engines/wintermute/ad/AdInventory.cpp
index 30cb5e5b77..54195cc68a 100644
--- a/engines/wintermute/Ad/AdInventory.cpp
+++ b/engines/wintermute/ad/AdInventory.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Ad/AdInventory.h"
-#include "engines/wintermute/Ad/AdGame.h"
-#include "engines/wintermute/Ad/AdItem.h"
+#include "engines/wintermute/ad/AdInventory.h"
+#include "engines/wintermute/ad/AdGame.h"
+#include "engines/wintermute/ad/AdItem.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Ad/AdInventory.h b/engines/wintermute/ad/AdInventory.h
index 14929c8c4b..cec76c03a0 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/Base/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 2e767574da..c5c9c3be67 100644
--- a/engines/wintermute/Ad/AdInventoryBox.cpp
+++ b/engines/wintermute/ad/AdInventoryBox.cpp
@@ -26,17 +26,17 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdGame.h"
-#include "engines/wintermute/Ad/AdInventoryBox.h"
-#include "engines/wintermute/Ad/AdInventory.h"
-#include "engines/wintermute/Ad/AdItem.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/UI/UIButton.h"
-#include "engines/wintermute/UI/UIWindow.h"
+#include "engines/wintermute/ad/AdGame.h"
+#include "engines/wintermute/ad/AdInventoryBox.h"
+#include "engines/wintermute/ad/AdInventory.h"
+#include "engines/wintermute/ad/AdItem.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/ui/UIButton.h"
+#include "engines/wintermute/ui/UIWindow.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 #include "common/rect.h"
diff --git a/engines/wintermute/Ad/AdInventoryBox.h b/engines/wintermute/ad/AdInventoryBox.h
index f6beae2d46..cfd8d74021 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/Base/BObject.h"
+#include "engines/wintermute/base/BObject.h"
 #include "common/rect.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/ad/AdItem.cpp
index be2177456f..5678f6cfa6 100644
--- a/engines/wintermute/Ad/AdItem.cpp
+++ b/engines/wintermute/ad/AdItem.cpp
@@ -27,21 +27,21 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdItem.h"
-#include "engines/wintermute/Ad/AdGame.h"
-#include "engines/wintermute/Ad/AdSentence.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/font/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/ad/AdItem.h"
+#include "engines/wintermute/ad/AdGame.h"
+#include "engines/wintermute/ad/AdSentence.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/font/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/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/Base/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/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
 #include "common/str.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdItem.h b/engines/wintermute/ad/AdItem.h
index fbbcd608d1..d45f9cc614 100644
--- a/engines/wintermute/Ad/AdItem.h
+++ b/engines/wintermute/ad/AdItem.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADITEM_H
 
 
-#include "engines/wintermute/Ad/AdTalkHolder.h"
+#include "engines/wintermute/ad/AdTalkHolder.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdLayer.cpp b/engines/wintermute/ad/AdLayer.cpp
index 1dd1efb8a6..d797172338 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/Base/BGame.h"
-#include "engines/wintermute/Ad/AdLayer.h"
-#include "engines/wintermute/Ad/AdSceneNode.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/base/BGame.h"
+#include "engines/wintermute/ad/AdLayer.h"
+#include "engines/wintermute/ad/AdSceneNode.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/AdLayer.h b/engines/wintermute/ad/AdLayer.h
index 0ccdb13ae7..0ccdb13ae7 100644
--- a/engines/wintermute/Ad/AdLayer.h
+++ b/engines/wintermute/ad/AdLayer.h
diff --git a/engines/wintermute/Ad/AdNodeState.cpp b/engines/wintermute/ad/AdNodeState.cpp
index 5037ec0272..8e9894b5f5 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/Base/BGame.h"
-#include "engines/wintermute/Ad/AdNodeState.h"
-#include "engines/wintermute/Ad/AdEntity.h"
-#include "engines/wintermute/Base/BStringTable.h"
-#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/ad/AdNodeState.h"
+#include "engines/wintermute/ad/AdEntity.h"
+#include "engines/wintermute/base/BStringTable.h"
+#include "engines/wintermute/base/BSprite.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
diff --git a/engines/wintermute/Ad/AdNodeState.h b/engines/wintermute/ad/AdNodeState.h
index 186f2ebbb2..186f2ebbb2 100644
--- a/engines/wintermute/Ad/AdNodeState.h
+++ b/engines/wintermute/ad/AdNodeState.h
diff --git a/engines/wintermute/Ad/AdObject.cpp b/engines/wintermute/ad/AdObject.cpp
index 451fca7fa6..c74c8cf6b3 100644
--- a/engines/wintermute/Ad/AdObject.cpp
+++ b/engines/wintermute/ad/AdObject.cpp
@@ -27,28 +27,28 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdGame.h"
-#include "engines/wintermute/Ad/AdItem.h"
-#include "engines/wintermute/Ad/AdObject.h"
-#include "engines/wintermute/Ad/AdInventory.h"
-#include "engines/wintermute/Ad/AdLayer.h"
-#include "engines/wintermute/Ad/AdScene.h"
-#include "engines/wintermute/Ad/AdSceneNode.h"
-#include "engines/wintermute/Ad/AdSentence.h"
-#include "engines/wintermute/Ad/AdWaypointGroup.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/font/BFont.h"
-#include "engines/wintermute/Base/font/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 "engines/wintermute/ad/AdGame.h"
+#include "engines/wintermute/ad/AdItem.h"
+#include "engines/wintermute/ad/AdObject.h"
+#include "engines/wintermute/ad/AdInventory.h"
+#include "engines/wintermute/ad/AdLayer.h"
+#include "engines/wintermute/ad/AdScene.h"
+#include "engines/wintermute/ad/AdSceneNode.h"
+#include "engines/wintermute/ad/AdSentence.h"
+#include "engines/wintermute/ad/AdWaypointGroup.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/font/BFont.h"
+#include "engines/wintermute/base/font/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 6fb7c02b0f..d662e84729 100644
--- a/engines/wintermute/Ad/AdObject.h
+++ b/engines/wintermute/ad/AdObject.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_ADOBJECT_H
 #define WINTERMUTE_ADOBJECT_H
 
-#include "engines/wintermute/Ad/AdTypes.h"
-#include "engines/wintermute/Base/particles/PartEmitter.h"
+#include "engines/wintermute/ad/AdTypes.h"
+#include "engines/wintermute/base/particles/PartEmitter.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdPath.cpp b/engines/wintermute/ad/AdPath.cpp
index 4f0c996157..d1b9d87063 100644
--- a/engines/wintermute/Ad/AdPath.cpp
+++ b/engines/wintermute/ad/AdPath.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdPath.h"
-#include "engines/wintermute/Base/BPoint.h"
+#include "engines/wintermute/ad/AdPath.h"
+#include "engines/wintermute/base/BPoint.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdPath.h b/engines/wintermute/ad/AdPath.h
index 2e150175f3..fdc2980042 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/Base/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 25e62b80e9..184ad8559a 100644
--- a/engines/wintermute/Ad/AdPathPoint.cpp
+++ b/engines/wintermute/ad/AdPathPoint.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Ad/AdPathPoint.h"
-#include "engines/wintermute/Base/BPersistMgr.h"
+#include "engines/wintermute/ad/AdPathPoint.h"
+#include "engines/wintermute/base/BPersistMgr.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdPathPoint.h b/engines/wintermute/ad/AdPathPoint.h
index cfa08d319b..f58df765b1 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/Base/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 2c481db96d..a1864de1ac 100644
--- a/engines/wintermute/Ad/AdRegion.cpp
+++ b/engines/wintermute/ad/AdRegion.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdRegion.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"
+#include "engines/wintermute/ad/AdRegion.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 a565641de4..c91feb4012 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/Base/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 a74d1b960e..20617f9573 100644
--- a/engines/wintermute/Ad/AdResponse.cpp
+++ b/engines/wintermute/ad/AdResponse.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdResponse.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/ad/AdResponse.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/BSprite.h"
 #include "engines/wintermute/utils/utils.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdResponse.h b/engines/wintermute/ad/AdResponse.h
index f5ca08639b..646d781b89 100644
--- a/engines/wintermute/Ad/AdResponse.h
+++ b/engines/wintermute/ad/AdResponse.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_ADRESPONSE_H
 
 
-#include "engines/wintermute/Base/BObject.h"
-#include "engines/wintermute/Ad/AdTypes.h"
+#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/ad/AdTypes.h"
 
 namespace WinterMute {
 class CBFont;
diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/ad/AdResponseBox.cpp
index 4e0bab38c7..1a1732edd0 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/ad/AdResponseBox.cpp
@@ -27,20 +27,20 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdGame.h"
-#include "engines/wintermute/Ad/AdResponseBox.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BSurfaceStorage.h"
-#include "engines/wintermute/UI/UIButton.h"
-#include "engines/wintermute/UI/UIWindow.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Ad/AdResponse.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/ad/AdGame.h"
+#include "engines/wintermute/ad/AdResponseBox.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/ui/UIButton.h"
+#include "engines/wintermute/ui/UIWindow.h"
+#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/ad/AdResponse.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/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 ba2962a8f7..93b677bd4a 100644
--- a/engines/wintermute/Ad/AdResponseBox.h
+++ b/engines/wintermute/ad/AdResponseBox.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADRESPONSEBOX_H
 
 
-#include "engines/wintermute/Base/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 77a84e651d..8573e58b95 100644
--- a/engines/wintermute/Ad/AdResponseContext.cpp
+++ b/engines/wintermute/ad/AdResponseContext.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdResponseContext.h"
-#include "engines/wintermute/Base/BPersistMgr.h"
+#include "engines/wintermute/ad/AdResponseContext.h"
+#include "engines/wintermute/base/BPersistMgr.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdResponseContext.h b/engines/wintermute/ad/AdResponseContext.h
index a39e2127d5..74506405de 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/Base/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 956a3efcab..671d003f35 100644
--- a/engines/wintermute/Ad/AdRotLevel.cpp
+++ b/engines/wintermute/ad/AdRotLevel.cpp
@@ -27,12 +27,12 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdRotLevel.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"
+#include "engines/wintermute/ad/AdRotLevel.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 88b0b08aeb..9e536a8d8f 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/Base/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 58e62bd9b4..1ac2f7ba6c 100644
--- a/engines/wintermute/Ad/AdScaleLevel.cpp
+++ b/engines/wintermute/ad/AdScaleLevel.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdScaleLevel.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"
+#include "engines/wintermute/ad/AdScaleLevel.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 5377325ed5..c360ec4eff 100644
--- a/engines/wintermute/Ad/AdScaleLevel.h
+++ b/engines/wintermute/ad/AdScaleLevel.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSCALELEVEL_H
 
 
-#include "engines/wintermute/Base/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 aad3ffdd1d..022ec4a8a5 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/ad/AdScene.cpp
@@ -26,37 +26,37 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Ad/AdScene.h"
-#include "engines/wintermute/Ad/AdActor.h"
-#include "engines/wintermute/Ad/AdEntity.h"
-#include "engines/wintermute/Ad/AdGame.h"
-#include "engines/wintermute/Ad/AdLayer.h"
-#include "engines/wintermute/Ad/AdNodeState.h"
-#include "engines/wintermute/Ad/AdObject.h"
-#include "engines/wintermute/Ad/AdPath.h"
-#include "engines/wintermute/Ad/AdPathPoint.h"
-#include "engines/wintermute/Ad/AdRotLevel.h"
-#include "engines/wintermute/Ad/AdScaleLevel.h"
-#include "engines/wintermute/Ad/AdSceneNode.h"
-#include "engines/wintermute/Ad/AdSceneState.h"
-#include "engines/wintermute/Ad/AdSentence.h"
-#include "engines/wintermute/Ad/AdWaypointGroup.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/Base/font/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/ad/AdScene.h"
+#include "engines/wintermute/ad/AdActor.h"
+#include "engines/wintermute/ad/AdEntity.h"
+#include "engines/wintermute/ad/AdGame.h"
+#include "engines/wintermute/ad/AdLayer.h"
+#include "engines/wintermute/ad/AdNodeState.h"
+#include "engines/wintermute/ad/AdObject.h"
+#include "engines/wintermute/ad/AdPath.h"
+#include "engines/wintermute/ad/AdPathPoint.h"
+#include "engines/wintermute/ad/AdRotLevel.h"
+#include "engines/wintermute/ad/AdScaleLevel.h"
+#include "engines/wintermute/ad/AdSceneNode.h"
+#include "engines/wintermute/ad/AdSceneState.h"
+#include "engines/wintermute/ad/AdSentence.h"
+#include "engines/wintermute/ad/AdWaypointGroup.h"
+#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/font/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/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/ScScript.h"
-#include "engines/wintermute/UI/UIWindow.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/ui/UIWindow.h"
 #include "engines/wintermute/utils/utils.h"
 #include <limits.h>
 
diff --git a/engines/wintermute/Ad/AdScene.h b/engines/wintermute/ad/AdScene.h
index 72c69e668a..f77c64aa9b 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/Base/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 38de185918..5f518e5442 100644
--- a/engines/wintermute/Ad/AdSceneNode.cpp
+++ b/engines/wintermute/ad/AdSceneNode.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdSceneNode.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/ad/AdSceneNode.h"
+#include "engines/wintermute/base/BGame.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdSceneNode.h b/engines/wintermute/ad/AdSceneNode.h
index 808bfceef4..d081959934 100644
--- a/engines/wintermute/Ad/AdSceneNode.h
+++ b/engines/wintermute/ad/AdSceneNode.h
@@ -30,9 +30,9 @@
 #define WINTERMUTE_ADSCENENODE_H
 
 
-#include "engines/wintermute/Ad/AdTypes.h"    // Added by ClassView
-#include "engines/wintermute/Ad/AdRegion.h"   // Added by ClassView
-#include "engines/wintermute/Ad/AdEntity.h"
+#include "engines/wintermute/ad/AdTypes.h"    // Added by ClassView
+#include "engines/wintermute/ad/AdRegion.h"   // Added by ClassView
+#include "engines/wintermute/ad/AdEntity.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdSceneState.cpp b/engines/wintermute/ad/AdSceneState.cpp
index e56c5f479a..2192bc13fe 100644
--- a/engines/wintermute/Ad/AdSceneState.cpp
+++ b/engines/wintermute/ad/AdSceneState.cpp
@@ -28,8 +28,8 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/Ad/AdSceneState.h"
-#include "engines/wintermute/Ad/AdNodeState.h"
+#include "engines/wintermute/ad/AdSceneState.h"
+#include "engines/wintermute/ad/AdNodeState.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Ad/AdSceneState.h b/engines/wintermute/ad/AdSceneState.h
index d81c7b31cb..82207f383c 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/Base/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 8c830a15f1..98926caac6 100644
--- a/engines/wintermute/Ad/AdSentence.cpp
+++ b/engines/wintermute/ad/AdSentence.cpp
@@ -27,17 +27,17 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdSentence.h"
-#include "engines/wintermute/Ad/AdTalkDef.h"
-#include "engines/wintermute/Ad/AdTalkNode.h"
-#include "engines/wintermute/Ad/AdGame.h"
+#include "engines/wintermute/ad/AdSentence.h"
+#include "engines/wintermute/ad/AdTalkDef.h"
+#include "engines/wintermute/ad/AdTalkNode.h"
+#include "engines/wintermute/ad/AdGame.h"
 #include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BSound.h"
-#include "engines/wintermute/Ad/AdScene.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/ad/AdScene.h"
+#include "engines/wintermute/base/font/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 71b60c2d0d..954568878e 100644
--- a/engines/wintermute/Ad/AdSentence.h
+++ b/engines/wintermute/ad/AdSentence.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_ADSENTENCE_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/math/Rect32.h"
 #include "engines/wintermute/dctypes.h"    // Added by ClassView
diff --git a/engines/wintermute/Ad/AdSpriteSet.cpp b/engines/wintermute/ad/AdSpriteSet.cpp
index a5ed4feb0c..127d42d02b 100644
--- a/engines/wintermute/Ad/AdSpriteSet.cpp
+++ b/engines/wintermute/ad/AdSpriteSet.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdSpriteSet.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"
+#include "engines/wintermute/ad/AdSpriteSet.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 1c559fb77b..ba5c6fb75b 100644
--- a/engines/wintermute/Ad/AdSpriteSet.h
+++ b/engines/wintermute/ad/AdSpriteSet.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_ADSPRITESET_H
 
 
-#include "engines/wintermute/Base/BObject.h"
-#include "engines/wintermute/Base/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 9f31d9f61e..b598226413 100644
--- a/engines/wintermute/Ad/AdTalkDef.cpp
+++ b/engines/wintermute/ad/AdTalkDef.cpp
@@ -27,14 +27,14 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdTalkDef.h"
-#include "engines/wintermute/Ad/AdTalkNode.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/Base/BFileManager.h"
+#include "engines/wintermute/ad/AdTalkDef.h"
+#include "engines/wintermute/ad/AdTalkNode.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/base/BFileManager.h"
 #include "engines/wintermute/utils/utils.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Ad/AdTalkDef.h b/engines/wintermute/ad/AdTalkDef.h
index cece5be4da..81d6475013 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/Base/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 2626021054..4c627ca9ad 100644
--- a/engines/wintermute/Ad/AdTalkHolder.cpp
+++ b/engines/wintermute/ad/AdTalkHolder.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdTalkHolder.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/ad/AdTalkHolder.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 "engines/wintermute/wintermute.h"
 #include "common/str.h"
diff --git a/engines/wintermute/Ad/AdTalkHolder.h b/engines/wintermute/ad/AdTalkHolder.h
index a427c9eb04..9e6c3bbd63 100644
--- a/engines/wintermute/Ad/AdTalkHolder.h
+++ b/engines/wintermute/ad/AdTalkHolder.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_ADTALKHOLDER_H
 #define WINTERMUTE_ADTALKHOLDER_H
 
-#include "engines/wintermute/Ad/AdObject.h"
+#include "engines/wintermute/ad/AdObject.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdTalkNode.cpp b/engines/wintermute/ad/AdTalkNode.cpp
index 58644e7ca0..da2195be33 100644
--- a/engines/wintermute/Ad/AdTalkNode.cpp
+++ b/engines/wintermute/ad/AdTalkNode.cpp
@@ -27,12 +27,12 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdTalkNode.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/ad/AdTalkNode.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/utils.h"
 namespace WinterMute {
 
diff --git a/engines/wintermute/Ad/AdTalkNode.h b/engines/wintermute/ad/AdTalkNode.h
index 3718340c0e..11bbb353c1 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/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 class CAdSpriteSet;
diff --git a/engines/wintermute/Ad/AdTypes.h b/engines/wintermute/ad/AdTypes.h
index b88d6fe259..b88d6fe259 100644
--- a/engines/wintermute/Ad/AdTypes.h
+++ b/engines/wintermute/ad/AdTypes.h
diff --git a/engines/wintermute/Ad/AdWaypointGroup.cpp b/engines/wintermute/ad/AdWaypointGroup.cpp
index ec0d66d468..3080b34c09 100644
--- a/engines/wintermute/Ad/AdWaypointGroup.cpp
+++ b/engines/wintermute/ad/AdWaypointGroup.cpp
@@ -26,13 +26,13 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Ad/AdWaypointGroup.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 "engines/wintermute/ad/AdWaypointGroup.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 26a3c9a627..f7c9e4c361 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/Base/BObject.h"
+#include "engines/wintermute/base/BObject.h"
 
 namespace WinterMute {
 class CBPoint;
diff --git a/engines/wintermute/Base/BActiveRect.cpp b/engines/wintermute/base/BActiveRect.cpp
index ca0dcddc28..382329087a 100644
--- a/engines/wintermute/Base/BActiveRect.cpp
+++ b/engines/wintermute/base/BActiveRect.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BActiveRect.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BRegion.h"
+#include "engines/wintermute/base/BActiveRect.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BRegion.h"
 #include "engines/wintermute/PlatformSDL.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/BActiveRect.h b/engines/wintermute/base/BActiveRect.h
index d32b5bc368..935b91eaeb 100644
--- a/engines/wintermute/Base/BActiveRect.h
+++ b/engines/wintermute/base/BActiveRect.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BACTIVERECT_H
 
 #include "engines/wintermute/math/Rect32.h"
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 class CBRegion;
diff --git a/engines/wintermute/Base/BBase.cpp b/engines/wintermute/base/BBase.cpp
index 63fddba489..76e1150925 100644
--- a/engines/wintermute/Base/BBase.cpp
+++ b/engines/wintermute/base/BBase.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BBase.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BDynBuffer.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BBase.h b/engines/wintermute/base/BBase.h
index e8c87f1f9e..e8c87f1f9e 100644
--- a/engines/wintermute/Base/BBase.h
+++ b/engines/wintermute/base/BBase.h
diff --git a/engines/wintermute/Base/BDebugger.cpp b/engines/wintermute/base/BDebugger.cpp
index 4e83579d04..92f282b6d1 100644
--- a/engines/wintermute/Base/BDebugger.cpp
+++ b/engines/wintermute/base/BDebugger.cpp
@@ -26,7 +26,7 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Base/BDebugger.h"
+#include "engines/wintermute/base/BDebugger.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BDebugger.h b/engines/wintermute/base/BDebugger.h
index 548519b0a0..cea432f7a8 100644
--- a/engines/wintermute/Base/BDebugger.h
+++ b/engines/wintermute/base/BDebugger.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BDEBUGGER_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/wme_debugger.h"
 
 // TODO: The entire debugger should possibly be removed
diff --git a/engines/wintermute/Base/BDynBuffer.cpp b/engines/wintermute/base/BDynBuffer.cpp
index fec49e3c8f..9a2e071287 100644
--- a/engines/wintermute/Base/BDynBuffer.cpp
+++ b/engines/wintermute/base/BDynBuffer.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BDynBuffer.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BDynBuffer.h b/engines/wintermute/base/BDynBuffer.h
index 6df01903c7..66e8182c68 100644
--- a/engines/wintermute/Base/BDynBuffer.h
+++ b/engines/wintermute/base/BDynBuffer.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BDYNBUFFER_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BFader.cpp b/engines/wintermute/base/BFader.cpp
index b99244af55..7184c6664c 100644
--- a/engines/wintermute/Base/BFader.cpp
+++ b/engines/wintermute/base/BFader.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BFader.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/BFader.h"
+#include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/util.h"
 
diff --git a/engines/wintermute/Base/BFader.h b/engines/wintermute/base/BFader.h
index 8c9d7d0a7c..cc90d4603d 100644
--- a/engines/wintermute/Base/BFader.h
+++ b/engines/wintermute/base/BFader.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFADER_H
 
 
-#include "engines/wintermute/Base/BObject.h"
+#include "engines/wintermute/base/BObject.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BFileEntry.cpp b/engines/wintermute/base/BFileEntry.cpp
index aca145dcf1..39223bfb8e 100644
--- a/engines/wintermute/Base/BFileEntry.cpp
+++ b/engines/wintermute/base/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/BFileEntry.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BFileEntry.h b/engines/wintermute/base/BFileEntry.h
index 660c9cfd1f..5fdf2b6308 100644
--- a/engines/wintermute/Base/BFileEntry.h
+++ b/engines/wintermute/base/BFileEntry.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFILEENTRY_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BFileManager.cpp b/engines/wintermute/base/BFileManager.cpp
index a0ba77482d..1cfb3d47d3 100644
--- a/engines/wintermute/Base/BFileManager.cpp
+++ b/engines/wintermute/base/BFileManager.cpp
@@ -27,17 +27,17 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "engines/wintermute/utils/StringUtil.h"
 #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/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/base/file/BDiskFile.h"
+#include "engines/wintermute/base/file/BSaveThumbFile.h"
+#include "engines/wintermute/base/BFileEntry.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"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
diff --git a/engines/wintermute/Base/BFileManager.h b/engines/wintermute/base/BFileManager.h
index 53e55402cc..8e7551480d 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/BFileEntry.h"
 #include "common/archive.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Base/BFrame.cpp b/engines/wintermute/base/BFrame.cpp
index 66a63c6a8f..4af9262701 100644
--- a/engines/wintermute/Base/BFrame.cpp
+++ b/engines/wintermute/base/BFrame.cpp
@@ -27,17 +27,17 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BFrame.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/Base/BSoundMgr.h"
-#include "engines/wintermute/Base/BSound.h"
-#include "engines/wintermute/Base/BSubFrame.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BFrame.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/BSoundMgr.h"
+#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/base/BSubFrame.h"
 #include "engines/wintermute/PlatformSDL.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/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/Base/BFrame.h b/engines/wintermute/base/BFrame.h
index 537471c953..3d487b4ebc 100644
--- a/engines/wintermute/Base/BFrame.h
+++ b/engines/wintermute/base/BFrame.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BFRAME_H
 #define WINTERMUTE_BFRAME_H
 
-#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/base/BScriptable.h"
 #include "engines/wintermute/coll_templ.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/base/BGame.cpp
index d4f97cfdba..3e577541b7 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/base/BGame.cpp
@@ -27,38 +27,38 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BFader.h"
-#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/gfx/base_image.h"
-#include "engines/wintermute/Base/gfx/base_surface.h"
-#include "engines/wintermute/Base/gfx/base_renderer.h"
-#include "engines/wintermute/Base/BKeyboardState.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BQuickMsg.h"
-#include "engines/wintermute/Base/BRegistry.h"
-#include "engines/wintermute/Base/BSound.h"
-#include "engines/wintermute/Base/BSoundMgr.h"
-#include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/Base/BSubFrame.h"
-
-#include "engines/wintermute/Base/BTransitionMgr.h"
-#include "engines/wintermute/Base/BViewport.h"
-#include "engines/wintermute/Base/BStringTable.h"
-#include "engines/wintermute/Base/BRegion.h"
-#include "engines/wintermute/Base/BSaveThumbHelper.h"
-#include "engines/wintermute/Base/BSurfaceStorage.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BFader.h"
+#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/gfx/base_image.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
+#include "engines/wintermute/base/BKeyboardState.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BQuickMsg.h"
+#include "engines/wintermute/base/BRegistry.h"
+#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/base/BSoundMgr.h"
+#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/BSubFrame.h"
+
+#include "engines/wintermute/base/BTransitionMgr.h"
+#include "engines/wintermute/base/BViewport.h"
+#include "engines/wintermute/base/BStringTable.h"
+#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/BSaveThumbHelper.h"
+#include "engines/wintermute/base/BSurfaceStorage.h"
 #include "engines/wintermute/utils/crc.h"
 #include "engines/wintermute/utils/PathUtil.h"
 #include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/UI/UIWindow.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/ScEngine.h"
-#include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Base/scriptables/ScScript.h"
-#include "engines/wintermute/Base/scriptables/SXMath.h"
+#include "engines/wintermute/ui/UIWindow.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScEngine.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/base/scriptables/SXMath.h"
 #include "engines/wintermute/video/VidPlayer.h"
 #include "engines/wintermute/video/VidTheoraPlayer.h"
 #include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/Base/BGame.h b/engines/wintermute/base/BGame.h
index 1a0e4efb09..7441d81b07 100644
--- a/engines/wintermute/Base/BGame.h
+++ b/engines/wintermute/base/BGame.h
@@ -29,9 +29,9 @@
 #ifndef WINTERMUTE_BGAME_H
 #define WINTERMUTE_BGAME_H
 
-#include "engines/wintermute/Base/BDebugger.h"
-#include "engines/wintermute/Base/gfx/base_renderer.h"
-#include "engines/wintermute/Base/BObject.h"
+#include "engines/wintermute/base/BDebugger.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
+#include "engines/wintermute/base/BObject.h"
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/coll_templ.h"
 #include "engines/wintermute/math/Rect32.h"
diff --git a/engines/wintermute/Base/BKeyboardState.cpp b/engines/wintermute/base/BKeyboardState.cpp
index 83deaa0306..85ab15f58e 100644
--- a/engines/wintermute/Base/BKeyboardState.cpp
+++ b/engines/wintermute/base/BKeyboardState.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BKeyboardState.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/ScStack.h"
+#include "engines/wintermute/base/BKeyboardState.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
 #include "common/system.h"
 #include "common/keyboard.h"
 
diff --git a/engines/wintermute/Base/BKeyboardState.h b/engines/wintermute/base/BKeyboardState.h
index 84bbab5339..e3a4a903f7 100644
--- a/engines/wintermute/Base/BKeyboardState.h
+++ b/engines/wintermute/base/BKeyboardState.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BKEYBOARD_STATE_H
 
 
-#include "engines/wintermute/Base/BBase.h"
-#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/BScriptable.h"
 #include "common/keyboard.h"
 #include "common/events.h"
 
diff --git a/engines/wintermute/Base/BNamedObject.cpp b/engines/wintermute/base/BNamedObject.cpp
index 855bdb2738..9587da45e8 100644
--- a/engines/wintermute/Base/BNamedObject.cpp
+++ b/engines/wintermute/base/BNamedObject.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BNamedObject.h"
+#include "engines/wintermute/base/BNamedObject.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BNamedObject.h b/engines/wintermute/base/BNamedObject.h
index e2649acbf5..4d5fdb0c0e 100644
--- a/engines/wintermute/Base/BNamedObject.h
+++ b/engines/wintermute/base/BNamedObject.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BNAMEDOBJECT_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BObject.cpp b/engines/wintermute/base/BObject.cpp
index 6640602443..1bb52c0ce6 100644
--- a/engines/wintermute/Base/BObject.cpp
+++ b/engines/wintermute/base/BObject.cpp
@@ -27,15 +27,15 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BObject.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Base/BSound.h"
-#include "engines/wintermute/Base/BSoundMgr.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BStringTable.h"
-#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/base/BSoundMgr.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BStringTable.h"
+#include "engines/wintermute/base/BSprite.h"
 #include "engines/wintermute/PlatformSDL.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/BObject.h b/engines/wintermute/base/BObject.h
index 6e3c632bac..c855c770b7 100644
--- a/engines/wintermute/Base/BObject.h
+++ b/engines/wintermute/base/BObject.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BOBJECT_H
 
 
-#include "engines/wintermute/Base/BScriptHolder.h"
+#include "engines/wintermute/base/BScriptHolder.h"
 #include "engines/wintermute/persistent.h"
 #include "common/events.h"
 
diff --git a/engines/wintermute/Base/BPackage.cpp b/engines/wintermute/base/BPackage.cpp
index 9dcdd38cdc..020b7b902f 100644
--- a/engines/wintermute/Base/BPackage.cpp
+++ b/engines/wintermute/base/BPackage.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BPackage.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/BPackage.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "common/file.h"
 #include "common/stream.h"
 
diff --git a/engines/wintermute/Base/BPackage.h b/engines/wintermute/base/BPackage.h
index 117b0c522d..8c803fddd9 100644
--- a/engines/wintermute/Base/BPackage.h
+++ b/engines/wintermute/base/BPackage.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BPACKAGE_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace Common {
 class SeekableReadStream;
diff --git a/engines/wintermute/Base/BParser.cpp b/engines/wintermute/base/BParser.cpp
index 114c5054ca..f675d0ca50 100644
--- a/engines/wintermute/Base/BParser.cpp
+++ b/engines/wintermute/base/BParser.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 #include "common/util.h"
diff --git a/engines/wintermute/Base/BParser.h b/engines/wintermute/base/BParser.h
index 01d40067cc..ae886953a9 100644
--- a/engines/wintermute/Base/BParser.h
+++ b/engines/wintermute/base/BParser.h
@@ -52,7 +52,7 @@
 #define PARSERR_EOF             -2
 #define PARSERR_TOKENNOTFOUND   -1
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/coll_templ.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/BPersistMgr.cpp b/engines/wintermute/base/BPersistMgr.cpp
index 635097c0ad..0f2cc6bc8a 100644
--- a/engines/wintermute/Base/BPersistMgr.cpp
+++ b/engines/wintermute/base/BPersistMgr.cpp
@@ -27,15 +27,15 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BPersistMgr.h"
-#include "engines/wintermute/Base/BSaveThumbHelper.h"
+#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BPersistMgr.h"
+#include "engines/wintermute/base/BSaveThumbHelper.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "engines/wintermute/math/Vector2.h"
 #include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/Base/gfx/base_image.h"
-#include "engines/wintermute/Base/BSound.h"
+#include "engines/wintermute/base/gfx/base_image.h"
+#include "engines/wintermute/base/BSound.h"
 #include "graphics/decoders/bmp.h"
 #include "common/memstream.h"
 #include "common/str.h"
diff --git a/engines/wintermute/Base/BPersistMgr.h b/engines/wintermute/base/BPersistMgr.h
index 3a2aa82c94..2e6ee8058c 100644
--- a/engines/wintermute/Base/BPersistMgr.h
+++ b/engines/wintermute/base/BPersistMgr.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BPERSISTMGR_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/math/Rect32.h"
 #include "engines/savestate.h"
 #include "common/stream.h"
diff --git a/engines/wintermute/Base/BPoint.cpp b/engines/wintermute/base/BPoint.cpp
index abb170d0b5..4c80e154f2 100644
--- a/engines/wintermute/Base/BPoint.cpp
+++ b/engines/wintermute/base/BPoint.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BPoint.h"
-#include "engines/wintermute/Base/BPersistMgr.h"
+#include "engines/wintermute/base/BPoint.h"
+#include "engines/wintermute/base/BPersistMgr.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BPoint.h b/engines/wintermute/base/BPoint.h
index 7b9c561fac..3e4adb5d13 100644
--- a/engines/wintermute/Base/BPoint.h
+++ b/engines/wintermute/base/BPoint.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BPOINT_H
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BQuickMsg.cpp b/engines/wintermute/base/BQuickMsg.cpp
index dd87a10dad..32bd04afe2 100644
--- a/engines/wintermute/Base/BQuickMsg.cpp
+++ b/engines/wintermute/base/BQuickMsg.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BQuickMsg.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/BQuickMsg.h"
+#include "engines/wintermute/base/BGame.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BQuickMsg.h b/engines/wintermute/base/BQuickMsg.h
index 46f44b291f..c247183714 100644
--- a/engines/wintermute/Base/BQuickMsg.h
+++ b/engines/wintermute/base/BQuickMsg.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BQUICKMSG_H
 #define WINTERMUTE_BQUICKMSG_H
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BRegion.cpp b/engines/wintermute/base/BRegion.cpp
index 3dc14df05f..1c38174cb8 100644
--- a/engines/wintermute/Base/BRegion.cpp
+++ b/engines/wintermute/base/BRegion.cpp
@@ -27,14 +27,14 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BRegion.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/scriptables/ScScript.h"
-#include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include <limits.h>
 
diff --git a/engines/wintermute/Base/BRegion.h b/engines/wintermute/base/BRegion.h
index d2f06cbed9..2a92d9daff 100644
--- a/engines/wintermute/Base/BRegion.h
+++ b/engines/wintermute/base/BRegion.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_BREGION_H
 #define WINTERMUTE_BREGION_H
 
-#include "engines/wintermute/Base/BPoint.h"
-#include "engines/wintermute/Base/BObject.h"
+#include "engines/wintermute/base/BPoint.h"
+#include "engines/wintermute/base/BObject.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BRegistry.cpp b/engines/wintermute/base/BRegistry.cpp
index c7ec0c2675..fef09d7479 100644
--- a/engines/wintermute/Base/BRegistry.cpp
+++ b/engines/wintermute/base/BRegistry.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/tinyxml/tinyxml.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BRegistry.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BRegistry.h"
 #include "engines/wintermute/utils/PathUtil.h"
 #include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/utils/utils.h"
diff --git a/engines/wintermute/Base/BRegistry.h b/engines/wintermute/base/BRegistry.h
index a07f6be8d4..123d1d8a2f 100644
--- a/engines/wintermute/Base/BRegistry.h
+++ b/engines/wintermute/base/BRegistry.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BREGISTRY_H
 #define WINTERMUTE_BREGISTRY_H
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BResources.cpp b/engines/wintermute/base/BResources.cpp
index 75b4a5d1ea..b99441b5db 100644
--- a/engines/wintermute/Base/BResources.cpp
+++ b/engines/wintermute/base/BResources.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/Base/BResources.h"
+#include "engines/wintermute/base/BResources.h"
 #include "common/str.h"
 #include "common/memstream.h"
 
diff --git a/engines/wintermute/Base/BResources.h b/engines/wintermute/base/BResources.h
index 6ec0541b5c..6ec0541b5c 100644
--- a/engines/wintermute/Base/BResources.h
+++ b/engines/wintermute/base/BResources.h
diff --git a/engines/wintermute/Base/BSaveThumbHelper.cpp b/engines/wintermute/base/BSaveThumbHelper.cpp
index 74295170ff..415d4ed1e4 100644
--- a/engines/wintermute/Base/BSaveThumbHelper.cpp
+++ b/engines/wintermute/base/BSaveThumbHelper.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BSaveThumbHelper.h"
-#include "engines/wintermute/Base/gfx/base_image.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/BSaveThumbHelper.h"
+#include "engines/wintermute/base/gfx/base_image.h"
+#include "engines/wintermute/base/BGame.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BSaveThumbHelper.h b/engines/wintermute/base/BSaveThumbHelper.h
index c7c7e13982..30db32cfb2 100644
--- a/engines/wintermute/Base/BSaveThumbHelper.h
+++ b/engines/wintermute/base/BSaveThumbHelper.h
@@ -29,7 +29,7 @@
 #define WINTERMUTE_BSAVETHUMBHELPER_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BScriptHolder.cpp b/engines/wintermute/base/BScriptHolder.cpp
index 45cbc5d23b..65d37b2e5c 100644
--- a/engines/wintermute/Base/BScriptHolder.cpp
+++ b/engines/wintermute/base/BScriptHolder.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Ad/AdGame.h"
-#include "engines/wintermute/Base/BScriptHolder.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/scriptables/ScValue.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/ad/AdGame.h"
+#include "engines/wintermute/base/BScriptHolder.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScEngine.h"
+#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BScriptHolder.h b/engines/wintermute/base/BScriptHolder.h
index 77f0f386cb..1e82b8cacf 100644
--- a/engines/wintermute/Base/BScriptHolder.h
+++ b/engines/wintermute/base/BScriptHolder.h
@@ -31,7 +31,7 @@
 
 #include "engines/wintermute/coll_templ.h"
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/base/BScriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BScriptable.cpp b/engines/wintermute/base/BScriptable.cpp
index e9416cfaf3..d1e3556a85 100644
--- a/engines/wintermute/Base/BScriptable.cpp
+++ b/engines/wintermute/base/BScriptable.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BScriptable.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/BPersistMgr.h"
+#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/BPersistMgr.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BScriptable.h b/engines/wintermute/base/BScriptable.h
index e806b83fac..534bd3bdf1 100644
--- a/engines/wintermute/Base/BScriptable.h
+++ b/engines/wintermute/base/BScriptable.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSCRIPTABLE_H
 
 
-#include "engines/wintermute/Base/BNamedObject.h"
+#include "engines/wintermute/base/BNamedObject.h"
 #include "engines/wintermute/wme_debugger.h"
 #include "engines/wintermute/persistent.h"
 
diff --git a/engines/wintermute/Base/BSound.cpp b/engines/wintermute/base/BSound.cpp
index 315a073301..2b54b39500 100644
--- a/engines/wintermute/Base/BSound.cpp
+++ b/engines/wintermute/base/BSound.cpp
@@ -26,10 +26,10 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Base/BSound.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BSoundMgr.h"
-#include "engines/wintermute/Base/BSoundBuffer.h"
+#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BSoundMgr.h"
+#include "engines/wintermute/base/BSoundBuffer.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BSound.h b/engines/wintermute/base/BSound.h
index 697c49600d..9dc825e4ac 100644
--- a/engines/wintermute/Base/BSound.h
+++ b/engines/wintermute/base/BSound.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BSOUND_H
 #define WINTERMUTE_BSOUND_H
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/dctypes.h"    // Added by ClassView
 #include "engines/wintermute/persistent.h"
 #include "audio/mixer.h"
diff --git a/engines/wintermute/Base/BSoundBuffer.cpp b/engines/wintermute/base/BSoundBuffer.cpp
index 0fc9a9158c..4808cc9007 100644
--- a/engines/wintermute/Base/BSoundBuffer.cpp
+++ b/engines/wintermute/base/BSoundBuffer.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.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"
-#include "engines/wintermute/Base/BFileManager.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"
+#include "engines/wintermute/base/BFileManager.h"
 #include "engines/wintermute/utils/utils.h"
 #include "audio/audiostream.h"
 #include "audio/mixer.h"
diff --git a/engines/wintermute/Base/BSoundBuffer.h b/engines/wintermute/base/BSoundBuffer.h
index 632c53008a..9384670fbb 100644
--- a/engines/wintermute/Base/BSoundBuffer.h
+++ b/engines/wintermute/base/BSoundBuffer.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSOUNDBUFFER_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "audio/mixer.h"
 #include "common/stream.h"
 
diff --git a/engines/wintermute/Base/BSoundMgr.cpp b/engines/wintermute/base/BSoundMgr.cpp
index d4100df7aa..8d9b775c68 100644
--- a/engines/wintermute/Base/BSoundMgr.cpp
+++ b/engines/wintermute/base/BSoundMgr.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BSoundMgr.h"
-#include "engines/wintermute/Base/BRegistry.h"
+#include "engines/wintermute/base/BSoundMgr.h"
+#include "engines/wintermute/base/BRegistry.h"
 #include "engines/wintermute/utils/PathUtil.h"
 #include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/Base/BSoundBuffer.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/BSoundBuffer.h"
 #include "engines/wintermute/wintermute.h"
 #include "common/config-manager.h"
 #include "audio/mixer.h"
diff --git a/engines/wintermute/Base/BSoundMgr.h b/engines/wintermute/base/BSoundMgr.h
index be5be87b59..a021abadaa 100644
--- a/engines/wintermute/Base/BSoundMgr.h
+++ b/engines/wintermute/base/BSoundMgr.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSOUNDMGR_H
 
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "audio/mixer.h"
 #include "common/array.h"
 
diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/base/BSprite.cpp
index 1af73ca595..c93a40ca75 100644
--- a/engines/wintermute/Base/BSprite.cpp
+++ b/engines/wintermute/base/BSprite.cpp
@@ -27,21 +27,21 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/base/BSprite.h"
 #include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/utils/PathUtil.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/Base/gfx/base_surface.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BFrame.h"
-#include "engines/wintermute/Base/BSound.h"
-#include "engines/wintermute/Base/BSubFrame.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BFrame.h"
+#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/base/BSubFrame.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "engines/wintermute/PlatformSDL.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/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BSprite.h b/engines/wintermute/base/BSprite.h
index 30698b62c1..3c67e5f3fe 100644
--- a/engines/wintermute/Base/BSprite.h
+++ b/engines/wintermute/base/BSprite.h
@@ -31,7 +31,7 @@
 
 
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/Base/BScriptHolder.h"
+#include "engines/wintermute/base/BScriptHolder.h"
 
 namespace WinterMute {
 class CBFrame;
diff --git a/engines/wintermute/Base/BStringTable.cpp b/engines/wintermute/base/BStringTable.cpp
index f9d4094004..44f26ba7e8 100644
--- a/engines/wintermute/Base/BStringTable.cpp
+++ b/engines/wintermute/base/BStringTable.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BStringTable.h"
+#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BStringTable.h"
 #include "engines/wintermute/utils/StringUtil.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Base/BStringTable.h b/engines/wintermute/base/BStringTable.h
index 4bdbcdc203..92d3604b4d 100644
--- a/engines/wintermute/Base/BStringTable.h
+++ b/engines/wintermute/base/BStringTable.h
@@ -31,7 +31,7 @@
 
 
 #include "common/hashmap.h"
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BSubFrame.cpp b/engines/wintermute/base/BSubFrame.cpp
index 7569ecb727..60048ac05a 100644
--- a/engines/wintermute/Base/BSubFrame.cpp
+++ b/engines/wintermute/base/BSubFrame.cpp
@@ -27,16 +27,16 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BSubFrame.h"
-#include "engines/wintermute/Base/BActiveRect.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/Base/gfx/base_surface.h"
-#include "engines/wintermute/Base/BSurfaceStorage.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BSubFrame.h"
+#include "engines/wintermute/base/BActiveRect.h"
+#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
+#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BSubFrame.h b/engines/wintermute/base/BSubFrame.h
index 5ff000ea2f..57ffcae675 100644
--- a/engines/wintermute/Base/BSubFrame.h
+++ b/engines/wintermute/base/BSubFrame.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_BSUBFRAME_H
 
 
-#include "engines/wintermute/Base/BBase.h"
-#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/BScriptable.h"
 
 namespace WinterMute {
 class CBObject;
diff --git a/engines/wintermute/Base/BSurfaceStorage.cpp b/engines/wintermute/base/BSurfaceStorage.cpp
index 64bc3daac6..f50d174898 100644
--- a/engines/wintermute/Base/BSurfaceStorage.cpp
+++ b/engines/wintermute/base/BSurfaceStorage.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BSurfaceStorage.h"
-#include "engines/wintermute/Base/gfx/base_surface.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Base/BSurfaceStorage.h b/engines/wintermute/base/BSurfaceStorage.h
index 00ca38a7a1..c054c2a55b 100644
--- a/engines/wintermute/Base/BSurfaceStorage.h
+++ b/engines/wintermute/base/BSurfaceStorage.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BSURFACESTORAGE_H
 #define WINTERMUTE_BSURFACESTORAGE_H
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "common/array.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/BTransitionMgr.cpp b/engines/wintermute/base/BTransitionMgr.cpp
index 81d80c40aa..7c9a95368a 100644
--- a/engines/wintermute/Base/BTransitionMgr.cpp
+++ b/engines/wintermute/base/BTransitionMgr.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BTransitionMgr.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/BTransitionMgr.h"
+#include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/PlatformSDL.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/BTransitionMgr.h b/engines/wintermute/base/BTransitionMgr.h
index 8219afeb46..faedb6fe3e 100644
--- a/engines/wintermute/Base/BTransitionMgr.h
+++ b/engines/wintermute/base/BTransitionMgr.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BTRANSITIONMGR_H
 #define WINTERMUTE_BTRANSITIONMGR_H
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BViewport.cpp b/engines/wintermute/base/BViewport.cpp
index 8f0680dfb6..0f2a67d3bf 100644
--- a/engines/wintermute/Base/BViewport.cpp
+++ b/engines/wintermute/base/BViewport.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/Base/BViewport.h"
+#include "engines/wintermute/base/BViewport.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/BViewport.h b/engines/wintermute/base/BViewport.h
index 667d181dcd..1150b8ebe7 100644
--- a/engines/wintermute/Base/BViewport.h
+++ b/engines/wintermute/base/BViewport.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BVIEWPORT_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 namespace WinterMute {
 class CBObject;
diff --git a/engines/wintermute/Base/file/BDiskFile.cpp b/engines/wintermute/base/file/BDiskFile.cpp
index 2a3386a005..f2938cebc9 100644
--- a/engines/wintermute/Base/file/BDiskFile.cpp
+++ b/engines/wintermute/base/file/BDiskFile.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/wintypes.h"
-#include "engines/wintermute/Base/file/BPkgFile.h"
-#include "engines/wintermute/Base/file/BDiskFile.h"
-#include "engines/wintermute/Base/BFileManager.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/memstream.h"
 #include "common/file.h"
diff --git a/engines/wintermute/Base/file/BDiskFile.h b/engines/wintermute/base/file/BDiskFile.h
index 23e1a0a315..23e1a0a315 100644
--- a/engines/wintermute/Base/file/BDiskFile.h
+++ b/engines/wintermute/base/file/BDiskFile.h
diff --git a/engines/wintermute/Base/file/BFile.cpp b/engines/wintermute/base/file/BFile.cpp
index 9da60a11ec..911039e36d 100644
--- a/engines/wintermute/Base/file/BFile.cpp
+++ b/engines/wintermute/base/file/BFile.cpp
@@ -27,7 +27,7 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/file/BFile.h"
+#include "engines/wintermute/base/file/BFile.h"
 #include "common/memstream.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/file/BFile.h b/engines/wintermute/base/file/BFile.h
index cbdd0b1ff1..d1737df0ce 100644
--- a/engines/wintermute/Base/file/BFile.h
+++ b/engines/wintermute/base/file/BFile.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFILE_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "common/str.h"
 #include "common/stream.h"
 
diff --git a/engines/wintermute/Base/file/BPkgFile.cpp b/engines/wintermute/base/file/BPkgFile.cpp
index fcacfdfd40..7eafe7919e 100644
--- a/engines/wintermute/Base/file/BPkgFile.cpp
+++ b/engines/wintermute/base/file/BPkgFile.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BPackage.h"
-#include "engines/wintermute/Base/file/BPkgFile.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/BPackage.h"
+#include "engines/wintermute/base/file/BPkgFile.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "common/util.h"
 #include "common/file.h"
 #include "common/stream.h"
diff --git a/engines/wintermute/Base/file/BPkgFile.h b/engines/wintermute/base/file/BPkgFile.h
index 0d1916594a..f8a5831485 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/BFileEntry.h"
 
 namespace Common {
 class SeekableReadStream;
diff --git a/engines/wintermute/Base/file/BSaveThumbFile.cpp b/engines/wintermute/base/file/BSaveThumbFile.cpp
index b61c2a586f..b2eebb690b 100644
--- a/engines/wintermute/Base/file/BSaveThumbFile.cpp
+++ b/engines/wintermute/base/file/BSaveThumbFile.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/file/BSaveThumbFile.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/file/BSaveThumbFile.h"
 #include "engines/wintermute/PlatformSDL.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/file/BSaveThumbFile.h b/engines/wintermute/base/file/BSaveThumbFile.h
index 777a4df903..5d33ac2220 100644
--- a/engines/wintermute/Base/file/BSaveThumbFile.h
+++ b/engines/wintermute/base/file/BSaveThumbFile.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSAVETHUMBFILE_H
 
 
-#include "engines/wintermute/Base/file/BFile.h"
+#include "engines/wintermute/base/file/BFile.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/font/BFont.cpp b/engines/wintermute/base/font/BFont.cpp
index f797d49c5b..5d0086c581 100644
--- a/engines/wintermute/Base/font/BFont.cpp
+++ b/engines/wintermute/base/font/BFont.cpp
@@ -27,12 +27,12 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Base/font/BFontBitmap.h"
-#include "engines/wintermute/Base/font/BFontTT.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/font/BFontBitmap.h"
+#include "engines/wintermute/base/font/BFontTT.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/BGame.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/font/BFont.h b/engines/wintermute/base/font/BFont.h
index 5fa9bf3c1c..a6ab757b0d 100644
--- a/engines/wintermute/Base/font/BFont.h
+++ b/engines/wintermute/base/font/BFont.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BFONT_H
 #define WINTERMUTE_BFONT_H
 
-#include "engines/wintermute/Base/BObject.h"
+#include "engines/wintermute/base/BObject.h"
 
 #define NUM_CHARACTERS 256
 
diff --git a/engines/wintermute/Base/font/BFontBitmap.cpp b/engines/wintermute/base/font/BFontBitmap.cpp
index 15e14958f8..031f075d1b 100644
--- a/engines/wintermute/Base/font/BFontBitmap.cpp
+++ b/engines/wintermute/base/font/BFontBitmap.cpp
@@ -27,16 +27,16 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/font/BFontBitmap.h"
+#include "engines/wintermute/base/font/BFontBitmap.h"
 #include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BFrame.h"
-#include "engines/wintermute/Base/gfx/base_surface.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BSubFrame.h"
-#include "engines/wintermute/Base/BFrame.h"
-#include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BFrame.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BSubFrame.h"
+#include "engines/wintermute/base/BFrame.h"
+#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "engines/wintermute/PlatformSDL.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/font/BFontBitmap.h b/engines/wintermute/base/font/BFontBitmap.h
index 4806d61291..17bf433f65 100644
--- a/engines/wintermute/Base/font/BFontBitmap.h
+++ b/engines/wintermute/base/font/BFontBitmap.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFONTBITMAP_H
 
 
-#include "engines/wintermute/Base/font/BFont.h"
+#include "engines/wintermute/base/font/BFont.h"
 
 namespace WinterMute {
 class CBSubFrame;
diff --git a/engines/wintermute/Base/font/BFontStorage.cpp b/engines/wintermute/base/font/BFontStorage.cpp
index 0e2e0af84d..a777ac9db8 100644
--- a/engines/wintermute/Base/font/BFontStorage.cpp
+++ b/engines/wintermute/base/font/BFontStorage.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
 
diff --git a/engines/wintermute/Base/font/BFontStorage.h b/engines/wintermute/base/font/BFontStorage.h
index 4f360c84c5..9759d5d25e 100644
--- a/engines/wintermute/Base/font/BFontStorage.h
+++ b/engines/wintermute/base/font/BFontStorage.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BFONTSTORAGE_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/coll_templ.h"
 
diff --git a/engines/wintermute/Base/font/BFontTT.cpp b/engines/wintermute/base/font/BFontTT.cpp
index fd3dcb3567..2707dbea31 100644
--- a/engines/wintermute/Base/font/BFontTT.cpp
+++ b/engines/wintermute/base/font/BFontTT.cpp
@@ -27,16 +27,16 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/file/BFile.h"
-#include "engines/wintermute/Base/font/BFontTT.h"
+#include "engines/wintermute/base/file/BFile.h"
+#include "engines/wintermute/base/font/BFontTT.h"
 #include "engines/wintermute/utils/PathUtil.h"
 #include "engines/wintermute/utils/StringUtil.h"
 #include "engines/wintermute/math/MathUtil.h"
-#include "engines/wintermute/Base/gfx/base_renderer.h"
-#include "engines/wintermute/Base/gfx/base_surface.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/Base/font/BFontTT.h b/engines/wintermute/base/font/BFontTT.h
index d2b29a89f8..9b995b293e 100644
--- a/engines/wintermute/Base/font/BFontTT.h
+++ b/engines/wintermute/base/font/BFontTT.h
@@ -29,9 +29,9 @@
 #ifndef WINTERMUTE_BFONTTT_H
 #define WINTERMUTE_BFONTTT_H
 
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Base/gfx/base_surface.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
 #include "common/rect.h"
 #include "graphics/surface.h"
 #include "graphics/font.h"
diff --git a/engines/wintermute/Base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp
index e6a6881807..f1e27c9622 100644
--- a/engines/wintermute/Base/gfx/base_image.cpp
+++ b/engines/wintermute/base/gfx/base_image.cpp
@@ -27,9 +27,9 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/gfx/base_image.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/gfx/base_image.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "engines/wintermute/graphics/transparentSurface.h"
 #include "engines/wintermute/utils/StringUtil.h"
 #include "graphics/decoders/png.h"
diff --git a/engines/wintermute/Base/gfx/base_image.h b/engines/wintermute/base/gfx/base_image.h
index 29455d3f7a..646a9ddd2d 100644
--- a/engines/wintermute/Base/gfx/base_image.h
+++ b/engines/wintermute/base/gfx/base_image.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BIMAGE_H
 #define WINTERMUTE_BIMAGE_H
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "graphics/surface.h"
 #include "graphics/pixelformat.h"
 #include "graphics/decoders/image_decoder.h"
diff --git a/engines/wintermute/Base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index a2ecf16cd4..010aca7141 100644
--- a/engines/wintermute/Base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BActiveRect.h"
-#include "engines/wintermute/Base/gfx/base_renderer.h"
-#include "engines/wintermute/Base/gfx/base_surface.h"
-#include "engines/wintermute/Base/BSubFrame.h"
-#include "engines/wintermute/Base/BRegion.h"
+#include "engines/wintermute/base/BActiveRect.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
+#include "engines/wintermute/base/BSubFrame.h"
+#include "engines/wintermute/base/BRegion.h"
 #include "engines/wintermute/PlatformSDL.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h
index b5f654e8ec..81c13f8b39 100644
--- a/engines/wintermute/Base/gfx/base_renderer.h
+++ b/engines/wintermute/base/gfx/base_renderer.h
@@ -31,7 +31,7 @@
 
 
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "common/rect.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/gfx/base_surface.cpp b/engines/wintermute/base/gfx/base_surface.cpp
index dac0692d76..6c0ca40765 100644
--- a/engines/wintermute/Base/gfx/base_surface.cpp
+++ b/engines/wintermute/base/gfx/base_surface.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/wintypes.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/gfx/base_surface.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/gfx/base_surface.h b/engines/wintermute/base/gfx/base_surface.h
index ed9ace5322..f5fbd495aa 100644
--- a/engines/wintermute/Base/gfx/base_surface.h
+++ b/engines/wintermute/base/gfx/base_surface.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BSURFACE_H
 #define WINTERMUTE_BSURFACE_H
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/math/Rect32.h"
 #include "graphics/surface.h"
 
diff --git a/engines/wintermute/Base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 923855686d..fc971357bf 100644
--- a/engines/wintermute/Base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -27,14 +27,14 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/gfx/osystem/base_render_osystem.h"
-#include "engines/wintermute/Base/BRegistry.h"
-#include "engines/wintermute/Base/gfx/osystem/base_surface_osystem.h"
-#include "engines/wintermute/Base/BSurfaceStorage.h"
-#include "engines/wintermute/Base/gfx/base_image.h"
+#include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
+#include "engines/wintermute/base/BRegistry.h"
+#include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
+#include "engines/wintermute/base/BSurfaceStorage.h"
+#include "engines/wintermute/base/gfx/base_image.h"
 #include "engines/wintermute/math/MathUtil.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BSprite.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BSprite.h"
 #include "common/system.h"
 #include "engines/wintermute/graphics/transparentSurface.h"
 #include "common/queue.h"
diff --git a/engines/wintermute/Base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index 44bd1d3906..d41d14ef35 100644
--- a/engines/wintermute/Base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_BRENDERER_SDL_H
 #define WINTERMUTE_BRENDERER_SDL_H
 
-#include "engines/wintermute/Base/gfx/base_renderer.h"
+#include "engines/wintermute/base/gfx/base_renderer.h"
 #include "common/rect.h"
 #include "graphics/surface.h"
 #include "common/list.h"
diff --git a/engines/wintermute/Base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
index 57b3c61b8a..1e4ac9a19e 100644
--- a/engines/wintermute/Base/gfx/osystem/base_surface_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Base/file/BFile.h"
-#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/gfx/osystem/base_surface_osystem.h"
-#include "engines/wintermute/Base/gfx/osystem/base_render_osystem.h"
-#include "engines/wintermute/Base/gfx/base_image.h"
+#include "engines/wintermute/base/file/BFile.h"
+#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
+#include "engines/wintermute/base/gfx/osystem/base_render_osystem.h"
+#include "engines/wintermute/base/gfx/base_image.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "graphics/decoders/png.h"
 #include "graphics/decoders/bmp.h"
diff --git a/engines/wintermute/Base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
index a5298706a3..091e8ccba8 100644
--- a/engines/wintermute/Base/gfx/osystem/base_surface_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_BSURFACESDL_H
 
 #include "graphics/surface.h"
-#include "engines/wintermute/Base/gfx/base_surface.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
 #include "common/list.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/particles/PartEmitter.cpp b/engines/wintermute/base/particles/PartEmitter.cpp
index e113ab7399..81147a5432 100644
--- a/engines/wintermute/Base/particles/PartEmitter.cpp
+++ b/engines/wintermute/base/particles/PartEmitter.cpp
@@ -27,15 +27,15 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/particles/PartEmitter.h"
-#include "engines/wintermute/Base/particles/PartParticle.h"
+#include "engines/wintermute/base/particles/PartEmitter.h"
+#include "engines/wintermute/base/particles/PartParticle.h"
 #include "engines/wintermute/math/Vector2.h"
 #include "engines/wintermute/math/Matrix4.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BRegion.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
diff --git a/engines/wintermute/Base/particles/PartEmitter.h b/engines/wintermute/base/particles/PartEmitter.h
index 92918927ea..5156783653 100644
--- a/engines/wintermute/Base/particles/PartEmitter.h
+++ b/engines/wintermute/base/particles/PartEmitter.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_PARTEMITTER_H
 
 
-#include "engines/wintermute/Base/BObject.h"
-#include "engines/wintermute/Base/particles/PartForce.h"
+#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/particles/PartForce.h"
 
 namespace WinterMute {
 class CBRegion;
diff --git a/engines/wintermute/Base/particles/PartForce.cpp b/engines/wintermute/base/particles/PartForce.cpp
index 69f3f274d3..b864c05292 100644
--- a/engines/wintermute/Base/particles/PartForce.cpp
+++ b/engines/wintermute/base/particles/PartForce.cpp
@@ -28,8 +28,8 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/Base/particles/PartForce.h"
-#include "engines/wintermute/Base/BPersistMgr.h"
+#include "engines/wintermute/base/particles/PartForce.h"
+#include "engines/wintermute/base/BPersistMgr.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/particles/PartForce.h b/engines/wintermute/base/particles/PartForce.h
index d895e22ee7..640c8d7f20 100644
--- a/engines/wintermute/Base/particles/PartForce.h
+++ b/engines/wintermute/base/particles/PartForce.h
@@ -30,8 +30,8 @@
 #define WINTERMUTE_PARTFORCE_H
 
 
-#include "engines/wintermute/Base/BBase.h"
-#include "engines/wintermute/Base/BNamedObject.h"
+#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/BNamedObject.h"
 #include "engines/wintermute/math/Vector2.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/particles/PartParticle.cpp b/engines/wintermute/base/particles/PartParticle.cpp
index 37f9796fe7..aa641f0a1c 100644
--- a/engines/wintermute/Base/particles/PartParticle.cpp
+++ b/engines/wintermute/base/particles/PartParticle.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/particles/PartParticle.h"
-#include "engines/wintermute/Base/particles/PartEmitter.h"
-#include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/particles/PartParticle.h"
+#include "engines/wintermute/base/particles/PartEmitter.h"
+#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "common/str.h"
diff --git a/engines/wintermute/Base/particles/PartParticle.h b/engines/wintermute/base/particles/PartParticle.h
index 02913e3d35..ab5730d3c5 100644
--- a/engines/wintermute/Base/particles/PartParticle.h
+++ b/engines/wintermute/base/particles/PartParticle.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_PARTPARTICLE_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/math/Rect32.h"
 #include "engines/wintermute/math/Vector2.h"
 
diff --git a/engines/wintermute/Base/scriptables/SXArray.cpp b/engines/wintermute/base/scriptables/SXArray.cpp
index e825e5ff97..425118a3e7 100644
--- a/engines/wintermute/Base/scriptables/SXArray.cpp
+++ b/engines/wintermute/base/scriptables/SXArray.cpp
@@ -27,10 +27,10 @@
  */
 
 #include "engines/wintermute/persistent.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Sys/SysInstance.h"
-#include "engines/wintermute/Base/scriptables/SXArray.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/system/SysInstance.h"
+#include "engines/wintermute/base/scriptables/SXArray.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/scriptables/SXArray.h b/engines/wintermute/base/scriptables/SXArray.h
index fcf29f7032..0f46bd546e 100644
--- a/engines/wintermute/Base/scriptables/SXArray.h
+++ b/engines/wintermute/base/scriptables/SXArray.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_SXARRAY_H
 #define WINTERMUTE_SXARRAY_H
 
-#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/base/BScriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/scriptables/SXDate.cpp b/engines/wintermute/base/scriptables/SXDate.cpp
index 214de237fe..cd705cc9d4 100644
--- a/engines/wintermute/Base/scriptables/SXDate.cpp
+++ b/engines/wintermute/base/scriptables/SXDate.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/SXDate.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/SXDate.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/scriptables/SXDate.h b/engines/wintermute/base/scriptables/SXDate.h
index cb1ac4f98f..df0641983f 100644
--- a/engines/wintermute/Base/scriptables/SXDate.h
+++ b/engines/wintermute/base/scriptables/SXDate.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXDATE_H
 
 #include "common/system.h"
-#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/base/BScriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/scriptables/SXFile.cpp b/engines/wintermute/base/scriptables/SXFile.cpp
index f6c34545d0..b2a6d24677 100644
--- a/engines/wintermute/Base/scriptables/SXFile.cpp
+++ b/engines/wintermute/base/scriptables/SXFile.cpp
@@ -26,17 +26,17 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Sys/SysClassRegistry.h"
-#include "engines/wintermute/Sys/SysClass.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/system/SysClassRegistry.h"
+#include "engines/wintermute/system/SysClass.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/utils/utils.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/file/BFile.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/BGame.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"
+#include "engines/wintermute/base/scriptables/SXFile.h"
 
 // Note: This code is completely untested, as I have yet to find a game that uses SXFile.
 
diff --git a/engines/wintermute/Base/scriptables/SXFile.h b/engines/wintermute/base/scriptables/SXFile.h
index f772473dd6..709d1f4378 100644
--- a/engines/wintermute/Base/scriptables/SXFile.h
+++ b/engines/wintermute/base/scriptables/SXFile.h
@@ -30,7 +30,7 @@
 #define WINTERMUTES_SXFILE_H
 
 
-#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/base/BScriptable.h"
 #include "common/stream.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/scriptables/SXMath.cpp b/engines/wintermute/base/scriptables/SXMath.cpp
index 40e185d6cc..fb2838ee94 100644
--- a/engines/wintermute/Base/scriptables/SXMath.cpp
+++ b/engines/wintermute/base/scriptables/SXMath.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Base/scriptables/SXMath.h"
-#include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/SXMath.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
 #include "engines/wintermute/persistent.h"
 #include "common/math.h"
 #include <cmath>
diff --git a/engines/wintermute/Base/scriptables/SXMath.h b/engines/wintermute/base/scriptables/SXMath.h
index eb11b94f34..4389de611f 100644
--- a/engines/wintermute/Base/scriptables/SXMath.h
+++ b/engines/wintermute/base/scriptables/SXMath.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXMATH_H
 
 
-#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/base/BScriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/scriptables/SXMemBuffer.cpp b/engines/wintermute/base/scriptables/SXMemBuffer.cpp
index 296326ebe5..9ac98ab11d 100644
--- a/engines/wintermute/Base/scriptables/SXMemBuffer.cpp
+++ b/engines/wintermute/base/scriptables/SXMemBuffer.cpp
@@ -26,11 +26,11 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Base/BScriptable.h"
-#include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Base/scriptables/ScScript.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/SXMemBuffer.h"
+#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/SXMemBuffer.h"
 #include "common/file.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/scriptables/SXMemBuffer.h b/engines/wintermute/base/scriptables/SXMemBuffer.h
index 9a8746288c..09831bf464 100644
--- a/engines/wintermute/Base/scriptables/SXMemBuffer.h
+++ b/engines/wintermute/base/scriptables/SXMemBuffer.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXMEMBUFFER_H
 
 
-#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/base/BScriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/scriptables/SXString.cpp b/engines/wintermute/base/scriptables/SXString.cpp
index ba70551dde..ed3d243cb0 100644
--- a/engines/wintermute/Base/scriptables/SXString.cpp
+++ b/engines/wintermute/base/scriptables/SXString.cpp
@@ -26,12 +26,12 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
 #include "engines/wintermute/utils/utils.h"
-#include "engines/wintermute/Base/scriptables/SXString.h"
-#include "engines/wintermute/Base/scriptables/SXArray.h"
+#include "engines/wintermute/base/scriptables/SXString.h"
+#include "engines/wintermute/base/scriptables/SXArray.h"
 #include "engines/wintermute/utils/StringUtil.h"
 #include "common/tokenizer.h"
 
diff --git a/engines/wintermute/Base/scriptables/SXString.h b/engines/wintermute/base/scriptables/SXString.h
index 04f9bc80c3..348595ad29 100644
--- a/engines/wintermute/Base/scriptables/SXString.h
+++ b/engines/wintermute/base/scriptables/SXString.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXSTRING_H
 
 
-#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/base/BScriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/scriptables/ScEngine.cpp b/engines/wintermute/base/scriptables/ScEngine.cpp
index 8e57c9a3eb..db79a7d0e9 100644
--- a/engines/wintermute/Base/scriptables/ScEngine.cpp
+++ b/engines/wintermute/base/scriptables/ScEngine.cpp
@@ -27,16 +27,16 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/scriptables/ScEngine.h"
+#include "engines/wintermute/base/scriptables/ScEngine.h"
 #include "engines/wintermute/utils/StringUtil.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/scriptables/SXMath.h"
-#include "engines/wintermute/Base/BRegistry.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BSound.h"
-#include "engines/wintermute/Base/BFileManager.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/scriptables/SXMath.h"
+#include "engines/wintermute/base/BRegistry.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/base/BFileManager.h"
 
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/scriptables/ScEngine.h b/engines/wintermute/base/scriptables/ScEngine.h
index cca1c1aa6b..df327d800c 100644
--- a/engines/wintermute/Base/scriptables/ScEngine.h
+++ b/engines/wintermute/base/scriptables/ScEngine.h
@@ -31,7 +31,7 @@
 
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/coll_templ.h"
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/wme_debugger.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
diff --git a/engines/wintermute/Base/scriptables/ScScript.cpp b/engines/wintermute/base/scriptables/ScScript.cpp
index bddb687934..0b5b3c24bf 100644
--- a/engines/wintermute/Base/scriptables/ScScript.cpp
+++ b/engines/wintermute/base/scriptables/ScScript.cpp
@@ -27,11 +27,11 @@
  */
 
 #include "engines/wintermute/dcgf.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/scriptables/ScEngine.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/base/BGame.h"
+#include "engines/wintermute/base/scriptables/ScEngine.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
 #include "common/memstream.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/Base/scriptables/ScScript.h b/engines/wintermute/base/scriptables/ScScript.h
index 24d3f87fe5..c031f8186f 100644
--- a/engines/wintermute/Base/scriptables/ScScript.h
+++ b/engines/wintermute/base/scriptables/ScScript.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SCSCRIPT_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/dcscript.h"   // Added by ClassView
 #include "engines/wintermute/coll_templ.h"
 
diff --git a/engines/wintermute/Base/scriptables/ScStack.cpp b/engines/wintermute/base/scriptables/ScStack.cpp
index fd85e9a5d8..252cd21dda 100644
--- a/engines/wintermute/Base/scriptables/ScStack.cpp
+++ b/engines/wintermute/base/scriptables/ScStack.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/BGame.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/scriptables/ScStack.h b/engines/wintermute/base/scriptables/ScStack.h
index 739f78424a..22dae63060 100644
--- a/engines/wintermute/Base/scriptables/ScStack.h
+++ b/engines/wintermute/base/scriptables/ScStack.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SCSTACK_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/coll_templ.h"
 #include "engines/wintermute/persistent.h"
 
diff --git a/engines/wintermute/Base/scriptables/ScValue.cpp b/engines/wintermute/base/scriptables/ScValue.cpp
index e75cb133bc..e9d5645682 100644
--- a/engines/wintermute/Base/scriptables/ScValue.cpp
+++ b/engines/wintermute/base/scriptables/ScValue.cpp
@@ -27,12 +27,12 @@
  */
 
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/ScScript.h"
+#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScScript.h"
 #include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/Base/BScriptable.h"
+#include "engines/wintermute/base/BScriptable.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/Base/scriptables/ScValue.h b/engines/wintermute/base/scriptables/ScValue.h
index 3410111d71..c66a60c22a 100644
--- a/engines/wintermute/Base/scriptables/ScValue.h
+++ b/engines/wintermute/base/scriptables/ScValue.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SCVALUE_H
 
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 #include "engines/wintermute/persistent.h"
 #include "engines/wintermute/dcscript.h"   // Added by ClassView
 #include "engines/wintermute/wme_debugger.h"
diff --git a/engines/wintermute/Base/scriptables/SxObject.cpp b/engines/wintermute/base/scriptables/SxObject.cpp
index ba961ed2ae..ba961ed2ae 100644
--- a/engines/wintermute/Base/scriptables/SxObject.cpp
+++ b/engines/wintermute/base/scriptables/SxObject.cpp
diff --git a/engines/wintermute/Base/scriptables/SxObject.h b/engines/wintermute/base/scriptables/SxObject.h
index 35dab041d1..b4ec7c6cde 100644
--- a/engines/wintermute/Base/scriptables/SxObject.h
+++ b/engines/wintermute/base/scriptables/SxObject.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_SXOBJECT_H
 
 
-#include "engines/wintermute/Base/BObject.h"
+#include "engines/wintermute/base/BObject.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h
index fc1d0205c8..e0d7ad8132 100644
--- a/engines/wintermute/coll_templ.h
+++ b/engines/wintermute/coll_templ.h
@@ -31,7 +31,7 @@
 
 
 #include <new>
-#include "engines/wintermute/Base/BPersistMgr.h"
+#include "engines/wintermute/base/BPersistMgr.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp
index 0112bce137..437ee76035 100644
--- a/engines/wintermute/detection.cpp
+++ b/engines/wintermute/detection.cpp
@@ -22,7 +22,7 @@
 
 #include "engines/advancedDetector.h"
 #include "engines/wintermute/wintermute.h"
-#include "engines/wintermute/Base/BPersistMgr.h"
+#include "engines/wintermute/base/BPersistMgr.h"
 
 #include "common/config-manager.h"
 #include "common/error.h"
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index eab99e1eb5..0c74193dac 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -1,91 +1,91 @@
 MODULE := engines/wintermute
  
 MODULE_OBJS := \
-	Ad/AdActor.o \
-	Ad/AdEntity.o \
-	Ad/AdGame.o \
-	Ad/AdInventory.o \
-	Ad/AdInventoryBox.o \
-	Ad/AdItem.o \
-	Ad/AdLayer.o \
-	Ad/AdNodeState.o \
-	Ad/AdObject.o \
-	Ad/AdPath.o \
-	Ad/AdPathPoint.o \
-	Ad/AdRegion.o \
-	Ad/AdResponse.o \
-	Ad/AdResponseBox.o \
-	Ad/AdResponseContext.o \
-	Ad/AdRotLevel.o \
-	Ad/AdScaleLevel.o \
-	Ad/AdScene.o \
-	Ad/AdSceneNode.o \
-	Ad/AdSceneState.o \
-	Ad/AdSentence.o \
-	Ad/AdSpriteSet.o \
-	Ad/AdTalkDef.o \
-	Ad/AdTalkHolder.o \
-	Ad/AdTalkNode.o \
-	Ad/AdWaypointGroup.o \
-	Base/scriptables/ScEngine.o \
-	Base/scriptables/ScScript.o \
-	Base/scriptables/ScStack.o \
-	Base/scriptables/ScValue.o \
-	Base/scriptables/SXArray.o \
-	Base/scriptables/SXDate.o \
-	Base/scriptables/SXFile.o \
-	Base/scriptables/SXMath.o \
-	Base/scriptables/SxObject.o \
-	Base/scriptables/SXMemBuffer.o \
-	Base/scriptables/SXString.o \
-	Base/file/BDiskFile.o \
-	Base/file/BFile.o \
-	Base/file/BSaveThumbFile.o \
-	Base/file/BPkgFile.o \
-	Base/font/BFontBitmap.o \
-	Base/font/BFontTT.o \
-	Base/font/BFont.o \
-	Base/font/BFontStorage.o \
-	Base/gfx/base_image.o \
-	Base/gfx/base_renderer.o \
-	Base/gfx/base_surface.o \
-	Base/gfx/osystem/base_surface_osystem.o \
-	Base/gfx/osystem/base_render_osystem.o \
-	Base/particles/PartParticle.o \
-	Base/particles/PartEmitter.o \
-	Base/particles/PartForce.o \
-	Base/BActiveRect.o \
-	Base/BBase.o \
-	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 \
-	Base/BQuickMsg.o \
-	Base/BRegion.o \
-	Base/BRegistry.o \
-	Base/BResources.o \
-	Base/BSaveThumbHelper.o \
-	Base/BScriptable.o \
-	Base/BScriptHolder.o \
-	Base/BSound.o \
-	Base/BSoundBuffer.o \
-	Base/BSoundMgr.o \
-	Base/BSprite.o \
-	Base/BStringTable.o \
-	Base/BSubFrame.o \
-	Base/BSurfaceStorage.o \
-	Base/BTransitionMgr.o \
-	Base/BViewport.o \
+	ad/AdActor.o \
+	ad/AdEntity.o \
+	ad/AdGame.o \
+	ad/AdInventory.o \
+	ad/AdInventoryBox.o \
+	ad/AdItem.o \
+	ad/AdLayer.o \
+	ad/AdNodeState.o \
+	ad/AdObject.o \
+	ad/AdPath.o \
+	ad/AdPathPoint.o \
+	ad/AdRegion.o \
+	ad/AdResponse.o \
+	ad/AdResponseBox.o \
+	ad/AdResponseContext.o \
+	ad/AdRotLevel.o \
+	ad/AdScaleLevel.o \
+	ad/AdScene.o \
+	ad/AdSceneNode.o \
+	ad/AdSceneState.o \
+	ad/AdSentence.o \
+	ad/AdSpriteSet.o \
+	ad/AdTalkDef.o \
+	ad/AdTalkHolder.o \
+	ad/AdTalkNode.o \
+	ad/AdWaypointGroup.o \
+	base/scriptables/ScEngine.o \
+	base/scriptables/ScScript.o \
+	base/scriptables/ScStack.o \
+	base/scriptables/ScValue.o \
+	base/scriptables/SXArray.o \
+	base/scriptables/SXDate.o \
+	base/scriptables/SXFile.o \
+	base/scriptables/SXMath.o \
+	base/scriptables/SxObject.o \
+	base/scriptables/SXMemBuffer.o \
+	base/scriptables/SXString.o \
+	base/file/BDiskFile.o \
+	base/file/BFile.o \
+	base/file/BSaveThumbFile.o \
+	base/file/BPkgFile.o \
+	base/font/BFontBitmap.o \
+	base/font/BFontTT.o \
+	base/font/BFont.o \
+	base/font/BFontStorage.o \
+	base/gfx/base_image.o \
+	base/gfx/base_renderer.o \
+	base/gfx/base_surface.o \
+	base/gfx/osystem/base_surface_osystem.o \
+	base/gfx/osystem/base_render_osystem.o \
+	base/particles/PartParticle.o \
+	base/particles/PartEmitter.o \
+	base/particles/PartForce.o \
+	base/BActiveRect.o \
+	base/BBase.o \
+	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 \
+	base/BQuickMsg.o \
+	base/BRegion.o \
+	base/BRegistry.o \
+	base/BResources.o \
+	base/BSaveThumbHelper.o \
+	base/BScriptable.o \
+	base/BScriptHolder.o \
+	base/BSound.o \
+	base/BSoundBuffer.o \
+	base/BSoundMgr.o \
+	base/BSprite.o \
+	base/BStringTable.o \
+	base/BSubFrame.o \
+	base/BSurfaceStorage.o \
+	base/BTransitionMgr.o \
+	base/BViewport.o \
 	detection.o \
 	graphics/transparentSurface.o \
 	graphics/tga.o \
@@ -93,20 +93,20 @@ MODULE_OBJS := \
 	math/Matrix4.o \
 	math/Vector2.o \
 	PlatformSDL.o \
-	Sys/SysClass.o \
-	Sys/SysClassRegistry.o \
-	Sys/SysInstance.o \
+	system/SysClass.o \
+	system/SysClassRegistry.o \
+	system/SysInstance.o \
 	tinyxml/tinyxml.o \
 	tinyxml/tinystr.o \
 	tinyxml/tinyxmlparser.o \
 	tinyxml/tinyxmlerror.o \
-	UI/UIButton.o \
-	UI/UIEdit.o \
-	UI/UIEntity.o \
-	UI/UIObject.o \
-	UI/UIText.o \
-	UI/UITiledImage.o \
-	UI/UIWindow.o \
+	ui/UIButton.o \
+	ui/UIEdit.o \
+	ui/UIEntity.o \
+	ui/UIObject.o \
+	ui/UIText.o \
+	ui/UITiledImage.o \
+	ui/UIWindow.o \
 	utils/ConvertUTF.o \
 	utils/crc.o \
 	utils/PathUtil.o \
diff --git a/engines/wintermute/persistent.cpp b/engines/wintermute/persistent.cpp
index 5c09022746..fb00419100 100644
--- a/engines/wintermute/persistent.cpp
+++ b/engines/wintermute/persistent.cpp
@@ -26,65 +26,65 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Ad/AdActor.h"
-#include "engines/wintermute/Ad/AdEntity.h"
-#include "engines/wintermute/Ad/AdGame.h"
-#include "engines/wintermute/Ad/AdInventory.h"
-#include "engines/wintermute/Ad/AdInventoryBox.h"
-#include "engines/wintermute/Ad/AdItem.h"
-#include "engines/wintermute/Ad/AdLayer.h"
-#include "engines/wintermute/Ad/AdNodeState.h"
-#include "engines/wintermute/Ad/AdObject.h"
-#include "engines/wintermute/Ad/AdPath.h"
-#include "engines/wintermute/Ad/AdPathPoint.h"
-#include "engines/wintermute/Ad/AdRegion.h"
-#include "engines/wintermute/Ad/AdResponse.h"
-#include "engines/wintermute/Ad/AdResponseBox.h"
-#include "engines/wintermute/Ad/AdResponseContext.h"
-#include "engines/wintermute/Ad/AdRotLevel.h"
-#include "engines/wintermute/Ad/AdScaleLevel.h"
-#include "engines/wintermute/Ad/AdScene.h"
-#include "engines/wintermute/Ad/AdSceneNode.h"
-#include "engines/wintermute/Ad/AdSceneState.h"
-#include "engines/wintermute/Ad/AdSentence.h"
-#include "engines/wintermute/Ad/AdSpriteSet.h"
-#include "engines/wintermute/Ad/AdTalkDef.h"
-#include "engines/wintermute/Ad/AdTalkHolder.h"
-#include "engines/wintermute/Ad/AdTalkNode.h"
-#include "engines/wintermute/Ad/AdWaypointGroup.h"
-#include "engines/wintermute/Base/BFader.h"
-#include "engines/wintermute/Base/font/BFontBitmap.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/font/BFontTT.h"
-#include "engines/wintermute/Base/BFrame.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BKeyboardState.h"
-#include "engines/wintermute/Base/BObject.h"
-#include "engines/wintermute/Base/BPoint.h"
-#include "engines/wintermute/Base/BRegion.h"
-#include "engines/wintermute/Base/BScriptable.h"
-#include "engines/wintermute/Base/BScriptHolder.h"
-#include "engines/wintermute/Base/BSound.h"
-#include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/Base/BSubFrame.h"
-#include "engines/wintermute/Base/BViewport.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 "engines/wintermute/Base/scriptables/SXArray.h"
-#include "engines/wintermute/Base/scriptables/SXDate.h"
-#include "engines/wintermute/Base/scriptables/SXFile.h"
-#include "engines/wintermute/Base/scriptables/SXMath.h"
-#include "engines/wintermute/Base/scriptables/SXMemBuffer.h"
-#include "engines/wintermute/Base/scriptables/SxObject.h"
-#include "engines/wintermute/Base/scriptables/SXString.h"
-#include "engines/wintermute/UI/UIButton.h"
-#include "engines/wintermute/UI/UIEdit.h"
-#include "engines/wintermute/UI/UIEntity.h"
-#include "engines/wintermute/UI/UIText.h"
-#include "engines/wintermute/UI/UITiledImage.h"
-#include "engines/wintermute/UI/UIWindow.h"
+#include "engines/wintermute/ad/AdActor.h"
+#include "engines/wintermute/ad/AdEntity.h"
+#include "engines/wintermute/ad/AdGame.h"
+#include "engines/wintermute/ad/AdInventory.h"
+#include "engines/wintermute/ad/AdInventoryBox.h"
+#include "engines/wintermute/ad/AdItem.h"
+#include "engines/wintermute/ad/AdLayer.h"
+#include "engines/wintermute/ad/AdNodeState.h"
+#include "engines/wintermute/ad/AdObject.h"
+#include "engines/wintermute/ad/AdPath.h"
+#include "engines/wintermute/ad/AdPathPoint.h"
+#include "engines/wintermute/ad/AdRegion.h"
+#include "engines/wintermute/ad/AdResponse.h"
+#include "engines/wintermute/ad/AdResponseBox.h"
+#include "engines/wintermute/ad/AdResponseContext.h"
+#include "engines/wintermute/ad/AdRotLevel.h"
+#include "engines/wintermute/ad/AdScaleLevel.h"
+#include "engines/wintermute/ad/AdScene.h"
+#include "engines/wintermute/ad/AdSceneNode.h"
+#include "engines/wintermute/ad/AdSceneState.h"
+#include "engines/wintermute/ad/AdSentence.h"
+#include "engines/wintermute/ad/AdSpriteSet.h"
+#include "engines/wintermute/ad/AdTalkDef.h"
+#include "engines/wintermute/ad/AdTalkHolder.h"
+#include "engines/wintermute/ad/AdTalkNode.h"
+#include "engines/wintermute/ad/AdWaypointGroup.h"
+#include "engines/wintermute/base/BFader.h"
+#include "engines/wintermute/base/font/BFontBitmap.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/font/BFontTT.h"
+#include "engines/wintermute/base/BFrame.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BKeyboardState.h"
+#include "engines/wintermute/base/BObject.h"
+#include "engines/wintermute/base/BPoint.h"
+#include "engines/wintermute/base/BRegion.h"
+#include "engines/wintermute/base/BScriptable.h"
+#include "engines/wintermute/base/BScriptHolder.h"
+#include "engines/wintermute/base/BSound.h"
+#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/BSubFrame.h"
+#include "engines/wintermute/base/BViewport.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 "engines/wintermute/base/scriptables/SXArray.h"
+#include "engines/wintermute/base/scriptables/SXDate.h"
+#include "engines/wintermute/base/scriptables/SXFile.h"
+#include "engines/wintermute/base/scriptables/SXMath.h"
+#include "engines/wintermute/base/scriptables/SXMemBuffer.h"
+#include "engines/wintermute/base/scriptables/SxObject.h"
+#include "engines/wintermute/base/scriptables/SXString.h"
+#include "engines/wintermute/ui/UIButton.h"
+#include "engines/wintermute/ui/UIEdit.h"
+#include "engines/wintermute/ui/UIEntity.h"
+#include "engines/wintermute/ui/UIText.h"
+#include "engines/wintermute/ui/UITiledImage.h"
+#include "engines/wintermute/ui/UIWindow.h"
 #include "engines/wintermute/video/VidTheoraPlayer.h"
 
 // CSysClass adds these objects to the registry, thus they aren't as leaked as they look
diff --git a/engines/wintermute/persistent.h b/engines/wintermute/persistent.h
index af1224c200..556ccbbd4f 100644
--- a/engines/wintermute/persistent.h
+++ b/engines/wintermute/persistent.h
@@ -41,8 +41,8 @@ typedef bool(*PERSISTLOAD)(void *, CBPersistMgr *);
 typedef void (*SYS_INSTANCE_CALLBACK)(void *Instance, void *Data);
 } // end of namespace WinterMute
 
-#include "engines/wintermute/Sys/SysClass.h"
-#include "engines/wintermute/Sys/SysClassRegistry.h"
+#include "engines/wintermute/system/SysClass.h"
+#include "engines/wintermute/system/SysClassRegistry.h"
 namespace WinterMute {
 
 
diff --git a/engines/wintermute/Sys/SysClass.cpp b/engines/wintermute/system/SysClass.cpp
index dee4b7d2d0..dee4b7d2d0 100644
--- a/engines/wintermute/Sys/SysClass.cpp
+++ b/engines/wintermute/system/SysClass.cpp
diff --git a/engines/wintermute/Sys/SysClass.h b/engines/wintermute/system/SysClass.h
index f807ea677c..f807ea677c 100644
--- a/engines/wintermute/Sys/SysClass.h
+++ b/engines/wintermute/system/SysClass.h
diff --git a/engines/wintermute/Sys/SysClassRegistry.cpp b/engines/wintermute/system/SysClassRegistry.cpp
index 0b173c3afb..0b173c3afb 100644
--- a/engines/wintermute/Sys/SysClassRegistry.cpp
+++ b/engines/wintermute/system/SysClassRegistry.cpp
diff --git a/engines/wintermute/Sys/SysClassRegistry.h b/engines/wintermute/system/SysClassRegistry.h
index a4a410527d..a4a410527d 100644
--- a/engines/wintermute/Sys/SysClassRegistry.h
+++ b/engines/wintermute/system/SysClassRegistry.h
diff --git a/engines/wintermute/Sys/SysInstance.cpp b/engines/wintermute/system/SysInstance.cpp
index b7f6079912..b7f6079912 100644
--- a/engines/wintermute/Sys/SysInstance.cpp
+++ b/engines/wintermute/system/SysInstance.cpp
diff --git a/engines/wintermute/Sys/SysInstance.h b/engines/wintermute/system/SysInstance.h
index 6becd491af..6becd491af 100644
--- a/engines/wintermute/Sys/SysInstance.h
+++ b/engines/wintermute/system/SysInstance.h
diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/ui/UIButton.cpp
index 40c5166b45..f6c50597bd 100644
--- a/engines/wintermute/UI/UIButton.cpp
+++ b/engines/wintermute/ui/UIButton.cpp
@@ -27,21 +27,21 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/UI/UIButton.h"
-#include "engines/wintermute/UI/UITiledImage.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BActiveRect.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Base/BStringTable.h"
-#include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/ui/UIButton.h"
+#include "engines/wintermute/ui/UITiledImage.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BActiveRect.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/BStringTable.h"
+#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "engines/wintermute/PlatformSDL.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/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScScript.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/UI/UIButton.h b/engines/wintermute/ui/UIButton.h
index 5bdc075ebc..5bdc075ebc 100644
--- a/engines/wintermute/UI/UIButton.h
+++ b/engines/wintermute/ui/UIButton.h
diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/ui/UIEdit.cpp
index f964ada462..4825761734 100644
--- a/engines/wintermute/UI/UIEdit.cpp
+++ b/engines/wintermute/ui/UIEdit.cpp
@@ -26,24 +26,24 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/UI/UIEdit.h"
-#include "engines/wintermute/UI/UIObject.h"
-#include "engines/wintermute/UI/UITiledImage.h"
+#include "engines/wintermute/ui/UIEdit.h"
+#include "engines/wintermute/ui/UIObject.h"
+#include "engines/wintermute/ui/UITiledImage.h"
 #include "engines/wintermute/utils/StringUtil.h"
-#include "engines/wintermute/Base/BActiveRect.h"
-#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/BKeyboardState.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/Base/BStringTable.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/BActiveRect.h"
+#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/BKeyboardState.h"
+#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/base/BStringTable.h"
+#include "engines/wintermute/base/BGame.h"
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/ScStack.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/base/scriptables/ScScript.h"
 #include "engines/wintermute/utils/utils.h"
 #include "common/util.h"
 #include "common/keyboard.h"
diff --git a/engines/wintermute/UI/UIEdit.h b/engines/wintermute/ui/UIEdit.h
index 7249301592..7249301592 100644
--- a/engines/wintermute/UI/UIEdit.h
+++ b/engines/wintermute/ui/UIEdit.h
diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/ui/UIEntity.cpp
index a479cd9bd1..7fbd2d13ff 100644
--- a/engines/wintermute/UI/UIEntity.cpp
+++ b/engines/wintermute/ui/UIEntity.cpp
@@ -26,15 +26,15 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Ad/AdEntity.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/UI/UIEntity.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/ad/AdEntity.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/ui/UIEntity.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"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/UI/UIEntity.h b/engines/wintermute/ui/UIEntity.h
index b0711838a5..b0711838a5 100644
--- a/engines/wintermute/UI/UIEntity.h
+++ b/engines/wintermute/ui/UIEntity.h
diff --git a/engines/wintermute/UI/UIObject.cpp b/engines/wintermute/ui/UIObject.cpp
index 28241c4ae4..1032faeb2c 100644
--- a/engines/wintermute/UI/UIObject.cpp
+++ b/engines/wintermute/ui/UIObject.cpp
@@ -26,15 +26,15 @@
  * Copyright (c) 2011 Jan Nedoma
  */
 
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BSprite.h"
-#include "engines/wintermute/UI/UIObject.h"
-#include "engines/wintermute/UI/UITiledImage.h"
-#include "engines/wintermute/UI/UIWindow.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BSprite.h"
+#include "engines/wintermute/ui/UIObject.h"
+#include "engines/wintermute/ui/UITiledImage.h"
+#include "engines/wintermute/ui/UIWindow.h"
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/scriptables/ScStack.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/scriptables/ScStack.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
 
 namespace WinterMute {
 
diff --git a/engines/wintermute/UI/UIObject.h b/engines/wintermute/ui/UIObject.h
index a51df9485d..26eecefe89 100644
--- a/engines/wintermute/UI/UIObject.h
+++ b/engines/wintermute/ui/UIObject.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_UIOBJECT_H
 
 
-#include "engines/wintermute/Base/BObject.h"
+#include "engines/wintermute/base/BObject.h"
 #include "engines/wintermute/dctypes.h"    // Added by ClassView
 
 namespace WinterMute {
diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/ui/UIText.cpp
index 3ca8e135c1..0b7df9bf19 100644
--- a/engines/wintermute/UI/UIText.cpp
+++ b/engines/wintermute/ui/UIText.cpp
@@ -27,19 +27,19 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/UI/UIText.h"
-#include "engines/wintermute/UI/UITiledImage.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/BStringTable.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/base/BDynBuffer.h"
+#include "engines/wintermute/ui/UIText.h"
+#include "engines/wintermute/ui/UITiledImage.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/BStringTable.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/PlatformSDL.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/UI/UIText.h b/engines/wintermute/ui/UIText.h
index 62fbf00b0a..62fbf00b0a 100644
--- a/engines/wintermute/UI/UIText.h
+++ b/engines/wintermute/ui/UIText.h
diff --git a/engines/wintermute/UI/UITiledImage.cpp b/engines/wintermute/ui/UITiledImage.cpp
index 31500f7863..b80ae76978 100644
--- a/engines/wintermute/UI/UITiledImage.cpp
+++ b/engines/wintermute/ui/UITiledImage.cpp
@@ -27,13 +27,13 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/UI/UITiledImage.h"
-#include "engines/wintermute/Base/gfx/base_surface.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BSubFrame.h"
-#include "engines/wintermute/Base/BFileManager.h"
+#include "engines/wintermute/ui/UITiledImage.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
+#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BSubFrame.h"
+#include "engines/wintermute/base/BFileManager.h"
 #include "engines/wintermute/PlatformSDL.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/UI/UITiledImage.h b/engines/wintermute/ui/UITiledImage.h
index 379af85e81..379af85e81 100644
--- a/engines/wintermute/UI/UITiledImage.h
+++ b/engines/wintermute/ui/UITiledImage.h
diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/ui/UIWindow.cpp
index 1541ca3a1d..1c6931b4a6 100644
--- a/engines/wintermute/UI/UIWindow.cpp
+++ b/engines/wintermute/ui/UIWindow.cpp
@@ -27,25 +27,25 @@
  */
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/UI/UIWindow.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BParser.h"
-#include "engines/wintermute/Base/BActiveRect.h"
-#include "engines/wintermute/Base/BDynBuffer.h"
-#include "engines/wintermute/Base/BKeyboardState.h"
-#include "engines/wintermute/Base/scriptables/ScValue.h"
-#include "engines/wintermute/UI/UIButton.h"
-#include "engines/wintermute/UI/UIEdit.h"
-#include "engines/wintermute/UI/UIText.h"
-#include "engines/wintermute/UI/UITiledImage.h"
-#include "engines/wintermute/Base/BViewport.h"
-#include "engines/wintermute/Base/font/BFontStorage.h"
-#include "engines/wintermute/Base/font/BFont.h"
-#include "engines/wintermute/Base/BStringTable.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/ui/UIWindow.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BParser.h"
+#include "engines/wintermute/base/BActiveRect.h"
+#include "engines/wintermute/base/BDynBuffer.h"
+#include "engines/wintermute/base/BKeyboardState.h"
+#include "engines/wintermute/base/scriptables/ScValue.h"
+#include "engines/wintermute/ui/UIButton.h"
+#include "engines/wintermute/ui/UIEdit.h"
+#include "engines/wintermute/ui/UIText.h"
+#include "engines/wintermute/ui/UITiledImage.h"
+#include "engines/wintermute/base/BViewport.h"
+#include "engines/wintermute/base/font/BFontStorage.h"
+#include "engines/wintermute/base/font/BFont.h"
+#include "engines/wintermute/base/BStringTable.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/PlatformSDL.h"
 
 namespace WinterMute {
diff --git a/engines/wintermute/UI/UIWindow.h b/engines/wintermute/ui/UIWindow.h
index f1d46711ff..f1d46711ff 100644
--- a/engines/wintermute/UI/UIWindow.h
+++ b/engines/wintermute/ui/UIWindow.h
diff --git a/engines/wintermute/utils/utils.cpp b/engines/wintermute/utils/utils.cpp
index 9efc7b8935..641b2d20ac 100644
--- a/engines/wintermute/utils/utils.cpp
+++ b/engines/wintermute/utils/utils.cpp
@@ -31,7 +31,7 @@
 #include "engines/wintermute/PlatformSDL.h"
 #include "engines/wintermute/wintypes.h"
 #include "PathUtil.h"
-#include "engines/wintermute/Base/BGame.h"
+#include "engines/wintermute/base/BGame.h"
 #include "common/str.h"
 #include "common/textconsole.h"
 #include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/video/VidPlayer.h b/engines/wintermute/video/VidPlayer.h
index fd587aa609..a44482e4c6 100644
--- a/engines/wintermute/video/VidPlayer.h
+++ b/engines/wintermute/video/VidPlayer.h
@@ -34,7 +34,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "engines/wintermute/Base/BBase.h"
+#include "engines/wintermute/base/BBase.h"
 
 #define MAX_AUDIO_STREAMS 5
 #define MAX_VIDEO_STREAMS 5
diff --git a/engines/wintermute/video/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp
index 3bbd2172f7..8727f6f5a6 100644
--- a/engines/wintermute/video/VidTheoraPlayer.cpp
+++ b/engines/wintermute/video/VidTheoraPlayer.cpp
@@ -29,12 +29,12 @@
 
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/video/VidTheoraPlayer.h"
-#include "engines/wintermute/Base/BBase.h"
-#include "engines/wintermute/Base/BGame.h"
-#include "engines/wintermute/Base/BFileManager.h"
-#include "engines/wintermute/Base/gfx/osystem/base_surface_osystem.h"
-#include "engines/wintermute/Base/gfx/base_image.h"
-#include "engines/wintermute/Base/BSoundMgr.h"
+#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/BGame.h"
+#include "engines/wintermute/base/BFileManager.h"
+#include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
+#include "engines/wintermute/base/gfx/base_image.h"
+#include "engines/wintermute/base/BSoundMgr.h"
 #include "engines/wintermute/utils/utils.h"
 #include "engines/wintermute/PlatformSDL.h"
 #include "engines/wintermute/video/decoders/theora_decoder.h"
diff --git a/engines/wintermute/video/VidTheoraPlayer.h b/engines/wintermute/video/VidTheoraPlayer.h
index f403a82f64..f624c9a972 100644
--- a/engines/wintermute/video/VidTheoraPlayer.h
+++ b/engines/wintermute/video/VidTheoraPlayer.h
@@ -29,8 +29,8 @@
 #ifndef WINTERMUTE_VIDTHEORAPLAYER_H
 #define WINTERMUTE_VIDTHEORAPLAYER_H
 
-#include "engines/wintermute/Base/BBase.h"
-#include "engines/wintermute/Base/file/BFile.h"
+#include "engines/wintermute/base/BBase.h"
+#include "engines/wintermute/base/file/BFile.h"
 #include "engines/wintermute/persistent.h"
 #include "video/video_decoder.h"
 #include "common/stream.h"
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 528c379aa9..22981dc35f 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -31,13 +31,13 @@
 #include "common/fs.h"
 
 #include "engines/util.h"
-#include "engines/wintermute/Ad/AdGame.h"
+#include "engines/wintermute/ad/AdGame.h"
 #include "engines/wintermute/wintermute.h"
 #include "engines/wintermute/PlatformSDL.h"
-#include "engines/wintermute/Base/BRegistry.h"
+#include "engines/wintermute/base/BRegistry.h"
 
-#include "engines/wintermute/Base/BSoundMgr.h"
-#include "engines/wintermute/Base/scriptables/ScEngine.h"
+#include "engines/wintermute/base/BSoundMgr.h"
+#include "engines/wintermute/base/scriptables/ScEngine.h"
 
 namespace WinterMute {