WINTERMUTE: Add folders for utils and video

47 files changed, 67 insertions, 67 deletions

diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp
index 17c7b317a1..07eac85a93 100644
--- a/engines/wintermute/Ad/AdActor.cpp
+++ b/engines/wintermute/Ad/AdActor.cpp
@@ -46,7 +46,7 @@
 #include "engines/wintermute/Base/scriptables/ScScript.h"

 #include "engines/wintermute/Base/scriptables/ScValue.h"

 #include "engines/wintermute/Base/scriptables/ScStack.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include <math.h>

 

diff --git a/engines/wintermute/Ad/AdEntity.cpp b/engines/wintermute/Ad/AdEntity.cpp
index 6f628dfd72..c8a40f857d 100644
--- a/engines/wintermute/Ad/AdEntity.cpp
+++ b/engines/wintermute/Ad/AdEntity.cpp
@@ -46,7 +46,7 @@
 #include "engines/wintermute/Base/BSprite.h"

 #include "engines/wintermute/Base/BFileManager.h"

 #include "engines/wintermute/PlatformSDL.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/Base/scriptables/ScValue.h"

 #include "engines/wintermute/Base/scriptables/ScScript.h"

 #include "engines/wintermute/Base/scriptables/ScStack.h"

diff --git a/engines/wintermute/Ad/AdGame.cpp b/engines/wintermute/Ad/AdGame.cpp
index 319709734c..175cc98b38 100644
--- a/engines/wintermute/Ad/AdGame.cpp
+++ b/engines/wintermute/Ad/AdGame.cpp
@@ -56,7 +56,7 @@
 #include "engines/wintermute/Base/scriptables/ScStack.h"

 #include "engines/wintermute/Base/BSprite.h"

 #include "engines/wintermute/Base/BFileManager.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/Ad/AdItem.cpp b/engines/wintermute/Ad/AdItem.cpp
index 343bc6c6fc..09a9ef08f4 100644
--- a/engines/wintermute/Ad/AdItem.cpp
+++ b/engines/wintermute/Ad/AdItem.cpp
@@ -37,7 +37,7 @@
 #include "engines/wintermute/Base/BParser.h"

 #include "engines/wintermute/Base/BSound.h"

 #include "engines/wintermute/Base/BSprite.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "engines/wintermute/Base/scriptables/ScScript.h"

 #include "engines/wintermute/Base/scriptables/ScStack.h"

diff --git a/engines/wintermute/Ad/AdNodeState.cpp b/engines/wintermute/Ad/AdNodeState.cpp
index bd4dc1906c..00703c3b1a 100644
--- a/engines/wintermute/Ad/AdNodeState.cpp
+++ b/engines/wintermute/Ad/AdNodeState.cpp
@@ -32,7 +32,7 @@
 #include "engines/wintermute/Ad/AdEntity.h"

 #include "engines/wintermute/Base/BStringTable.h"

 #include "engines/wintermute/Base/BSprite.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/Ad/AdResponse.cpp b/engines/wintermute/Ad/AdResponse.cpp
index 656d38f247..952ecce4b7 100644
--- a/engines/wintermute/Ad/AdResponse.cpp
+++ b/engines/wintermute/Ad/AdResponse.cpp
@@ -31,7 +31,7 @@
 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/BFontStorage.h"

 #include "engines/wintermute/Base/BSprite.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdResponseBox.cpp b/engines/wintermute/Ad/AdResponseBox.cpp
index 5d946b4895..4ce6172015 100644
--- a/engines/wintermute/Ad/AdResponseBox.cpp
+++ b/engines/wintermute/Ad/AdResponseBox.cpp
@@ -41,7 +41,7 @@
 #include "engines/wintermute/Base/scriptables/ScStack.h"

 #include "engines/wintermute/Base/BSprite.h"

 #include "engines/wintermute/Base/BFileManager.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/Ad/AdScene.cpp b/engines/wintermute/Ad/AdScene.cpp
index f3760dcb98..8ebc674c63 100644
--- a/engines/wintermute/Ad/AdScene.cpp
+++ b/engines/wintermute/Ad/AdScene.cpp
@@ -57,7 +57,7 @@
 #include "engines/wintermute/Base/scriptables/ScValue.h"

 #include "engines/wintermute/Base/scriptables/ScScript.h"

 #include "engines/wintermute/UI/UIWindow.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include <math.h>

 #include <limits.h>

 

diff --git a/engines/wintermute/Ad/AdSentence.cpp b/engines/wintermute/Ad/AdSentence.cpp
index a280916734..28e5b2cf26 100644
--- a/engines/wintermute/Ad/AdSentence.cpp
+++ b/engines/wintermute/Ad/AdSentence.cpp
@@ -31,7 +31,7 @@
 #include "engines/wintermute/Ad/AdTalkDef.h"

 #include "engines/wintermute/Ad/AdTalkNode.h"

 #include "engines/wintermute/Ad/AdGame.h"

-#include "engines/wintermute/PathUtil.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"

diff --git a/engines/wintermute/Ad/AdTalkDef.cpp b/engines/wintermute/Ad/AdTalkDef.cpp
index d3c655bebe..67c7c74e42 100644
--- a/engines/wintermute/Ad/AdTalkDef.cpp
+++ b/engines/wintermute/Ad/AdTalkDef.cpp
@@ -35,7 +35,7 @@
 #include "engines/wintermute/Base/BSprite.h"

 #include "engines/wintermute/Ad/AdSpriteSet.h"

 #include "engines/wintermute/Base/BFileManager.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Ad/AdTalkNode.cpp b/engines/wintermute/Ad/AdTalkNode.cpp
index 2c68b188e6..c8f2c2c971 100644
--- a/engines/wintermute/Ad/AdTalkNode.cpp
+++ b/engines/wintermute/Ad/AdTalkNode.cpp
@@ -33,7 +33,7 @@
 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/BSprite.h"

 #include "engines/wintermute/Ad/AdSpriteSet.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 namespace WinterMute {

 

 IMPLEMENT_PERSISTENT(CAdTalkNode, false)

diff --git a/engines/wintermute/Base/BFileManager.cpp b/engines/wintermute/Base/BFileManager.cpp
index 99f64a4d3b..8a8de885c0 100644
--- a/engines/wintermute/Base/BFileManager.cpp
+++ b/engines/wintermute/Base/BFileManager.cpp
@@ -30,8 +30,8 @@
 #define FORBIDDEN_SYMBOL_ALLOW_ALL

 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/Base/BFileManager.h"

-#include "engines/wintermute/StringUtil.h"

-#include "engines/wintermute/PathUtil.h"

+#include "engines/wintermute/utils/StringUtil.h"

+#include "engines/wintermute/utils/PathUtil.h"

 #include "engines/wintermute/Base/BDiskFile.h"

 #include "engines/wintermute/Base/BResourceFile.h"

 #include "engines/wintermute/Base/BSaveThumbFile.h"

@@ -41,7 +41,7 @@
 #include "engines/wintermute/Base/BRegistry.h"

 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/dcpackage.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "common/str.h"

 #include "common/textconsole.h"

diff --git a/engines/wintermute/Base/BFontBitmap.cpp b/engines/wintermute/Base/BFontBitmap.cpp
index 98864f6ebd..759db24994 100644
--- a/engines/wintermute/Base/BFontBitmap.cpp
+++ b/engines/wintermute/Base/BFontBitmap.cpp
@@ -28,7 +28,7 @@
 

 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/Base/BFontBitmap.h"

-#include "engines/wintermute/StringUtil.h"

+#include "engines/wintermute/utils/StringUtil.h"

 #include "engines/wintermute/Base/BParser.h"

 #include "engines/wintermute/Base/BFrame.h"

 #include "engines/wintermute/Base/BSurface.h"

diff --git a/engines/wintermute/Base/BFontTT.cpp b/engines/wintermute/Base/BFontTT.cpp
index a52baeb70b..003cada4c7 100644
--- a/engines/wintermute/Base/BFontTT.cpp
+++ b/engines/wintermute/Base/BFontTT.cpp
@@ -32,15 +32,15 @@
 #include "engines/wintermute/Base/BFile.h"

 #include "engines/wintermute/Base/BFontTT.h"

 #include "engines/wintermute/FontGlyphCache.h"

-#include "engines/wintermute/PathUtil.h"

-#include "engines/wintermute/StringUtil.h"

+#include "engines/wintermute/utils/PathUtil.h"

+#include "engines/wintermute/utils/StringUtil.h"

 #include "engines/wintermute/math/MathUtil.h"

 #include "engines/wintermute/Base/BRenderSDL.h"

 #include "engines/wintermute/Base/BSurfaceSDL.h"

 #include "engines/wintermute/Base/BParser.h"

 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/BFileManager.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "graphics/fonts/ttf.h"

 #include "graphics/fontman.h"

diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp
index dbeb010317..7febffbab5 100644
--- a/engines/wintermute/Base/BGame.cpp
+++ b/engines/wintermute/Base/BGame.cpp
@@ -51,9 +51,9 @@
 #include "engines/wintermute/Base/BRegion.h"

 #include "engines/wintermute/Base/BSaveThumbHelper.h"

 #include "engines/wintermute/Base/BSurfaceStorage.h"

-#include "engines/wintermute/crc.h"

-#include "engines/wintermute/PathUtil.h"

-#include "engines/wintermute/StringUtil.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"

diff --git a/engines/wintermute/Base/BPersistMgr.cpp b/engines/wintermute/Base/BPersistMgr.cpp
index 76156edc61..7c5505bd4a 100644
--- a/engines/wintermute/Base/BPersistMgr.cpp
+++ b/engines/wintermute/Base/BPersistMgr.cpp
@@ -33,7 +33,7 @@
 #include "engines/wintermute/Base/BSaveThumbHelper.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "engines/wintermute/math/Vector2.h"

-#include "engines/wintermute/StringUtil.h"

+#include "engines/wintermute/utils/StringUtil.h"

 #include "engines/wintermute/Base/BImage.h"

 #include "engines/wintermute/Base/BSound.h"

 #include "common/str.h"

diff --git a/engines/wintermute/Base/BRegistry.cpp b/engines/wintermute/Base/BRegistry.cpp
index 87d7c492c4..06a8a63f4f 100644
--- a/engines/wintermute/Base/BRegistry.cpp
+++ b/engines/wintermute/Base/BRegistry.cpp
@@ -29,10 +29,10 @@
 #include <fstream>

 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/BRegistry.h"

-#include "engines/wintermute/PathUtil.h"

-#include "engines/wintermute/StringUtil.h"

+#include "engines/wintermute/utils/PathUtil.h"

+#include "engines/wintermute/utils/StringUtil.h"

 #include "engines/wintermute/tinyxml/tinyxml.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Base/BSoundBuffer.cpp b/engines/wintermute/Base/BSoundBuffer.cpp
index 9dcbbadf7e..2a3daf144a 100644
--- a/engines/wintermute/Base/BSoundBuffer.cpp
+++ b/engines/wintermute/Base/BSoundBuffer.cpp
@@ -32,7 +32,7 @@
 #include "engines/wintermute/Base/BSoundMgr.h"

 #include "engines/wintermute/Base/BSoundBuffer.h"

 #include "engines/wintermute/Base/BFileManager.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "audio/audiostream.h"

 #include "audio/mixer.h"

 #include "audio/decoders/vorbis.h"

diff --git a/engines/wintermute/Base/BSoundMgr.cpp b/engines/wintermute/Base/BSoundMgr.cpp
index d0d757777f..8c98f83dc2 100644
--- a/engines/wintermute/Base/BSoundMgr.cpp
+++ b/engines/wintermute/Base/BSoundMgr.cpp
@@ -29,8 +29,8 @@
 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/Base/BSoundMgr.h"

 #include "engines/wintermute/Base/BRegistry.h"

-#include "engines/wintermute/PathUtil.h"

-#include "engines/wintermute/StringUtil.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"

 

diff --git a/engines/wintermute/Base/BSprite.cpp b/engines/wintermute/Base/BSprite.cpp
index 5720cd1f42..87da65e9d0 100644
--- a/engines/wintermute/Base/BSprite.cpp
+++ b/engines/wintermute/Base/BSprite.cpp
@@ -28,8 +28,8 @@
 

 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/Base/BSprite.h"

-#include "engines/wintermute/StringUtil.h"

-#include "engines/wintermute/PathUtil.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/BSurface.h"

diff --git a/engines/wintermute/Base/BStringTable.cpp b/engines/wintermute/Base/BStringTable.cpp
index f8196c5677..8b71e2ac60 100644
--- a/engines/wintermute/Base/BStringTable.cpp
+++ b/engines/wintermute/Base/BStringTable.cpp
@@ -30,7 +30,7 @@
 #include "engines/wintermute/Base/BFileManager.h"

 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/BStringTable.h"

-#include "engines/wintermute/StringUtil.h"

+#include "engines/wintermute/utils/StringUtil.h"

 #include "common/str.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/Base/PartEmitter.cpp b/engines/wintermute/Base/PartEmitter.cpp
index 2667643882..e37d0f1373 100644
--- a/engines/wintermute/Base/PartEmitter.cpp
+++ b/engines/wintermute/Base/PartEmitter.cpp
@@ -35,7 +35,7 @@
 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/BRegion.h"

 #include "engines/wintermute/Base/BFileManager.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "common/str.h"

 

diff --git a/engines/wintermute/Base/PartParticle.cpp b/engines/wintermute/Base/PartParticle.cpp
index 5a17706ca6..cb276242c0 100644
--- a/engines/wintermute/Base/PartParticle.cpp
+++ b/engines/wintermute/Base/PartParticle.cpp
@@ -31,7 +31,7 @@
 #include "engines/wintermute/Base/PartEmitter.h"

 #include "engines/wintermute/Base/BSprite.h"

 #include "engines/wintermute/Base/BGame.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "common/str.h"

 #include <math.h>

diff --git a/engines/wintermute/Base/scriptables/SXFile.cpp b/engines/wintermute/Base/scriptables/SXFile.cpp
index 9e954cd1ef..7761246ed6 100644
--- a/engines/wintermute/Base/scriptables/SXFile.cpp
+++ b/engines/wintermute/Base/scriptables/SXFile.cpp
@@ -31,7 +31,7 @@
 #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.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/BFile.h"

 #include "engines/wintermute/Base/BFileManager.h"

diff --git a/engines/wintermute/Base/scriptables/SXStore.cpp b/engines/wintermute/Base/scriptables/SXStore.cpp
index 3562392b13..26d19376a1 100644
--- a/engines/wintermute/Base/scriptables/SXStore.cpp
+++ b/engines/wintermute/Base/scriptables/SXStore.cpp
@@ -32,7 +32,7 @@
 #include "engines/wintermute/Base/scriptables/ScValue.h"

 #include "engines/wintermute/Base/scriptables/ScScript.h"

 #include "engines/wintermute/Base/scriptables/ScStack.h"

-#include "engines/wintermute/StringUtil.h"

+#include "engines/wintermute/utils/StringUtil.h"

 

 #ifdef __IPHONEOS__

 #   include "IOS_StoreKit_interface.h"

diff --git a/engines/wintermute/Base/scriptables/SXStore.h b/engines/wintermute/Base/scriptables/SXStore.h
index 42fe6983e4..0d73bb9c11 100644
--- a/engines/wintermute/Base/scriptables/SXStore.h
+++ b/engines/wintermute/Base/scriptables/SXStore.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_SXSTORE_H

 #define WINTERMUTE_SXSTORE_H

 #include "engines/wintermute/Base/BPersistMgr.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/Base/BObject.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/Base/scriptables/SXString.cpp b/engines/wintermute/Base/scriptables/SXString.cpp
index 408b892c05..4a1936da58 100644
--- a/engines/wintermute/Base/scriptables/SXString.cpp
+++ b/engines/wintermute/Base/scriptables/SXString.cpp
@@ -29,10 +29,10 @@
 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/scriptables/ScStack.h"

 #include "engines/wintermute/Base/scriptables/ScValue.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/Base/scriptables/SXString.h"

 #include "engines/wintermute/Base/scriptables/SXArray.h"

-#include "engines/wintermute/StringUtil.h"

+#include "engines/wintermute/utils/StringUtil.h"

 

 namespace WinterMute {

 

diff --git a/engines/wintermute/Base/scriptables/ScEngine.cpp b/engines/wintermute/Base/scriptables/ScEngine.cpp
index 9929fd7ce2..a2c7e077a0 100644
--- a/engines/wintermute/Base/scriptables/ScEngine.cpp
+++ b/engines/wintermute/Base/scriptables/ScEngine.cpp
@@ -28,7 +28,7 @@
 

 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/Base/scriptables/ScEngine.h"

-#include "engines/wintermute/StringUtil.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"

diff --git a/engines/wintermute/Base/scriptables/ScEngine.h b/engines/wintermute/Base/scriptables/ScEngine.h
index 5e2e5861e7..4d545bea66 100644
--- a/engines/wintermute/Base/scriptables/ScEngine.h
+++ b/engines/wintermute/Base/scriptables/ScEngine.h
@@ -33,7 +33,7 @@
 #include "engines/wintermute/coll_templ.h"

 #include "engines/wintermute/Base/BBase.h"

 #include "engines/wintermute/wme_debugger.h"

-#include "engines/wintermute/utils.h"

+#include "engines/wintermute/utils/utils.h"

 #include "engines/wintermute/PlatformSDL.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/Base/scriptables/ScValue.cpp b/engines/wintermute/Base/scriptables/ScValue.cpp
index ed3778b635..b2df4cae16 100644
--- a/engines/wintermute/Base/scriptables/ScValue.cpp
+++ b/engines/wintermute/Base/scriptables/ScValue.cpp
@@ -31,7 +31,7 @@
 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/scriptables/ScValue.h"

 #include "engines/wintermute/Base/scriptables/ScScript.h"

-#include "engines/wintermute/StringUtil.h"

+#include "engines/wintermute/utils/StringUtil.h"

 #include "engines/wintermute/Base/BScriptable.h"

 

 namespace WinterMute {

diff --git a/engines/wintermute/PlatformSDL.cpp b/engines/wintermute/PlatformSDL.cpp
index 765c6ecd93..909ecb525e 100644
--- a/engines/wintermute/PlatformSDL.cpp
+++ b/engines/wintermute/PlatformSDL.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/dcgf.h"

 #include "engines/wintermute/Base/BGame.h"

 #include "engines/wintermute/Base/BRenderSDL.h"

-#include "engines/wintermute/PathUtil.h"

+#include "engines/wintermute/utils/PathUtil.h"

 #include "engines/wintermute/PlatformSDL.h"

 #include "engines/wintermute/Base/BRegistry.h"

 #include "engines/wintermute/Base/BSoundMgr.h"

diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp
index 3f2bc71996..b85159240f 100644
--- a/engines/wintermute/UI/UIEdit.cpp
+++ b/engines/wintermute/UI/UIEdit.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/UI/UIEdit.h"

 #include "engines/wintermute/UI/UIObject.h"

 #include "engines/wintermute/UI/UITiledImage.h"

-#include "engines/wintermute/StringUtil.h"

+#include "engines/wintermute/utils/StringUtil.h"

 #include "engines/wintermute/Base/BActiveRect.h"

 #include "engines/wintermute/Base/BFileManager.h"

 #include "engines/wintermute/Base/BFont.h"

@@ -44,7 +44,7 @@
 #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.h"

+#include "engines/wintermute/utils/utils.h"

 #include "common/util.h"

 #include "common/keyboard.h"

 

diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index 8e929b0dcd..59caef82b1 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -1,18 +1,6 @@
 MODULE := engines/wintermute
  
 MODULE_OBJS := \
-	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/SXStore.o \
-	Base/scriptables/SXString.o \
 	Ad/AdActor.o \
 	Ad/AdActorDir.o \
 	Ad/AdEntity.o \
@@ -40,6 +28,18 @@ MODULE_OBJS := \
 	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/SXStore.o \
+	Base/scriptables/SXString.o \
 	Base/BActiveRect.o \
 	Base/BBase.o \
 	Base/BDebugger.o \
@@ -86,8 +86,9 @@ MODULE_OBJS := \
 	Base/BSurfaceStorage.o \
 	Base/BTransitionMgr.o \
 	Base/BViewport.o \
-	ConvertUTF.o \
-	crc.o \
+	Base/PartParticle.o \
+	Base/PartEmitter.o \
+	Base/PartForce.o \
 	detection.o \
 	FontGlyphCache.o \
 	graphics/transparentSurface.o \
@@ -95,12 +96,7 @@ MODULE_OBJS := \
 	math/MathUtil.o \
 	math/Matrix4.o \
 	math/Vector2.o \
-	PathUtil.o \
-	Base/PartParticle.o \
-	Base/PartEmitter.o \
-	Base/PartForce.o \
 	PlatformSDL.o \
-	StringUtil.o \
 	Sys/SysClass.o \
 	Sys/SysClassRegistry.o \
 	Sys/SysInstance.o \
@@ -115,9 +111,13 @@ MODULE_OBJS := \
 	UI/UIText.o \
 	UI/UITiledImage.o \
 	UI/UIWindow.o \
-	utils.o \
-	VidPlayer.o \
-	VidTheoraPlayer.o \
+	utils/ConvertUTF.o \
+	utils/crc.o \
+	utils/PathUtil.o \
+	utils/StringUtil.o \
+	utils/utils.o \
+	video/VidPlayer.o \
+	video/VidTheoraPlayer.o \
 	wintermute.o
  
 MODULE_DIRS += \
diff --git a/engines/wintermute/ConvertUTF.c b/engines/wintermute/utils/ConvertUTF.c
index 8f7d6d2124..8f7d6d2124 100644
--- a/engines/wintermute/ConvertUTF.c
+++ b/engines/wintermute/utils/ConvertUTF.c
diff --git a/engines/wintermute/ConvertUTF.h b/engines/wintermute/utils/ConvertUTF.h
index 03a8bb2bae..03a8bb2bae 100644
--- a/engines/wintermute/ConvertUTF.h
+++ b/engines/wintermute/utils/ConvertUTF.h
diff --git a/engines/wintermute/PathUtil.cpp b/engines/wintermute/utils/PathUtil.cpp
index dc722e2389..dc722e2389 100644
--- a/engines/wintermute/PathUtil.cpp
+++ b/engines/wintermute/utils/PathUtil.cpp
diff --git a/engines/wintermute/PathUtil.h b/engines/wintermute/utils/PathUtil.h
index 0bc883a1fa..0bc883a1fa 100644
--- a/engines/wintermute/PathUtil.h
+++ b/engines/wintermute/utils/PathUtil.h
diff --git a/engines/wintermute/StringUtil.cpp b/engines/wintermute/utils/StringUtil.cpp
index cd4f99e034..cd4f99e034 100644
--- a/engines/wintermute/StringUtil.cpp
+++ b/engines/wintermute/utils/StringUtil.cpp
diff --git a/engines/wintermute/StringUtil.h b/engines/wintermute/utils/StringUtil.h
index a4727fabbe..a4727fabbe 100644
--- a/engines/wintermute/StringUtil.h
+++ b/engines/wintermute/utils/StringUtil.h
diff --git a/engines/wintermute/crc.cpp b/engines/wintermute/utils/crc.cpp
index adfd5da624..adfd5da624 100644
--- a/engines/wintermute/crc.cpp
+++ b/engines/wintermute/utils/crc.cpp
diff --git a/engines/wintermute/crc.h b/engines/wintermute/utils/crc.h
index 578b423de8..578b423de8 100644
--- a/engines/wintermute/crc.h
+++ b/engines/wintermute/utils/crc.h
diff --git a/engines/wintermute/utils.cpp b/engines/wintermute/utils/utils.cpp
index d1ce280639..d1ce280639 100644
--- a/engines/wintermute/utils.cpp
+++ b/engines/wintermute/utils/utils.cpp
diff --git a/engines/wintermute/utils.h b/engines/wintermute/utils/utils.h
index 46e895ff4d..46e895ff4d 100644
--- a/engines/wintermute/utils.h
+++ b/engines/wintermute/utils/utils.h
diff --git a/engines/wintermute/VidPlayer.cpp b/engines/wintermute/video/VidPlayer.cpp
index ab20135595..ab20135595 100644
--- a/engines/wintermute/VidPlayer.cpp
+++ b/engines/wintermute/video/VidPlayer.cpp
diff --git a/engines/wintermute/VidPlayer.h b/engines/wintermute/video/VidPlayer.h
index a1abf2ea46..a1abf2ea46 100644
--- a/engines/wintermute/VidPlayer.h
+++ b/engines/wintermute/video/VidPlayer.h
diff --git a/engines/wintermute/VidTheoraPlayer.cpp b/engines/wintermute/video/VidTheoraPlayer.cpp
index 509a7006e5..01e1728732 100644
--- a/engines/wintermute/VidTheoraPlayer.cpp
+++ b/engines/wintermute/video/VidTheoraPlayer.cpp
@@ -18,7 +18,7 @@
 
 
 #include "engines/wintermute/dcgf.h"
-#include "engines/wintermute/vidtheoraplayer.h"
+#include "engines/wintermute/video/vidtheoraplayer.h"
 
 //#pragma comment(lib, "libtheora.lib")
 
diff --git a/engines/wintermute/VidTheoraPlayer.h b/engines/wintermute/video/VidTheoraPlayer.h
index 38f3fe85ae..38f3fe85ae 100644
--- a/engines/wintermute/VidTheoraPlayer.h
+++ b/engines/wintermute/video/VidTheoraPlayer.h