updated the CE project files for the 0.9.0 codebase

svn-id: r23029

1 files changed, 3127 insertions, 3816 deletions

diff --git a/dists/msevc4/sword2/sword2.vcp b/dists/msevc4/sword2/sword2.vcp
index 5774a1e6ba..fff8c6e5b3 100644
--- a/dists/msevc4/sword2/sword2.vcp
+++ b/dists/msevc4/sword2/sword2.vcp
@@ -55,15 +55,15 @@ CFG=sword2 - Win32 (WCE emulator) Debug
 # PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
-# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
+# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
@@ -81,15 +81,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
@@ -107,15 +107,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D "_LIB" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "USE_TREMOR" /D "WIN32" /D "DISABLE_KYRA" /D "USE_MPEG2" /D "USE_ZLIB" /YX /O2 /M$(CECrtMT) /c
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
 
@@ -133,15 +133,15 @@ BSC32=bscmake.exe
 # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D "_LIB" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "USE_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug) /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D "_LIB" /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "USE_TREMOR" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "USE_ZLIB" /D "USE_WINDBG" /YX /M$(CECrtMTDebug) /c
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
@@ -187,7 +187,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /I "../../../engines" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_SAGA" /D "USE_ZLIB" /D "USE_FLAC" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -290,8 +290,8 @@ BSC32=bscmake.exe
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
 # PROP Target_Dir ""
 CPP=shcl.exe
-# ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /Oxs /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /YX /M$(CECrtMT) /c
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../../" /I "../../../common/" /I "../../../backends/wince/" /I "../../../backends/wince/missing/" /I "../../../backends/wince/CEgui" /I "../../../backends/wince/CEkeys" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "SCUMM_NEED_ALIGNMENT" /D "FPM_DEFAULT" /D "USE_MAD" /D "NONSTANDARD_PORT" /D "USE_VORBIS" /D "USE_MPEG2" /D "WIN32" /D "DISABLE_AWE" /D "DISABLE_KYRA" /D "DISABLE_SAGA" /D "USE_ZLIB" /YX /Oxs /M$(CECrtMT) /c
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
@@ -316,227 +316,113 @@ BSC32=bscmake.exe
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "driver"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\..\sword2\driver\_mouse.cpp
+SOURCE=..\..\..\engines\sword2\animation.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP__MOUS=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP__MOUS=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP__MOUS=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP__MOUS=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP__MOUS=\
-	"..\..\..\backends\ps2\fileio.h"\
-	"..\..\..\backends\wince\missing\unistd.h"\
-	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP__MOUS=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP__MOUS=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP__MOUS=\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP__MOUS=\
+DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP__MOUS=\
-	"..\..\..\common\config.h"\
+	"..\..\..\engines\sword2\animation.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\graphics\animation.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\vorbis.h"\
+	
+NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\driver\animation.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_ANIMA=\
-	"..\..\..\sword2\driver\common\config-manager.h"\
-	"..\..\..\sword2\driver\common\file.h"\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sound\mp3.h"\
-	"..\..\..\sword2\driver\sound\vorbis.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\driver\animation.h"\
-	"..\..\..\sword2\driver\sword2\maketext.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sound.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_ANIMA=\
-	"..\..\..\sword2\driver\common\config-manager.h"\
-	"..\..\..\sword2\driver\common\file.h"\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sound\mp3.h"\
-	"..\..\..\sword2\driver\sound\vorbis.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\driver\animation.h"\
-	"..\..\..\sword2\driver\sword2\maketext.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sound.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -546,43 +432,35 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -592,53 +470,35 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -648,29 +508,22 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -679,12 +532,11 @@ DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -694,29 +546,22 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\mp3.h"\
 	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_ANIMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -724,541 +569,556 @@ NODEP_CPP_ANIMA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\driver\animation.h
+SOURCE=..\..\..\engines\sword2\animation.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\driver\d_draw.cpp
+SOURCE=..\..\..\engines\sword2\anims.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_D_DRA=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_D_DRA=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_D_DRA=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ANIMS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_DRA=\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ANIMS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_D_DRA=\
+DEP_CPP_ANIMS=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_D_DRA=\
-	"..\..\..\common\config.h"\
+	"..\..\..\engines\sword2\animation.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\graphics\animation.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
+	
+NODEP_CPP_ANIMS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_D_DRA=\
+DEP_CPP_ANIMS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_DRA=\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ANIMS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_D_DRA=\
+DEP_CPP_ANIMS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_DRA=\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ANIMS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\driver\d_sound.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_D_SOU=\
-	"..\..\..\sword2\driver\common\file.h"\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sound\flac.h"\
-	"..\..\..\sword2\driver\sound\mp3.h"\
-	"..\..\..\sword2\driver\sound\rate.h"\
-	"..\..\..\sword2\driver\sound\vorbis.h"\
-	"..\..\..\sword2\driver\sound\wave.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sound.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_D_SOU=\
-	"..\..\..\sword2\driver\common\file.h"\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sound\flac.h"\
-	"..\..\..\sword2\driver\sound\mp3.h"\
-	"..\..\..\sword2\driver\sound\rate.h"\
-	"..\..\..\sword2\driver\sound\vorbis.h"\
-	"..\..\..\sword2\driver\sound\wave.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sound.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_D_SOU=\
+DEP_CPP_ANIMS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_SOU=\
+	
+NODEP_CPP_ANIMS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_D_SOU=\
+DEP_CPP_ANIMS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_D_SOU=\
+	
+NODEP_CPP_ANIMS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sword2\console.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_D_SOU=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_SOU=\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
+	
+NODEP_CPP_CONSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_D_SOU=\
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sound\mp3.h"\
-	"..\..\..\sound\rate.h"\
-	"..\..\..\sound\vorbis.h"\
-	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_D_SOU=\
-	"..\..\..\common\config.h"\
+	
+NODEP_CPP_CONSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\driver\menu.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MENU_=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MENU_=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\mouse.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MENU_=\
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_MENU_=\
+NODEP_CPP_CONSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MENU_=\
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_MENU_=\
+NODEP_CPP_CONSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MENU_=\
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_MENU_=\
+NODEP_CPP_CONSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_MENU_=\
+DEP_CPP_CONSO=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-file.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\debugger.cpp"\
+	"..\..\..\common\debugger.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\list.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\font.h"\
+	"..\..\..\graphics\fontman.h"\
+	"..\..\..\graphics\surface.h"\
+	"..\..\..\gui\console.h"\
+	"..\..\..\gui\dialog.h"\
+	"..\..\..\gui\newgui.h"\
+	"..\..\..\gui\object.h"\
+	"..\..\..\gui\theme.h"\
+	"..\..\..\gui\widget.h"\
 	
-NODEP_CPP_MENU_=\
+NODEP_CPP_CONSO=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -1266,39 +1126,30 @@ NODEP_CPP_MENU_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\driver\palette.cpp
+SOURCE=..\..\..\engines\sword2\console.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+SOURCE=..\..\..\engines\sword2\controls.cpp
 
-NODEP_CPP_PALET=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\logic.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_PALET=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\logic.h"\
-	"..\..\..\sword2\driver\sword2\resman.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_PALET=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1307,77 +1158,74 @@ DEP_CPP_PALET=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_PALET=\
+NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_PALET=\
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\controls.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\saveload.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_PALET=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_CONTR=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_PALET=\
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1386,33 +1234,32 @@ DEP_CPP_PALET=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_PALET=\
+NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PALET=\
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1421,56 +1268,32 @@ DEP_CPP_PALET=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_PALET=\
+NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\driver\rdwin.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RDWIN=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RDWIN=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_RDWIN=\
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1479,29 +1302,32 @@ DEP_CPP_RDWIN=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_RDWIN=\
+	
+NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_RDWIN=\
+DEP_CPP_CONTR=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -1510,274 +1336,232 @@ DEP_CPP_RDWIN=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_RDWIN=\
+	
+NODEP_CPP_CONTR=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sword2\controls.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\sword2\debug.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
 
-DEP_CPP_RDWIN=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_RDWIN=\
+	
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_RDWIN=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_RDWIN=\
-	"..\..\..\common\config.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\driver\render.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_RENDE=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\graphics\primitives.h"\
-	"..\..\..\sword2\driver\sword2\build_display.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\driver\animation.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_RENDE=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\common\system.h"\
-	"..\..\..\sword2\driver\graphics\primitives.h"\
-	"..\..\..\sword2\driver\sword2\build_display.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\driver\animation.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_RENDE=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\graphics\primitives.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_RENDE=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_RENDE=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\graphics\primitives.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_RENDE=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_RENDE=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\graphics\primitives.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_RENDE=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_RENDE=\
+DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\graphics\primitives.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_RENDE=\
+NODEP_CPP_DEBUG=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -1785,202 +1569,144 @@ NODEP_CPP_RENDE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\driver\sprite.cpp
+SOURCE=..\..\..\engines\sword2\debug.h
+# End Source File
+# Begin Source File
 
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+SOURCE=..\..\..\engines\sword2\defs.h
+# End Source File
+# Begin Source File
 
-NODEP_CPP_SPRIT=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\sword2\build_display.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
+SOURCE=..\..\..\engines\sword2\events.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SPRIT=\
-	"..\..\..\sword2\driver\common\stdafx.h"\
-	"..\..\..\sword2\driver\sword2\build_display.h"\
-	"..\..\..\sword2\driver\sword2\defs.h"\
-	"..\..\..\sword2\driver\sword2\sword2.h"\
-	
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SPRIT=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SPRIT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_SPRIT=\
+DEP_CPP_EVENT=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_SPRIT=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_EVENT=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_EVENT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SPRIT=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SPRIT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_SPRIT=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SPRIT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_EVENT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
 
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=..\..\..\sword2\anims.cpp
+SOURCE=..\..\..\engines\sword2\function.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ANIMS=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\build_display.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\driver\animation.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ANIMS=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\build_display.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\driver\animation.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_ANIMS=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -1988,42 +1714,41 @@ DEP_CPP_ANIMS=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ANIMS=\
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_ANIMS=\
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
@@ -2032,53 +1757,41 @@ DEP_CPP_ANIMS=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\animation.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\graphics\animation.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_ANIMS=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_ANIMS=\
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -2086,43 +1799,36 @@ DEP_CPP_ANIMS=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ANIMS=\
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_ANIMS=\
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -2130,530 +1836,286 @@ DEP_CPP_ANIMS=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ANIMS=\
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\build_display.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_BUILD=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_BUILD=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_BUILD=\
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_BUILD=\
+	
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_BUILD=\
+DEP_CPP_FUNCT=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_BUILD=\
+	
+NODEP_CPP_FUNCT=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sword2\header.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\sword2\icons.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_BUILD=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_BUILD=\
+	
+NODEP_CPP_ICONS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_BUILD=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_BUILD=\
-	"..\..\..\common\config.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	
+NODEP_CPP_ICONS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\build_display.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\console.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_CONSO=\
-	"..\..\..\sword2\common\debugger.cpp"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_CONSO=\
-	"..\..\..\sword2\common\debugger.cpp"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_CONSO=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_CONSO=\
+NODEP_CPP_ICONS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_CONSO=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_CONSO=\
+NODEP_CPP_ICONS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CONSO=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_CONSO=\
+NODEP_CPP_ICONS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_CONSO=\
+DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.cpp"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
-	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\font.h"\
-	"..\..\..\graphics\fontman.h"\
-	"..\..\..\graphics\surface.h"\
-	"..\..\..\gui\console.h"\
-	"..\..\..\gui\dialog.h"\
-	"..\..\..\gui\newgui.h"\
-	"..\..\..\gui\object.h"\
-	"..\..\..\gui\widget.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_CONSO=\
+NODEP_CPP_ICONS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -2661,217 +2123,174 @@ NODEP_CPP_CONSO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\console.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\controls.cpp
+SOURCE=..\..\..\engines\sword2\interpreter.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_CONTR=\
-	"..\..\..\sword2\common\config-manager.h"\
-	"..\..\..\sword2\common\rect.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_CONTR=\
-	"..\..\..\sword2\common\config-manager.h"\
-	"..\..\..\sword2\common\rect.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_CONTR=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_INTER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_CONTR=\
+NODEP_CPP_INTER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_CONTR=\
+DEP_CPP_INTER=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_CONTR=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_INTER=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_INTER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INTER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_INTER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_INTER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_CONTR=\
+DEP_CPP_INTER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_CONTR=\
+NODEP_CPP_INTER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_CONTR=\
+DEP_CPP_INTER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_CONTR=\
+NODEP_CPP_INTER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -2879,201 +2298,195 @@ NODEP_CPP_CONTR=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\controls.h
+SOURCE=..\..\..\engines\sword2\interpreter.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\debug.cpp
+SOURCE=..\..\..\engines\sword2\layers.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_DEBUG=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_DEBUG=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_DEBUG=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_LAYER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_DEBUG=\
+NODEP_CPP_LAYER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_DEBUG=\
+DEP_CPP_LAYER=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_DEBUG=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_LAYER=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_LAYER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_LAYER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_LAYER=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_LAYER=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_DEBUG=\
+DEP_CPP_LAYER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_DEBUG=\
+NODEP_CPP_LAYER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_DEBUG=\
+DEP_CPP_LAYER=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_DEBUG=\
+NODEP_CPP_LAYER=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -3081,418 +2494,334 @@ NODEP_CPP_DEBUG=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\debug.h
-# End Source File
-# Begin Source File
+SOURCE=..\..\..\engines\sword2\logic.cpp
 
-SOURCE=..\..\..\sword2\defs.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-SOURCE=..\..\..\sword2\events.cpp
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-NODEP_CPP_EVENT=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
 
-NODEP_CPP_EVENT=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_EVENT=\
+DEP_CPP_LOGIC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_EVENT=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_LOGIC=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_EVENT=\
-	"..\..\..\backends\ps2\fileio.h"\
+DEP_CPP_LOGIC=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_EVENT=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_EVENT=\
+DEP_CPP_LOGIC=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_LOGIC=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\logic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\maketext.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MAKET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_EVENT=\
+NODEP_CPP_MAKET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_EVENT=\
+DEP_CPP_MAKET=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_EVENT=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MAKET=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\function.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_FUNCT=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\build_display.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\driver\animation.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_FUNCT=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\build_display.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\driver\animation.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_FUNCT=\
+DEP_CPP_MAKET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_FUNCT=\
+NODEP_CPP_MAKET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_FUNCT=\
+DEP_CPP_MAKET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"mpeg2dec\mpeg2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_FUNCT=\
+NODEP_CPP_MAKET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_FUNCT=\
+DEP_CPP_MAKET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_FUNCT=\
+NODEP_CPP_MAKET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_FUNCT=\
+DEP_CPP_MAKET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\graphics\animation.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\driver\animation.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_FUNCT=\
+NODEP_CPP_MAKET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -3500,146 +2829,153 @@ NODEP_CPP_FUNCT=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\header.h
+SOURCE=..\..\..\engines\sword2\maketext.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\icons.cpp
+SOURCE=..\..\..\engines\sword2\memory.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ICONS=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ICONS=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_ICONS=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MEMOR=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ICONS=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_MEMOR=\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_ICONS=\
+DEP_CPP_MEMOR=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_ICONS=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MEMOR=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_MEMOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MEMOR=\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_MEMOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MEMOR=\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_ICONS=\
+DEP_CPP_MEMOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MEMOR=\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_MEMOR=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_MEMOR=\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\memory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\menu.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_ICONS=\
+NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_ICONS=\
+DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -3649,196 +2985,118 @@ DEP_CPP_ICONS=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_ICONS=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MENU_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\icons.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\interpreter.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_INTER=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\util.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_INTER=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\util.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_INTER=\
+DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_INTER=\
+NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_INTER=\
+DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_INTER=\
+NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_INTER=\
+DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_INTER=\
+NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_INTER=\
+DEP_CPP_MENU_=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_INTER=\
+NODEP_CPP_MENU_=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -3846,199 +3104,247 @@ NODEP_CPP_INTER=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\interpreter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\layers.cpp
+SOURCE=..\..\..\engines\sword2\mouse.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_LAYER=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_LAYER=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_LAYER=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_LAYER=\
+NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_LAYER=\
+DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\controls.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\saveload.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\graphics\cursorman.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_LAYER=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MOUSE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_MOUSE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	
+NODEP_CPP_MOUSE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_MOUSE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\graphics\cursorman.h"\
+	
+NODEP_CPP_MOUSE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_LAYER=\
+DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_LAYER=\
+NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_LAYER=\
+DEP_CPP_MOUSE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stack.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\cursorman.h"\
 	
-NODEP_CPP_LAYER=\
+NODEP_CPP_MOUSE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -4046,45 +3352,28 @@ NODEP_CPP_LAYER=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\layers.h
+SOURCE=..\..\..\engines\sword2\mouse.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\logic.cpp
+SOURCE=..\..\..\engines\sword2\music.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_LOGIC=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_LOGIC=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_LOGIC=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -4092,33 +3381,32 @@ DEP_CPP_LOGIC=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_LOGIC=\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_LOGIC=\
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -4131,47 +3419,35 @@ DEP_CPP_LOGIC=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\flac.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_LOGIC=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
-
-DEP_CPP_LOGIC=\
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -4179,38 +3455,34 @@ DEP_CPP_LOGIC=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_LOGIC=\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_LOGIC=\
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
@@ -4218,188 +3490,149 @@ DEP_CPP_LOGIC=\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_LOGIC=\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\logic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\maketext.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MAKET=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MAKET=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MAKET=\
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_MAKET=\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_MAKET=\
+DEP_CPP_MUSIC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\sound\flac.h"\
+	"..\..\..\sound\mp3.h"\
+	"..\..\..\sound\rate.h"\
+	"..\..\..\sound\vorbis.h"\
+	"..\..\..\sound\wave.h"\
 	
-NODEP_CPP_MAKET=\
+NODEP_CPP_MUSIC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+!ENDIF 
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+SOURCE=..\..\..\engines\sword2\object.h
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+SOURCE=..\..\..\engines\sword2\palette.cpp
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-DEP_CPP_MAKET=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MAKET=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_MAKET=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -4408,181 +3641,135 @@ DEP_CPP_MAKET=\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_MAKET=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_PALET=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\maketext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\memory.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_MEMOR=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_MEMOR=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_MEMOR=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MEMOR=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_MEMOR=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
-NODEP_CPP_MEMOR=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MEMOR=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MEMOR=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_MEMOR=\
+DEP_CPP_PALET=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MEMOR=\
+NODEP_CPP_PALET=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -4590,381 +3777,294 @@ NODEP_CPP_MEMOR=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\memory.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\mouse.cpp
+SOURCE=..\..\..\engines\sword2\protocol.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_MOUSE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_MOUSE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_MOUSE=\
-	"..\..\..\backends\ps2\fileio.h"\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PROTO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MOUSE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+NODEP_CPP_PROTO=\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_MOUSE=\
+DEP_CPP_PROTO=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
-NODEP_CPP_MOUSE=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_PROTO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_PROTO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_PROTO=\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_PROTO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_PROTO=\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_MOUSE=\
+DEP_CPP_PROTO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_PROTO=\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_PROTO=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_PROTO=\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\render.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
-	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\primitives.h"\
 	
-NODEP_CPP_MOUSE=\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_MOUSE=\
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\mpeg2dec\mpeg2.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
+	"..\..\..\engines\sword2\animation.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\graphics\animation.h"\
+	"..\..\..\graphics\primitives.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_MOUSE=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\mouse.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\object.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\sword2\protocol.cpp
-
-!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
-
-NODEP_CPP_PROTO=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
-
-NODEP_CPP_PROTO=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_PROTO=\
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\primitives.h"\
 	
-NODEP_CPP_PROTO=\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
-DEP_CPP_PROTO=\
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\graphics\primitives.h"\
 	
-NODEP_CPP_PROTO=\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_PROTO=\
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\primitives.h"\
 	
-NODEP_CPP_PROTO=\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_PROTO=\
+DEP_CPP_RENDE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\graphics\primitives.h"\
 	
-NODEP_CPP_PROTO=\
+NODEP_CPP_RENDE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\animation.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -4972,88 +4072,56 @@ NODEP_CPP_PROTO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\resman.cpp
+SOURCE=..\..\..\engines\sword2\resman.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_RESMA=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_RESMA=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
 DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -5064,87 +4132,132 @@ DEP_CPP_RESMA=\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_RESMA=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_RESMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_RESMA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_RESMA=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_RESMA=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -5153,42 +4266,32 @@ DEP_CPP_RESMA=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_RESMA=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -5196,71 +4299,50 @@ NODEP_CPP_RESMA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\resman.h
+SOURCE=..\..\..\engines\sword2\resman.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\router.cpp
+SOURCE=..\..\..\engines\sword2\router.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_ROUTE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_ROUTE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_ROUTE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\common\stream.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
 DEP_CPP_ROUTE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -5270,66 +4352,94 @@ DEP_CPP_ROUTE=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
 NODEP_CPP_ROUTE=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_ROUTE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ROUTE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_ROUTE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_ROUTE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ROUTE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\common\stream.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -5338,31 +4448,22 @@ DEP_CPP_ROUTE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
+	"..\..\..\common\stream.h"\
 	
 NODEP_CPP_ROUTE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -5370,82 +4471,54 @@ NODEP_CPP_ROUTE=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\router.h
+SOURCE=..\..\..\engines\sword2\router.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\save_rest.cpp
+SOURCE=..\..\..\engines\sword2\saveload.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SAVE_=\
-	"..\..\..\sword2\common\savefile.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SAVE_=\
-	"..\..\..\sword2\common\savefile.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SAVE_=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_SAVE_=\
+	
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\saveload.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_SAVE_=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -5460,115 +4533,136 @@ DEP_CPP_SAVE_=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\saveload.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
-	
-NODEP_CPP_SAVE_=\
-	"..\..\..\common\config.h"\
+	
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SAVEL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SAVEL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\saveload.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SAVEL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\savefile.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SAVEL=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\saveload.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SAVE_=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_SAVE_=\
+	
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\saveload.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_SAVE_=\
+DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\savefile.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	
-NODEP_CPP_SAVE_=\
+	
+NODEP_CPP_SAVEL=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\saveload.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -5576,161 +4670,226 @@ NODEP_CPP_SAVE_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\save_rest.h
+SOURCE=..\..\..\engines\sword2\saveload.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\scroll.cpp
+SOURCE=..\..\..\engines\sword2\screen.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SCROL=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SCROL=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
-DEP_CPP_SCROL=\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SCROL=\
+NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-DEP_CPP_SCROL=\
+DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
+	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	"..\..\..\sound\audiostream.h"\
+	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SCROL=\
-	"..\..\..\common\config.h"\
+NODEP_CPP_SCREE=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SCREE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_SCREE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SCREE=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_SCREE=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SCROL=\
+DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SCROL=\
+NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
-DEP_CPP_SCROL=\
+DEP_CPP_SCREE=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
+	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
-NODEP_CPP_SCROL=\
+NODEP_CPP_SCREE=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -5738,81 +4897,177 @@ NODEP_CPP_SCROL=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\sound.cpp
+SOURCE=..\..\..\engines\sword2\screen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\scroll.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sound\wave.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-NODEP_CPP_SOUND=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sound\wave.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
+DEP_CPP_SCROL=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\endian.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
 	
 
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_SCROL=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SCROL=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\sound.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -5822,82 +5077,119 @@ DEP_CPP_SOUND=\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SOUND=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SOUND=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\sound\wave.h"\
+	
+NODEP_CPP_SOUND=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -5906,39 +5198,29 @@ DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
-	"..\..\..\common\singleton.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
 	"..\..\..\sound\wave.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SOUND=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -5946,80 +5228,55 @@ NODEP_CPP_SOUND=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\sound.h
+SOURCE=..\..\..\engines\sword2\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\speech.cpp
+SOURCE=..\..\..\engines\sword2\speech.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SPEEC=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SPEEC=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_SPEEC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SPEEC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
 DEP_CPP_SPEEC=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -6033,72 +5290,109 @@ DEP_CPP_SPEEC=\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
 NODEP_CPP_SPEEC=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SPEEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SPEEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SPEEC=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_SPEEC=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SPEEC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SPEEC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -6107,36 +5401,27 @@ DEP_CPP_SPEEC=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SPEEC=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\object.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -6144,83 +5429,157 @@ NODEP_CPP_SPEEC=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\startup.cpp
+SOURCE=..\..\..\engines\sword2\sprite.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_START=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
-NODEP_CPP_START=\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\engine.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
+
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
+
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
+
+DEP_CPP_SPRIT=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SPRIT=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\engines\sword2\startup.cpp
+
+!IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_START=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_START=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
 DEP_CPP_START=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -6228,84 +5587,116 @@ DEP_CPP_START=\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
 	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_START=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_START=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_START=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_START=\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	
+NODEP_CPP_START=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_START=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_START=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -6314,39 +5705,27 @@ DEP_CPP_START=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\mutex.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
 	"..\..\..\common\stream.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_START=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -6354,70 +5733,30 @@ NODEP_CPP_START=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\sword2.cpp
+SOURCE=..\..\..\engines\sword2\sword2.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SWORD=\
-	"..\..\..\sword2\backends\fs\fs.h"\
-	"..\..\..\sword2\base\options.h"\
-	"..\..\..\sword2\base\plugins.h"\
-	"..\..\..\sword2\common\config-manager.h"\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SWORD=\
-	"..\..\..\sword2\backends\fs\fs.h"\
-	"..\..\..\sword2\base\options.h"\
-	"..\..\..\sword2\base\plugins.h"\
-	"..\..\..\sword2\common\config-manager.h"\
-	"..\..\..\sword2\common\file.h"\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\common\system.h"\
-	"..\..\..\sword2\sword2\console.h"\
-	"..\..\..\sword2\sword2\controls.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\maketext.h"\
-	"..\..\..\sword2\sword2\memory.h"\
-	"..\..\..\sword2\sword2\mouse.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sound.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_SWORD=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -6427,49 +5766,46 @@ DEP_CPP_SWORD=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
 DEP_CPP_SWORD=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
 	"..\..\..\common\debugger.h"\
 	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -6479,42 +5815,119 @@ DEP_CPP_SWORD=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
+	"..\..\..\engines\sword2\console.h"\
+	"..\..\..\engines\sword2\controls.h"\
+	"..\..\..\engines\sword2\debug.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\maketext.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\mouse.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\saveload.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
 	
 NODEP_CPP_SWORD=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SWORD=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_SWORD=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SWORD=\
+	"..\..\..\backends\fs\fs.h"\
+	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\base\game.h"\
+	"..\..\..\base\plugins.h"\
+	"..\..\..\common\array.h"\
+	"..\..\..\common\config-manager.h"\
+	"..\..\..\common\file.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
+	"..\..\..\common\mutex.h"\
+	"..\..\..\common\rect.h"\
+	"..\..\..\common\scummsys.h"\
+	"..\..\..\common\singleton.h"\
+	"..\..\..\common\stdafx.h"\
+	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
+	"..\..\..\common\system.h"\
+	"..\..\..\common\util.h"\
+	
+NODEP_CPP_SWORD=\
+	"..\..\..\common\config.h"\
+	"..\..\..\common\extend.h"\
+	"..\..\..\common\globals.h"\
+	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SWORD=\
@@ -6522,15 +5935,13 @@ DEP_CPP_SWORD=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -6540,31 +5951,25 @@ DEP_CPP_SWORD=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
@@ -6574,15 +5979,13 @@ DEP_CPP_SWORD=\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\base\options.h"\
+	"..\..\..\base\game.h"\
 	"..\..\..\base\plugins.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\config-manager.h"\
-	"..\..\..\common\debugger.h"\
-	"..\..\..\common\endian.h"\
 	"..\..\..\common\file.h"\
-	"..\..\..\common\map.h"\
+	"..\..\..\common\func.h"\
+	"..\..\..\common\hashmap.h"\
 	"..\..\..\common\mutex.h"\
 	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
@@ -6592,31 +5995,25 @@ DEP_CPP_SWORD=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sound\audiostream.h"\
-	"..\..\..\sound\mixer.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\console.h"\
-	"..\..\..\sword2\controls.h"\
-	"..\..\..\sword2\debug.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\maketext.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\mouse.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sound.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SWORD=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\console.h"\
+	"..\..\..\engines\sword2\sword2\controls.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\maketext.h"\
+	"..\..\..\engines\sword2\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2\mouse.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sound.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -6624,161 +6021,116 @@ NODEP_CPP_SWORD=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\sword2.h
+SOURCE=..\..\..\engines\sword2\sword2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\sync.cpp
+SOURCE=..\..\..\engines\sword2\sync.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_SYNC_=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_SYNC_=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_SYNC_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SYNC_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
 DEP_CPP_SYNC_=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
 	"..\..\..\common\array.h"\
 	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
 NODEP_CPP_SYNC_=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_SYNC_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SYNC_=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_SYNC_=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_SYNC_=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SYNC_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SYNC_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
 DEP_CPP_SYNC_=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_SYNC_=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
@@ -6786,70 +6138,40 @@ NODEP_CPP_SYNC_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\sword2\walker.cpp
+SOURCE=..\..\..\engines\sword2\walker.cpp
 
 !IF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Release"
 
-NODEP_CPP_WALKE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE emulator) Debug"
 
-NODEP_CPP_WALKE=\
-	"..\..\..\sword2\common\stdafx.h"\
-	"..\..\..\sword2\sword2\defs.h"\
-	"..\..\..\sword2\sword2\interpreter.h"\
-	"..\..\..\sword2\sword2\logic.h"\
-	"..\..\..\sword2\sword2\resman.h"\
-	"..\..\..\sword2\sword2\router.h"\
-	"..\..\..\sword2\sword2\sword2.h"\
-	
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Release"
 
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
+
 DEP_CPP_WALKE=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
 
 DEP_CPP_WALKE=\
 	"..\..\..\backends\ps2\fileio.h"\
+	"..\..\..\backends\wince\missing\config.h"\
+	"..\..\..\backends\wince\missing\SDL_byteorder.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
 	"..\..\..\base\engine.h"\
@@ -6859,111 +6181,100 @@ DEP_CPP_WALKE=\
 	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
 	"..\..\..\common\str.h"\
+	"..\..\..\common\stream.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
-	{$(INCLUDE)}"SDL_byteorder.h"\
+	"..\..\..\engines\sword2\defs.h"\
+	"..\..\..\engines\sword2\header.h"\
+	"..\..\..\engines\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\logic.h"\
+	"..\..\..\engines\sword2\memory.h"\
+	"..\..\..\engines\sword2\object.h"\
+	"..\..\..\engines\sword2\resman.h"\
+	"..\..\..\engines\sword2\router.h"\
+	"..\..\..\engines\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
-	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE ARM) Release"
-
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Debug"
 
+DEP_CPP_WALKE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_WALKE=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE MIPS) Release"
 
+DEP_CPP_WALKE=\
+	"..\..\..\backends\wince\missing\unistd.h"\
+	"..\..\..\backends\wince\portdefs.h"\
+	"..\..\..\common\stdafx.h"\
+	
+NODEP_CPP_WALKE=\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
+	
+
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Debug"
 
 DEP_CPP_WALKE=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ELSEIF  "$(CFG)" == "sword2 - Win32 (WCE SH3) Release"
 
 DEP_CPP_WALKE=\
-	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
 	"..\..\..\backends\wince\portdefs.h"\
-	"..\..\..\base\engine.h"\
-	"..\..\..\common\array.h"\
-	"..\..\..\common\endian.h"\
-	"..\..\..\common\rect.h"\
-	"..\..\..\common\scummsys.h"\
 	"..\..\..\common\stdafx.h"\
-	"..\..\..\common\str.h"\
-	"..\..\..\common\util.h"\
-	"..\..\..\sword2\build_display.h"\
-	"..\..\..\sword2\defs.h"\
-	"..\..\..\sword2\header.h"\
-	"..\..\..\sword2\icons.h"\
-	"..\..\..\sword2\interpreter.h"\
-	"..\..\..\sword2\logic.h"\
-	"..\..\..\sword2\memory.h"\
-	"..\..\..\sword2\object.h"\
-	"..\..\..\sword2\resman.h"\
-	"..\..\..\sword2\router.h"\
-	"..\..\..\sword2\save_rest.h"\
-	"..\..\..\sword2\sword2.h"\
 	
 NODEP_CPP_WALKE=\
-	"..\..\..\common\config.h"\
-	"..\..\..\common\extend.h"\
-	"..\..\..\common\globals.h"\
-	"..\..\..\common\palmversion.h"\
+	"..\..\..\engines\sword2\sword2\defs.h"\
+	"..\..\..\engines\sword2\sword2\header.h"\
+	"..\..\..\engines\sword2\sword2\interpreter.h"\
+	"..\..\..\engines\sword2\sword2\logic.h"\
+	"..\..\..\engines\sword2\sword2\resman.h"\
+	"..\..\..\engines\sword2\sword2\router.h"\
+	"..\..\..\engines\sword2\sword2\screen.h"\
+	"..\..\..\engines\sword2\sword2\sword2.h"\
 	
 
 !ENDIF 
 
 # End Source File
 # End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
 # End Target
 # End Project