First pahse of renaming simon engine to agos. Internal renames. Compilation

is broken

svn-id: r24008

16 files changed, 908 insertions, 908 deletions

diff --git a/dists/devcpp/scummvm.dev b/dists/devcpp/scummvm.dev
index 6170a161d5..2c2f65a713 100644
--- a/dists/devcpp/scummvm.dev
+++ b/dists/devcpp/scummvm.dev
@@ -12,7 +12,7 @@ ResourceIncludes=../..;../../icons
 MakeIncludes=
 Compiler=
 CppCompiler=-Wno-multichar_@@_-DUSE_ZLIB_@@_
-Linker=cine/cine.a_@@_gob/gob.a_@@_kyra/kyra.a_@@_lure/lure.a_@@_queen/queen.a_@@_saga/saga.a_@@_scumm/scumm.a_@@_simon/simon.a_@@_sky/sky.a_@@_sword1/sword1.a_@@_sword2/sword2.a_@@_-lSDL.dll_@@_-lwinmm_@@_-lz.dll_@@_
+Linker=cine/cine.a_@@_gob/gob.a_@@_kyra/kyra.a_@@_lure/lure.a_@@_queen/queen.a_@@_saga/saga.a_@@_scumm/scumm.a_@@_agos/agos.a_@@_sky/sky.a_@@_sword1/sword1.a_@@_sword2/sword2.a_@@_-lSDL.dll_@@_-lwinmm_@@_-lz.dll_@@_
 IsCpp=1
 Icon=scummvm.ico
 ExeOutput=scummvm
@@ -2061,7 +2061,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit203]
-FileName=simon.dev
+FileName=agos.dev
 Folder=scummvm
 Compile=0
 Link=0
diff --git a/dists/devcpp/simon.dev b/dists/devcpp/simon.dev
index 087ca152bb..9c5c04f0be 100644
--- a/dists/devcpp/simon.dev
+++ b/dists/devcpp/simon.dev
@@ -1,6 +1,6 @@
 [Project]
-FileName=simon.dev
-Name=simon
+FileName=agos.dev
+Name=agos
 UnitCount=26
 Type=2
 Ver=1
@@ -15,10 +15,10 @@ CppCompiler=-Wno-multichar_@@_
 Linker=
 IsCpp=1
 Icon=
-ExeOutput=simon
-ObjectOutput=simon
+ExeOutput=agos
+ObjectOutput=agos
 OverrideOutput=0
-OverrideOutputName=simon.a
+OverrideOutputName=agos.a
 HostApplication=
 Folders=
 CommandLine=
@@ -48,9 +48,9 @@ ProductVersion=
 AutoIncBuildNr=0
 
 [Unit1]
-FileName=..\..\engines\simon\charset.cpp
+FileName=..\..\engines\agos\charset.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -58,9 +58,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit2]
-FileName=..\..\engines\simon\cursor.cpp
+FileName=..\..\engines\agos\cursor.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -68,9 +68,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit3]
-FileName=..\..\engines\simon\debug.cpp
+FileName=..\..\engines\agos\debug.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -78,9 +78,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit4]
-FileName=..\..\engines\simon\debug.h
+FileName=..\..\engines\agos\debug.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -88,9 +88,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit5]
-FileName=..\..\engines\simon\debugger.cpp
+FileName=..\..\engines\agos\debugger.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -98,9 +98,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit6]
-FileName=..\..\engines\simon\debugger.h
+FileName=..\..\engines\agos\debugger.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -108,9 +108,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit7]
-FileName=..\..\engines\simon\game.cpp
+FileName=..\..\engines\agos\game.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -118,9 +118,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit8]
-FileName=..\..\engines\simon\icons.cpp
+FileName=..\..\engines\agos\icons.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -128,9 +128,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit9]
-FileName=..\..\engines\simon\intern.h
+FileName=..\..\engines\agos\intern.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -138,9 +138,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit10]
-FileName=..\..\engines\simon\items.cpp
+FileName=..\..\engines\agos\items.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -148,9 +148,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit11]
-FileName=..\..\engines\simon\midi.cpp
+FileName=..\..\engines\agos\midi.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -158,9 +158,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit12]
-FileName=..\..\engines\simon\midi.h
+FileName=..\..\engines\agos\midi.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -168,9 +168,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit13]
-FileName=..\..\engines\simon\midiparser_s1d.cpp
+FileName=..\..\engines\agos\midiparser_s1d.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -178,9 +178,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit14]
-FileName=..\..\engines\simon\res.cpp
+FileName=..\..\engines\agos\res.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -188,9 +188,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit15]
-FileName=..\..\engines\simon\saveload.cpp
+FileName=..\..\engines\agos\saveload.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -198,9 +198,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit16]
-FileName=..\..\engines\simon\simon.cpp
+FileName=..\..\engines\agos\agos.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -208,9 +208,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit17]
-FileName=..\..\engines\simon\simon.h
+FileName=..\..\engines\agos\agos.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -218,9 +218,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit18]
-FileName=..\..\engines\simon\sound.cpp
+FileName=..\..\engines\agos\sound.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -228,9 +228,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit19]
-FileName=..\..\engines\simon\sound.h
+FileName=..\..\engines\agos\sound.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -238,9 +238,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit20]
-FileName=..\..\engines\simon\verb.cpp
+FileName=..\..\engines\agos\verb.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -248,9 +248,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit21]
-FileName=..\..\engines\simon\vga.cpp
+FileName=..\..\engines\agos\vga.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -258,9 +258,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit22]
-FileName=..\..\engines\simon\vga.h
+FileName=..\..\engines\agos\vga.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -268,9 +268,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit23]
-FileName=..\..\engines\simon\oracle.cpp
+FileName=..\..\engines\agos\oracle.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -278,9 +278,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit24]
-FileName=..\..\engines\simon\animation.cpp
+FileName=..\..\engines\agos\animation.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -288,9 +288,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit25]
-FileName=..\..\engines\simon\animation.h
+FileName=..\..\engines\agos\animation.h
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
@@ -298,9 +298,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit26]
-FileName=..\..\engines\simon\string.cpp
+FileName=..\..\engines\agos\string.cpp
 CompileCpp=1
-Folder=simon
+Folder=agos
 Compile=1
 Link=1
 Priority=1000
diff --git a/dists/msevc4/PocketSCUMM.vcw b/dists/msevc4/PocketSCUMM.vcw
index 55f8228d3d..ac01fe5dd2 100644
--- a/dists/msevc4/PocketSCUMM.vcw
+++ b/dists/msevc4/PocketSCUMM.vcw
@@ -75,7 +75,7 @@ Package=<4>
     Project_Dep_Name scumm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name simon
+    Project_Dep_Name agos
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name sky
@@ -102,7 +102,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "simon"=.\simon\simon.vcp - Package Owner=<4>
+Project: "agos"=.\agos\agos.vcp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/dists/msevc4/simon/simon.vcp b/dists/msevc4/simon/simon.vcp
index b15ffcae45..b5b6cc954b 100644
--- a/dists/msevc4/simon/simon.vcp
+++ b/dists/msevc4/simon/simon.vcp
@@ -1,4 +1,4 @@
-# Microsoft eMbedded Visual Tools Project File - Name="simon" - Package Owner=<4>
+# Microsoft eMbedded Visual Tools Project File - Name="agos" - Package Owner=<4>
 # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
 # ** DO NOT EDIT **
 
@@ -8,29 +8,29 @@
 # TARGTYPE "Win32 (WCE ARMV4) Static Library" 0xa304
 # TARGTYPE "Win32 (WCE emulator) Static Library" 0xa604
 
-CFG=simon - Win32 (WCE emulator) Debug
+CFG=agos - Win32 (WCE emulator) Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "simon.vcn".
+!MESSAGE NMAKE /f "agos.vcn".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "simon.vcn" CFG="simon - Win32 (WCE emulator) Debug"
+!MESSAGE NMAKE /f "agos.vcn" CFG="agos - Win32 (WCE emulator) Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "simon - Win32 (WCE emulator) Release" (based on "Win32 (WCE emulator) Static Library")
-!MESSAGE "simon - Win32 (WCE emulator) Debug" (based on "Win32 (WCE emulator) Static Library")
-!MESSAGE "simon - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE "simon - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE "simon - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Static Library")
-!MESSAGE "simon - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Static Library")
-!MESSAGE "simon - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Static Library")
-!MESSAGE "simon - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Static Library")
-!MESSAGE "simon - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Static Library")
-!MESSAGE "simon - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Static Library")
+!MESSAGE "agos - Win32 (WCE emulator) Release" (based on "Win32 (WCE emulator) Static Library")
+!MESSAGE "agos - Win32 (WCE emulator) Debug" (based on "Win32 (WCE emulator) Static Library")
+!MESSAGE "agos - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library")
+!MESSAGE "agos - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library")
+!MESSAGE "agos - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Static Library")
+!MESSAGE "agos - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Static Library")
+!MESSAGE "agos - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Static Library")
+!MESSAGE "agos - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Static Library")
+!MESSAGE "agos - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Static Library")
+!MESSAGE "agos - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -39,7 +39,7 @@ CFG=simon - Win32 (WCE emulator) Debug
 # PROP Scc_LocalPath ""
 # PROP ATL_Project 2
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -65,7 +65,7 @@ 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)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -91,7 +91,7 @@ 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)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -117,7 +117,7 @@ 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)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -143,7 +143,7 @@ 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)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -169,7 +169,7 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -195,7 +195,7 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -221,7 +221,7 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -247,7 +247,7 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -273,7 +273,7 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -303,32 +303,32 @@ BSC32=bscmake.exe
 
 # Begin Target
 
-# Name "simon - Win32 (WCE emulator) Release"
-# Name "simon - Win32 (WCE emulator) Debug"
-# Name "simon - Win32 (WCE ARMV4) Release"
-# Name "simon - Win32 (WCE ARMV4) Debug"
-# Name "simon - Win32 (WCE ARM) Debug"
-# Name "simon - Win32 (WCE ARM) Release"
-# Name "simon - Win32 (WCE MIPS) Debug"
-# Name "simon - Win32 (WCE MIPS) Release"
-# Name "simon - Win32 (WCE SH3) Debug"
-# Name "simon - Win32 (WCE SH3) Release"
+# Name "agos - Win32 (WCE emulator) Release"
+# Name "agos - Win32 (WCE emulator) Debug"
+# Name "agos - Win32 (WCE ARMV4) Release"
+# Name "agos - Win32 (WCE ARMV4) Debug"
+# Name "agos - Win32 (WCE ARM) Debug"
+# Name "agos - Win32 (WCE ARM) Release"
+# Name "agos - Win32 (WCE MIPS) Debug"
+# Name "agos - Win32 (WCE MIPS) Release"
+# Name "agos - Win32 (WCE SH3) Debug"
+# Name "agos - Win32 (WCE SH3) Release"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\animation.cpp
+SOURCE=..\..\..\engines\agos\animation.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -354,12 +354,12 @@ NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -384,12 +384,12 @@ DEP_CPP_ANIMA=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\graphics\cursorman.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\mididrv.h"\
@@ -404,7 +404,7 @@ NODEP_CPP_ANIMA=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -430,12 +430,12 @@ NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -461,12 +461,12 @@ NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -492,12 +492,12 @@ NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_ANIMA=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -523,9 +523,9 @@ NODEP_CPP_ANIMA=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -533,21 +533,21 @@ NODEP_CPP_ANIMA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\animation.h
+SOURCE=..\..\..\engines\agos\animation.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\charset.cpp
+SOURCE=..\..\..\engines\agos\charset.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -555,12 +555,12 @@ DEP_CPP_CHARS=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_CHARS=\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -580,12 +580,12 @@ DEP_CPP_CHARS=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -595,10 +595,10 @@ NODEP_CPP_CHARS=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -606,12 +606,12 @@ DEP_CPP_CHARS=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_CHARS=\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -619,12 +619,12 @@ DEP_CPP_CHARS=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_CHARS=\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -632,12 +632,12 @@ DEP_CPP_CHARS=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_CHARS=\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_CHARS=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -645,9 +645,9 @@ DEP_CPP_CHARS=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_CHARS=\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -655,17 +655,17 @@ NODEP_CPP_CHARS=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\cursor.cpp
+SOURCE=..\..\..\engines\agos\cursor.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -688,11 +688,11 @@ NODEP_CPP_CURSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -715,12 +715,12 @@ DEP_CPP_CURSO=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\graphics\cursorman.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
@@ -731,10 +731,10 @@ NODEP_CPP_CURSO=\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -757,11 +757,11 @@ NODEP_CPP_CURSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -784,11 +784,11 @@ NODEP_CPP_CURSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -811,11 +811,11 @@ NODEP_CPP_CURSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_CURSO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -838,8 +838,8 @@ NODEP_CPP_CURSO=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -847,17 +847,17 @@ NODEP_CPP_CURSO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\debug.cpp
+SOURCE=..\..\..\engines\agos\debug.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -865,13 +865,13 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\engines\simon\simon\debug.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\debug.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -891,13 +891,13 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\debug.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\debug.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -909,7 +909,7 @@ NODEP_CPP_DEBUG=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -917,13 +917,13 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\engines\simon\simon\debug.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\debug.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -931,13 +931,13 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\engines\simon\simon\debug.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\debug.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -945,13 +945,13 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\engines\simon\simon\debug.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\debug.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_DEBUG=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -959,10 +959,10 @@ DEP_CPP_DEBUG=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_DEBUG=\
-	"..\..\..\engines\simon\simon\debug.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\debug.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
 !ENDIF 
@@ -970,21 +970,21 @@ NODEP_CPP_DEBUG=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\debug.h
+SOURCE=..\..\..\engines\agos\debug.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\debugger.cpp
+SOURCE=..\..\..\engines\agos\debugger.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1024,11 +1024,11 @@ NODEP_CPP_DEBUGG=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1058,13 +1058,13 @@ DEP_CPP_DEBUGG=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\debugger.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\debugger.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\fontman.h"\
 	"..\..\..\graphics\surface.h"\
@@ -1085,7 +1085,7 @@ NODEP_CPP_DEBUGG=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1125,11 +1125,11 @@ NODEP_CPP_DEBUGG=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1169,11 +1169,11 @@ NODEP_CPP_DEBUGG=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1213,11 +1213,11 @@ NODEP_CPP_DEBUGG=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_DEBUGG=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1257,8 +1257,8 @@ NODEP_CPP_DEBUGG=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -1266,21 +1266,21 @@ NODEP_CPP_DEBUGG=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\debugger.h
+SOURCE=..\..\..\engines\agos\debugger.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\draw.cpp
+SOURCE=..\..\..\engines\agos\draw.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1300,11 +1300,11 @@ NODEP_CPP_DRAW_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1325,12 +1325,12 @@ DEP_CPP_DRAW_=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -1342,7 +1342,7 @@ NODEP_CPP_DRAW_=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1362,11 +1362,11 @@ NODEP_CPP_DRAW_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1386,11 +1386,11 @@ NODEP_CPP_DRAW_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1410,11 +1410,11 @@ NODEP_CPP_DRAW_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_DRAW_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1434,8 +1434,8 @@ NODEP_CPP_DRAW_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -1443,17 +1443,17 @@ NODEP_CPP_DRAW_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\event.cpp
+SOURCE=..\..\..\engines\agos\event.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -1461,11 +1461,11 @@ DEP_CPP_EVENT=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1485,12 +1485,12 @@ DEP_CPP_EVENT=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -1502,7 +1502,7 @@ NODEP_CPP_EVENT=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -1510,11 +1510,11 @@ DEP_CPP_EVENT=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -1522,11 +1522,11 @@ DEP_CPP_EVENT=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -1534,11 +1534,11 @@ DEP_CPP_EVENT=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_EVENT=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -1546,8 +1546,8 @@ DEP_CPP_EVENT=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_EVENT=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -1555,17 +1555,17 @@ NODEP_CPP_EVENT=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\game.cpp
+SOURCE=..\..\..\engines\agos\game.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1592,10 +1592,10 @@ NODEP_CPP_GAME_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1623,12 +1623,12 @@ DEP_CPP_GAME_=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -1640,7 +1640,7 @@ NODEP_CPP_GAME_=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1667,10 +1667,10 @@ NODEP_CPP_GAME_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1697,10 +1697,10 @@ NODEP_CPP_GAME_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1727,10 +1727,10 @@ NODEP_CPP_GAME_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_GAME_=\
 	"..\..\..\backends\fs\fs.h"\
@@ -1757,7 +1757,7 @@ NODEP_CPP_GAME_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -1765,17 +1765,17 @@ NODEP_CPP_GAME_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\icons.cpp
+SOURCE=..\..\..\engines\agos\icons.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1793,10 +1793,10 @@ NODEP_CPP_ICONS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1816,12 +1816,12 @@ DEP_CPP_ICONS=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -1833,7 +1833,7 @@ NODEP_CPP_ICONS=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1851,10 +1851,10 @@ NODEP_CPP_ICONS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1872,10 +1872,10 @@ NODEP_CPP_ICONS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1893,10 +1893,10 @@ NODEP_CPP_ICONS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_ICONS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1914,7 +1914,7 @@ NODEP_CPP_ICONS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -1922,21 +1922,21 @@ NODEP_CPP_ICONS=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\intern.h
+SOURCE=..\..\..\engines\agos\intern.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\items.cpp
+SOURCE=..\..\..\engines\agos\items.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1956,11 +1956,11 @@ NODEP_CPP_ITEMS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -1981,12 +1981,12 @@ DEP_CPP_ITEMS=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -1998,7 +1998,7 @@ NODEP_CPP_ITEMS=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2018,11 +2018,11 @@ NODEP_CPP_ITEMS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2042,11 +2042,11 @@ NODEP_CPP_ITEMS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2066,11 +2066,11 @@ NODEP_CPP_ITEMS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_ITEMS=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2090,8 +2090,8 @@ NODEP_CPP_ITEMS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\animation.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\animation.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -2099,17 +2099,17 @@ NODEP_CPP_ITEMS=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\midi.cpp
+SOURCE=..\..\..\engines\agos\midi.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2132,10 +2132,10 @@ NODEP_CPP_MIDI_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2156,12 +2156,12 @@ DEP_CPP_MIDI_=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -2173,7 +2173,7 @@ NODEP_CPP_MIDI_=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2196,10 +2196,10 @@ NODEP_CPP_MIDI_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2222,10 +2222,10 @@ NODEP_CPP_MIDI_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2248,10 +2248,10 @@ NODEP_CPP_MIDI_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_MIDI_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2274,7 +2274,7 @@ NODEP_CPP_MIDI_=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -2282,21 +2282,21 @@ NODEP_CPP_MIDI_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\midi.h
+SOURCE=..\..\..\engines\agos\midi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\midiparser_s1d.cpp
+SOURCE=..\..\..\engines\agos\midiparser_s1d.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2321,7 +2321,7 @@ NODEP_CPP_MIDIP=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2347,7 +2347,7 @@ NODEP_CPP_MIDIP=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2372,7 +2372,7 @@ NODEP_CPP_MIDIP=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2397,7 +2397,7 @@ NODEP_CPP_MIDIP=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2422,7 +2422,7 @@ NODEP_CPP_MIDIP=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_MIDIP=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2452,17 +2452,17 @@ NODEP_CPP_MIDIP=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\oracle.cpp
+SOURCE=..\..\..\engines\agos\oracle.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2478,12 +2478,12 @@ NODEP_CPP_ORACL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2504,12 +2504,12 @@ DEP_CPP_ORACL=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -2521,7 +2521,7 @@ NODEP_CPP_ORACL=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2537,12 +2537,12 @@ NODEP_CPP_ORACL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2558,12 +2558,12 @@ NODEP_CPP_ORACL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2579,12 +2579,12 @@ NODEP_CPP_ORACL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_ORACL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2600,9 +2600,9 @@ NODEP_CPP_ORACL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
 !ENDIF 
@@ -2610,17 +2610,17 @@ NODEP_CPP_ORACL=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\res.cpp
+SOURCE=..\..\..\engines\agos\res.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2638,12 +2638,12 @@ NODEP_CPP_RES_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2665,12 +2665,12 @@ DEP_CPP_RES_C=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -2682,7 +2682,7 @@ NODEP_CPP_RES_C=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2700,12 +2700,12 @@ NODEP_CPP_RES_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2723,12 +2723,12 @@ NODEP_CPP_RES_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2746,12 +2746,12 @@ NODEP_CPP_RES_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_RES_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2769,9 +2769,9 @@ NODEP_CPP_RES_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
 !ENDIF 
@@ -2779,17 +2779,17 @@ NODEP_CPP_RES_C=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\saveload.cpp
+SOURCE=..\..\..\engines\agos\saveload.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2818,11 +2818,11 @@ NODEP_CPP_SAVEL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2844,12 +2844,12 @@ DEP_CPP_SAVEL=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\about.h"\
@@ -2868,7 +2868,7 @@ NODEP_CPP_SAVEL=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2897,11 +2897,11 @@ NODEP_CPP_SAVEL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2930,11 +2930,11 @@ NODEP_CPP_SAVEL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2963,11 +2963,11 @@ NODEP_CPP_SAVEL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_SAVEL=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -2996,8 +2996,8 @@ NODEP_CPP_SAVEL=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -3005,19 +3005,19 @@ NODEP_CPP_SAVEL=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\simon.cpp
+SOURCE=..\..\..\engines\agos\agos.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3045,23 +3045,23 @@ DEP_CPP_SIMON=\
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\config.h"\
@@ -3086,13 +3086,13 @@ DEP_CPP_SIMON=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\debugger.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\debugger.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\graphics\font.h"\
 	"..\..\..\graphics\surface.h"\
 	"..\..\..\gui\about.h"\
@@ -3103,18 +3103,18 @@ DEP_CPP_SIMON=\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3142,23 +3142,23 @@ DEP_CPP_SIMON=\
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3186,23 +3186,23 @@ DEP_CPP_SIMON=\
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3230,23 +3230,23 @@ DEP_CPP_SIMON=\
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
-DEP_CPP_SIMON=\
+DEP_CPP_AGOS=\
 	"..\..\..\backends\fs\fs.h"\
 	"..\..\..\backends\ps2\fileio.h"\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3274,18 +3274,18 @@ DEP_CPP_SIMON=\
 	"..\..\..\gui\widget.h"\
 	"..\..\..\sound\mididrv.h"\
 	
-NODEP_CPP_SIMON=\
+NODEP_CPP_AGOS=\
 	"..\..\..\common\config.h"\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\morphos_timer.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\globals.h"\
-	"..\..\..\engines\simon\scumm_globals.h"\
-	"..\..\..\engines\simon\simon\debugger.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\globals.h"\
+	"..\..\..\engines\agos\scumm_globals.h"\
+	"..\..\..\engines\agos\agos\debugger.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
 !ENDIF 
@@ -3293,21 +3293,21 @@ NODEP_CPP_SIMON=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\simon.h
+SOURCE=..\..\..\engines\agos\agos.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\sound.cpp
+SOURCE=..\..\..\engines\agos\sound.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3333,11 +3333,11 @@ NODEP_CPP_SOUND=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3357,12 +3357,12 @@ DEP_CPP_SOUND=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\adpcm.h"\
 	"..\..\..\sound\audiostream.h"\
 	"..\..\..\sound\flac.h"\
@@ -3381,7 +3381,7 @@ NODEP_CPP_SOUND=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3407,11 +3407,11 @@ NODEP_CPP_SOUND=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3437,11 +3437,11 @@ NODEP_CPP_SOUND=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3467,11 +3467,11 @@ NODEP_CPP_SOUND=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_SOUND=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3497,8 +3497,8 @@ NODEP_CPP_SOUND=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\sound.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\sound.h"\
 	
 
 !ENDIF 
@@ -3506,21 +3506,21 @@ NODEP_CPP_SOUND=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\sound.h
+SOURCE=..\..\..\engines\agos\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\string.cpp
+SOURCE=..\..\..\engines\agos\string.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_STRIN=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3528,11 +3528,11 @@ DEP_CPP_STRIN=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_STRIN=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_STRIN=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3552,12 +3552,12 @@ DEP_CPP_STRIN=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -3569,7 +3569,7 @@ NODEP_CPP_STRIN=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_STRIN=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3577,11 +3577,11 @@ DEP_CPP_STRIN=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_STRIN=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_STRIN=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3589,11 +3589,11 @@ DEP_CPP_STRIN=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_STRIN=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_STRIN=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3601,11 +3601,11 @@ DEP_CPP_STRIN=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_STRIN=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_STRIN=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3613,8 +3613,8 @@ DEP_CPP_STRIN=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_STRIN=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -3622,17 +3622,17 @@ NODEP_CPP_STRIN=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\subroutine.cpp
+SOURCE=..\..\..\engines\agos\subroutine.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_SUBRO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3640,11 +3640,11 @@ DEP_CPP_SUBRO=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_SUBRO=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_SUBRO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3664,12 +3664,12 @@ DEP_CPP_SUBRO=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -3681,7 +3681,7 @@ NODEP_CPP_SUBRO=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_SUBRO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3689,11 +3689,11 @@ DEP_CPP_SUBRO=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_SUBRO=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_SUBRO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3701,11 +3701,11 @@ DEP_CPP_SUBRO=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_SUBRO=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_SUBRO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3713,11 +3713,11 @@ DEP_CPP_SUBRO=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_SUBRO=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_SUBRO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3725,8 +3725,8 @@ DEP_CPP_SUBRO=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_SUBRO=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -3734,17 +3734,17 @@ NODEP_CPP_SUBRO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\verb.cpp
+SOURCE=..\..\..\engines\agos\verb.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_VERB_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3752,11 +3752,11 @@ DEP_CPP_VERB_=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_VERB_=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_VERB_=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3776,12 +3776,12 @@ DEP_CPP_VERB_=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -3793,7 +3793,7 @@ NODEP_CPP_VERB_=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_VERB_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3801,11 +3801,11 @@ DEP_CPP_VERB_=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_VERB_=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_VERB_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3813,11 +3813,11 @@ DEP_CPP_VERB_=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_VERB_=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_VERB_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3825,11 +3825,11 @@ DEP_CPP_VERB_=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_VERB_=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_VERB_=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -3837,8 +3837,8 @@ DEP_CPP_VERB_=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_VERB_=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
@@ -3846,17 +3846,17 @@ NODEP_CPP_VERB_=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\vga.cpp
+SOURCE=..\..\..\engines\agos\vga.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3876,12 +3876,12 @@ NODEP_CPP_VGA_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3902,12 +3902,12 @@ DEP_CPP_VGA_C=\
 	"..\..\..\common\system.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -3919,7 +3919,7 @@ NODEP_CPP_VGA_C=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3939,12 +3939,12 @@ NODEP_CPP_VGA_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3964,12 +3964,12 @@ NODEP_CPP_VGA_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -3989,12 +3989,12 @@ NODEP_CPP_VGA_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_VGA_C=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -4014,9 +4014,9 @@ NODEP_CPP_VGA_C=\
 	"..\..\..\common\extend.h"\
 	"..\..\..\common\globals.h"\
 	"..\..\..\common\palmversion.h"\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
-	"..\..\..\engines\simon\simon\vga.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
+	"..\..\..\engines\agos\agos\vga.h"\
 	
 
 !ENDIF 
@@ -4024,21 +4024,21 @@ NODEP_CPP_VGA_C=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\vga.h
+SOURCE=..\..\..\engines\agos\vga.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\engines\simon\window.cpp
+SOURCE=..\..\..\engines\agos\window.cpp
 
-!IF  "$(CFG)" == "simon - Win32 (WCE emulator) Release"
+!IF  "$(CFG)" == "agos - Win32 (WCE emulator) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE emulator) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE emulator) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Release"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARMV4) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARMV4) Debug"
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Debug"
 
 DEP_CPP_WINDO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -4046,11 +4046,11 @@ DEP_CPP_WINDO=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_WINDO=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE ARM) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE ARM) Release"
 
 DEP_CPP_WINDO=\
 	"..\..\..\backends\ps2\fileio.h"\
@@ -4070,12 +4070,12 @@ DEP_CPP_WINDO=\
 	"..\..\..\common\stream.h"\
 	"..\..\..\common\timer.h"\
 	"..\..\..\common\util.h"\
-	"..\..\..\engines\simon\animation.h"\
-	"..\..\..\engines\simon\intern.h"\
-	"..\..\..\engines\simon\midi.h"\
-	"..\..\..\engines\simon\simon.h"\
-	"..\..\..\engines\simon\sound.h"\
-	"..\..\..\engines\simon\vga.h"\
+	"..\..\..\engines\agos\animation.h"\
+	"..\..\..\engines\agos\intern.h"\
+	"..\..\..\engines\agos\midi.h"\
+	"..\..\..\engines\agos\agos.h"\
+	"..\..\..\engines\agos\sound.h"\
+	"..\..\..\engines\agos\vga.h"\
 	"..\..\..\sound\mididrv.h"\
 	"..\..\..\sound\midiparser.h"\
 	"..\..\..\sound\mixer.h"\
@@ -4087,7 +4087,7 @@ NODEP_CPP_WINDO=\
 	"..\..\..\common\palmversion.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_WINDO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -4095,11 +4095,11 @@ DEP_CPP_WINDO=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_WINDO=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE MIPS) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE MIPS) Release"
 
 DEP_CPP_WINDO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -4107,11 +4107,11 @@ DEP_CPP_WINDO=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_WINDO=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Debug"
 
 DEP_CPP_WINDO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -4119,11 +4119,11 @@ DEP_CPP_WINDO=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_WINDO=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
-!ELSEIF  "$(CFG)" == "simon - Win32 (WCE SH3) Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 (WCE SH3) Release"
 
 DEP_CPP_WINDO=\
 	"..\..\..\backends\wince\missing\unistd.h"\
@@ -4131,8 +4131,8 @@ DEP_CPP_WINDO=\
 	"..\..\..\common\stdafx.h"\
 	
 NODEP_CPP_WINDO=\
-	"..\..\..\engines\simon\simon\intern.h"\
-	"..\..\..\engines\simon\simon\simon.h"\
+	"..\..\..\engines\agos\agos\intern.h"\
+	"..\..\..\engines\agos\agos\agos.h"\
 	
 
 !ENDIF 
diff --git a/dists/msvc6/scummvm.dsp b/dists/msvc6/scummvm.dsp
index 21000501c4..d56baf4f95 100644
--- a/dists/msvc6/scummvm.dsp
+++ b/dists/msvc6/scummvm.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Release\simon.lib scumm___Release\scumm.lib sky___Release\sky.lib bs2___Release\bs2.lib queen___Release\queen.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib agos___Release\agos.lib scumm___Release\scumm.lib sky___Release\sky.lib bs2___Release\bs2.lib queen___Release\queen.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 Debug"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib simon___Debug\simon.lib scumm___Debug\scumm.lib sky___Debug\sky.lib bs2___Debug\bs2.lib queen___Debug\queen.lib saga___Debug\saga.lib kyra___Debug\kyra.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept /fixed:no
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib agos___Debug\agos.lib scumm___Debug\scumm.lib sky___Debug\sky.lib bs2___Debug\bs2.lib queen___Debug\queen.lib saga___Debug\saga.lib kyra___Debug\kyra.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept /fixed:no
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 mad mp3 Debug"
@@ -107,7 +107,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib wsock32.lib scumm___mad_mp3_Debug\scumm.lib simon___mad_mp3_Debug\simon.lib sky___mad_mp3_Debug\sky.lib bs2___mad_mp3_Debug\bs2.lib queen___mad_mp3_Debug\queen.lib saga___mad_mp3_Debug\saga.lib kyra___mad_mp3_Debug\kyra.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /pdbtype:sept /fixed:no
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib libmad.lib wsock32.lib scumm___mad_mp3_Debug\scumm.lib agos___mad_mp3_Debug\agos.lib sky___mad_mp3_Debug\sky.lib bs2___mad_mp3_Debug\bs2.lib queen___mad_mp3_Debug\queen.lib saga___mad_mp3_Debug\saga.lib kyra___mad_mp3_Debug\kyra.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd" /pdbtype:sept /fixed:no
 # SUBTRACT LINK32 /pdb:none /map
 
 !ELSEIF  "$(CFG)" == "scummvm - Win32 mad mp3 Release"
@@ -134,8 +134,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib simon___Release\simon.lib scumm___Release\scumm.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib scumm___mad_mp3_Release\scumm.lib simon___mad_mp3_Release\simon.lib sky___mad_mp3_Release\sky.lib bs2___mad_mp3_Release\bs2.lib queen___mad_mp3_Release\queen.lib saga___mad_mp3_Release\saga.lib kyra___mad_mp3_Release\kyra.lib bs1___mad_mp3_Release\bs1.lib /nologo /subsystem:console /pdb:none /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib agos___Release\agos.lib scumm___Release\scumm.lib sdl.lib /nologo /subsystem:console /machine:I386 /nodefaultlib
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib sdl.lib winmm.lib wsock32.lib libmad.lib scumm___mad_mp3_Release\scumm.lib agos___mad_mp3_Release\agos.lib sky___mad_mp3_Release\sky.lib bs2___mad_mp3_Release\bs2.lib queen___mad_mp3_Release\queen.lib saga___mad_mp3_Release\saga.lib kyra___mad_mp3_Release\kyra.lib bs1___mad_mp3_Release\bs1.lib /nologo /subsystem:console /pdb:none /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"libcd"
 # SUBTRACT LINK32 /debug
 
 !ENDIF 
diff --git a/dists/msvc6/scummvm.dsw b/dists/msvc6/scummvm.dsw
index da337e7dcc..3f8aa6df82 100644
--- a/dists/msvc6/scummvm.dsw
+++ b/dists/msvc6/scummvm.dsw
@@ -87,7 +87,7 @@ Package=<4>
     Project_Dep_Name scumm
     End Project Dependency
     Begin Project Dependency
-    Project_Dep_Name simon
+    Project_Dep_Name agos
     End Project Dependency
     Begin Project Dependency
     Project_Dep_Name sky
@@ -111,7 +111,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "simon"=".\simon.dsp" - Package Owner=<4>
+Project: "agos"=".\agos.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/dists/msvc6/simon.dsp b/dists/msvc6/simon.dsp
index 551dd2a0c6..45472cee3f 100644
--- a/dists/msvc6/simon.dsp
+++ b/dists/msvc6/simon.dsp
@@ -1,26 +1,26 @@
-# Microsoft Developer Studio Project File - Name="simon" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="agos" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=simon - Win32 mad mp3 Debug
+CFG=agos - Win32 mad mp3 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "simon.mak".
+!MESSAGE NMAKE /f "agos.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "simon.mak" CFG="simon - Win32 mad mp3 Debug"
+!MESSAGE NMAKE /f "agos.mak" CFG="agos - Win32 mad mp3 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "simon - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "simon - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "simon - Win32 mad mp3 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE "simon - Win32 mad mp3 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "agos - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "agos - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "agos - Win32 mad mp3 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "agos - Win32 mad mp3 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -30,7 +30,7 @@ CFG=simon - Win32 mad mp3 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "simon - Win32 Release"
+!IF  "$(CFG)" == "agos - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -39,8 +39,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "simon___Release"
-# PROP Intermediate_Dir "simon___Release"
+# PROP Output_Dir "agos___Release"
+# PROP Intermediate_Dir "agos___Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
 # ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /FD /c
@@ -54,17 +54,17 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "simon___Win32_Debug"
-# PROP BASE Intermediate_Dir "simon___Win32_Debug"
+# PROP BASE Output_Dir "agos___Win32_Debug"
+# PROP BASE Intermediate_Dir "agos___Win32_Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "simon___Debug"
-# PROP Intermediate_Dir "simon___Debug"
+# PROP Output_Dir "agos___Debug"
+# PROP Intermediate_Dir "agos___Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD CPP /nologo /MTd /W3 /WX /Gm /GR /GX /ZI /Od /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /FD /GZ /c
@@ -78,17 +78,17 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 mad mp3 Debug"
+!ELSEIF  "$(CFG)" == "agos - Win32 mad mp3 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "simon___Win32_MP3_Enabled_Debug"
-# PROP BASE Intermediate_Dir "simon___Win32_MP3_Enabled_Debug"
+# PROP BASE Output_Dir "agos___Win32_MP3_Enabled_Debug"
+# PROP BASE Intermediate_Dir "agos___Win32_MP3_Enabled_Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "simon___mad_mp3_Debug"
-# PROP Intermediate_Dir "simon___mad_mp3_Debug"
+# PROP Output_Dir "agos___mad_mp3_Debug"
+# PROP Intermediate_Dir "agos___mad_mp3_Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "BYPASS_COPY_PROT" /D "USE_ADLIB" /YX /FD /GZ /c
 # ADD CPP /nologo /MTd /W3 /WX /Gm /GX /ZI /Od /I "." /I "common" /I "..\..\\" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /D "MSVC6_COMPAT" /FD /GZ /c
@@ -102,17 +102,17 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
-!ELSEIF  "$(CFG)" == "simon - Win32 mad mp3 Release"
+!ELSEIF  "$(CFG)" == "agos - Win32 mad mp3 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "simon___Win32_MP3_Enabled_Release"
-# PROP BASE Intermediate_Dir "simon___Win32_MP3_Enabled_Release"
+# PROP BASE Output_Dir "agos___Win32_MP3_Enabled_Release"
+# PROP BASE Intermediate_Dir "agos___Win32_MP3_Enabled_Release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "simon___mad_mp3_Release"
-# PROP Intermediate_Dir "simon___mad_mp3_Release"
+# PROP Output_Dir "agos___mad_mp3_Release"
+# PROP Intermediate_Dir "agos___mad_mp3_Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /I "." /I "common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /YX /FD /c
 # ADD CPP /nologo /G6 /MT /W3 /WX /GR /GX /O2 /I "..\..\\" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "USE_ADLIB" /D "BYPASS_COPY_PROT" /D "USE_MAD" /FD /c
@@ -130,84 +130,84 @@ LIB32=link.exe -lib
 
 # Begin Target
 
-# Name "simon - Win32 Release"
-# Name "simon - Win32 Debug"
-# Name "simon - Win32 mad mp3 Debug"
-# Name "simon - Win32 mad mp3 Release"
+# Name "agos - Win32 Release"
+# Name "agos - Win32 Debug"
+# Name "agos - Win32 mad mp3 Debug"
+# Name "agos - Win32 mad mp3 Release"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\simon\charset.cpp
+SOURCE=..\..\agos\charset.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\debug.cpp
+SOURCE=..\..\agos\debug.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\debug.h
+SOURCE=..\..\agos\debug.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\debugger.cpp
+SOURCE=..\..\agos\debugger.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\debugger.h
+SOURCE=..\..\agos\debugger.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\intern.h
+SOURCE=..\..\agos\intern.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\items.cpp
+SOURCE=..\..\agos\items.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\midi.cpp
+SOURCE=..\..\agos\midi.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\midi.h
+SOURCE=..\..\agos\midi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\midiparser_s1d.cpp
+SOURCE=..\..\agos\midiparser_s1d.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\res.cpp
+SOURCE=..\..\agos\res.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\simon.cpp
+SOURCE=..\..\agos\agos.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\simon.h
+SOURCE=..\..\agos\agos.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\sound.cpp
+SOURCE=..\..\agos\sound.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\sound.h
+SOURCE=..\..\agos\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\verb.cpp
+SOURCE=..\..\agos\verb.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\vga.cpp
+SOURCE=..\..\agos\vga.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\simon\vga.h
+SOURCE=..\..\agos\vga.h
 # End Source File
 # End Group
 # End Target
diff --git a/dists/msvc7/scummvm.sln b/dists/msvc7/scummvm.sln
index 524fbeca3a..65a6b1abdc 100644
--- a/dists/msvc7/scummvm.sln
+++ b/dists/msvc7/scummvm.sln
@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "queen", "queen.vcproj", "{6
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simon", "simon.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agos", "agos.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sky", "sky.vcproj", "{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"
 EndProject
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index 54142a6a07..24a8b92a6e 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib kyra_debug/kyra.lib cine_debug/cine.lib lure_debug/lure.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib kyra_debug/kyra.lib cine_debug/cine.lib lure_debug/lure.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib agos_debug/agos.lib sky_debug/sky.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libcmtd.lib"
@@ -91,7 +91,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib sword1_release/sword1.lib sword2_release/sword2.lib kyra_release/kyra.lib cine_release/cine.lib lure_release/lure.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib sword1_release/sword1.lib sword2_release/sword2.lib kyra_release/kyra.lib cine_release/cine.lib lure_release/lure.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/dists/msvc7/simon.vcproj b/dists/msvc7/simon.vcproj
index 9b74c45dcf..ad0d878201 100644
--- a/dists/msvc7/simon.vcproj
+++ b/dists/msvc7/simon.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.00"
-	Name="simon"
+	Name="agos"
 	ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
 	Keyword="Win32Proj">
 	<Platforms>
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="simon_Debug"
-			IntermediateDirectory="simon_Debug"
+			OutputDirectory="agos_Debug"
+			IntermediateDirectory="agos_Debug"
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/simon.lib"/>
+				OutputFile="$(OutDir)/agos.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -53,8 +53,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="simon_Release"
-			IntermediateDirectory="simon_Release"
+			OutputDirectory="agos_Release"
+			IntermediateDirectory="agos_Release"
 			ConfigurationType="4"
 			ATLMinimizesCRunTimeLibraryUsage="TRUE"
 			CharacterSet="2"
@@ -80,7 +80,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/simon.lib"/>
+				OutputFile="$(OutDir)/agos.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -97,73 +97,73 @@
 	</Configurations>
 	<Files>
 		<File
-			RelativePath="..\..\engines\simon\charset.cpp">
+			RelativePath="..\..\engines\agos\charset.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\cursor.cpp">
+			RelativePath="..\..\engines\agos\cursor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debug.cpp">
+			RelativePath="..\..\engines\agos\debug.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debug.h">
+			RelativePath="..\..\engines\agos\debug.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debugger.cpp">
+			RelativePath="..\..\engines\agos\debugger.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debugger.h">
+			RelativePath="..\..\engines\agos\debugger.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\game.cpp">
+			RelativePath="..\..\engines\agos\game.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\icons.cpp">
+			RelativePath="..\..\engines\agos\icons.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\intern.h">
+			RelativePath="..\..\engines\agos\intern.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\items.cpp">
+			RelativePath="..\..\engines\agos\items.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\midi.cpp">
+			RelativePath="..\..\engines\agos\midi.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\midi.h">
+			RelativePath="..\..\engines\agos\midi.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\midiparser_s1d.cpp">
+			RelativePath="..\..\engines\agos\midiparser_s1d.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\oracle.cpp">
+			RelativePath="..\..\engines\agos\oracle.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\res.cpp">
+			RelativePath="..\..\engines\agos\res.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\saveload.cpp">
+			RelativePath="..\..\engines\agos\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\simon.cpp">
+			RelativePath="..\..\engines\agos\agos.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\simon.h">
+			RelativePath="..\..\engines\agos\agos.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\sound.cpp">
+			RelativePath="..\..\engines\agos\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\sound.h">
+			RelativePath="..\..\engines\agos\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\verb.cpp">
+			RelativePath="..\..\engines\agos\verb.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\vga.cpp">
+			RelativePath="..\..\engines\agos\vga.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\vga.h">
+			RelativePath="..\..\engines\agos\vga.h">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc71/scummvm.sln b/dists/msvc71/scummvm.sln
index ad039e5293..d099703732 100644
--- a/dists/msvc71/scummvm.sln
+++ b/dists/msvc71/scummvm.sln
@@ -26,7 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simon", "simon.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agos", "agos.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index 21c219f0a5..de8a4d1e6a 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -38,7 +38,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_debug/agi.lib cine_debug/cine.lib gob_debug/gob.lib kyra_debug/kyra.lib lure_debug/lure.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib sword1_debug/sword1.lib sword2_debug/sword2.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_debug/agi.lib cine_debug/cine.lib gob_debug/gob.lib kyra_debug/kyra.lib lure_debug/lure.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib agos_debug/agos.lib sky_debug/sky.lib sword1_debug/sword1.lib sword2_debug/sword2.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libcmtd.lib"
@@ -97,7 +97,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_release/agi.lib cine_release/cine.lib gob_release/gob.lib kyra_release/kyra.lib lure_release/lure.lib queen_release/queen.lib saga_release/saga.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib sword1_release/sword1.lib sword2_release/sword2.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib agi_release/agi.lib cine_release/cine.lib gob_release/gob.lib kyra_release/kyra.lib lure_release/lure.lib queen_release/queen.lib saga_release/saga.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib sword1_release/sword1.lib sword2_release/sword2.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/dists/msvc71/simon.vcproj b/dists/msvc71/simon.vcproj
index b72f6f38eb..8d8139adf9 100644
--- a/dists/msvc71/simon.vcproj
+++ b/dists/msvc71/simon.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
-	Name="simon"
+	Name="agos"
 	ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
 	Keyword="Win32Proj">
 	<Platforms>
@@ -12,8 +12,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="simon_Debug"
-			IntermediateDirectory="simon_Debug"
+			OutputDirectory="agos_Debug"
+			IntermediateDirectory="agos_Debug"
 			ConfigurationType="4"
 			CharacterSet="2">
 			<Tool
@@ -37,7 +37,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/simon.lib"/>
+				OutputFile="$(OutDir)/agos.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -59,8 +59,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="simon_Release"
-			IntermediateDirectory="simon_Release"
+			OutputDirectory="agos_Release"
+			IntermediateDirectory="agos_Release"
 			ConfigurationType="4"
 			ATLMinimizesCRunTimeLibraryUsage="TRUE"
 			CharacterSet="2"
@@ -86,7 +86,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/simon.lib"/>
+				OutputFile="$(OutDir)/agos.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
@@ -111,94 +111,94 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\simon\animation.cpp">
+			RelativePath="..\..\engines\agos\animation.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\animation.h">
+			RelativePath="..\..\engines\agos\animation.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\charset.cpp">
+			RelativePath="..\..\engines\agos\charset.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\cursor.cpp">
+			RelativePath="..\..\engines\agos\cursor.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debug.cpp">
+			RelativePath="..\..\engines\agos\debug.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debug.h">
+			RelativePath="..\..\engines\agos\debug.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debugger.cpp">
+			RelativePath="..\..\engines\agos\debugger.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debugger.h">
+			RelativePath="..\..\engines\agos\debugger.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\draw.cpp">
+			RelativePath="..\..\engines\agos\draw.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\event.cpp">
+			RelativePath="..\..\engines\agos\event.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\game.cpp">
+			RelativePath="..\..\engines\agos\game.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\icons.cpp">
+			RelativePath="..\..\engines\agos\icons.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\intern.h">
+			RelativePath="..\..\engines\agos\intern.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\items.cpp">
+			RelativePath="..\..\engines\agos\items.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\midi.cpp">
+			RelativePath="..\..\engines\agos\midi.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\midi.h">
+			RelativePath="..\..\engines\agos\midi.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\midiparser_s1d.cpp">
+			RelativePath="..\..\engines\agos\midiparser_s1d.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\oracle.cpp">
+			RelativePath="..\..\engines\agos\oracle.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\res.cpp">
+			RelativePath="..\..\engines\agos\res.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\saveload.cpp">
+			RelativePath="..\..\engines\agos\saveload.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\simon.cpp">
+			RelativePath="..\..\engines\agos\agos.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\simon.h">
+			RelativePath="..\..\engines\agos\agos.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\sound.cpp">
+			RelativePath="..\..\engines\agos\sound.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\sound.h">
+			RelativePath="..\..\engines\agos\sound.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\string.cpp">
+			RelativePath="..\..\engines\agos\string.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\subroutine.cpp">
+			RelativePath="..\..\engines\agos\subroutine.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\verb.cpp">
+			RelativePath="..\..\engines\agos\verb.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\vga.cpp">
+			RelativePath="..\..\engines\agos\vga.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\vga.h">
+			RelativePath="..\..\engines\agos\vga.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\window.cpp">
+			RelativePath="..\..\engines\agos\window.cpp">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc8/scummvm.sln b/dists/msvc8/scummvm.sln
index f33a6488b4..78fcc0c2e3 100644
--- a/dists/msvc8/scummvm.sln
+++ b/dists/msvc8/scummvm.sln
@@ -22,7 +22,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "queen", "queen.vcproj", "{6
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scumm", "scumm.vcproj", "{B6AFD548-63D2-40CD-A652-E87095AFCBAF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simon", "simon.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agos", "agos.vcproj", "{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sky", "sky.vcproj", "{B5527758-2F51-4CCD-AAE1-B0E28654BD6A}"
 EndProject
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index 4fe294edd6..95476f15c8 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -68,7 +68,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib sky_debug/sky.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -156,7 +156,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
diff --git a/dists/msvc8/simon.vcproj b/dists/msvc8/simon.vcproj
index 3c49c31a03..4261957406 100644
--- a/dists/msvc8/simon.vcproj
+++ b/dists/msvc8/simon.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="simon"
+	Name="agos"
 	ProjectGUID="{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}"
 	Keyword="Win32Proj"
 	>
@@ -16,8 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="simon_Debug"
-			IntermediateDirectory="simon_Debug"
+			OutputDirectory="agos_Debug"
+			IntermediateDirectory="agos_Debug"
 			ConfigurationType="4"
 			CharacterSet="2"
 			>
@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/simon.lib"
+				OutputFile="$(OutDir)/agos.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -86,8 +86,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="simon_Release"
-			IntermediateDirectory="simon_Release"
+			OutputDirectory="agos_Release"
+			IntermediateDirectory="agos_Release"
 			ConfigurationType="4"
 			ATLMinimizesCRunTimeLibraryUsage="true"
 			CharacterSet="2"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/simon.lib"
+				OutputFile="$(OutDir)/agos.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -160,123 +160,123 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\simon\animation.cpp"
+			RelativePath="..\..\engines\agos\animation.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\animation.h"
+			RelativePath="..\..\engines\agos\animation.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\charset.cpp"
+			RelativePath="..\..\engines\agos\charset.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\cursor.cpp"
+			RelativePath="..\..\engines\agos\cursor.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debug.cpp"
+			RelativePath="..\..\engines\agos\debug.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debug.h"
+			RelativePath="..\..\engines\agos\debug.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debugger.cpp"
+			RelativePath="..\..\engines\agos\debugger.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\debugger.h"
+			RelativePath="..\..\engines\agos\debugger.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\draw.cpp"
+			RelativePath="..\..\engines\agos\draw.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\event.cpp"
+			RelativePath="..\..\engines\agos\event.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\game.cpp"
+			RelativePath="..\..\engines\agos\game.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\icons.cpp"
+			RelativePath="..\..\engines\agos\icons.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\intern.h"
+			RelativePath="..\..\engines\agos\intern.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\items.cpp"
+			RelativePath="..\..\engines\agos\items.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\midi.cpp"
+			RelativePath="..\..\engines\agos\midi.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\midi.h"
+			RelativePath="..\..\engines\agos\midi.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\midiparser_s1d.cpp"
+			RelativePath="..\..\engines\agos\midiparser_s1d.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\oracle.cpp"
+			RelativePath="..\..\engines\agos\oracle.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\res.cpp"
+			RelativePath="..\..\engines\agos\res.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\saveload.cpp"
+			RelativePath="..\..\engines\agos\saveload.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\simon.cpp"
+			RelativePath="..\..\engines\agos\agos.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\simon.h"
+			RelativePath="..\..\engines\agos\agos.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\sound.cpp"
+			RelativePath="..\..\engines\agos\sound.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\sound.h"
+			RelativePath="..\..\engines\agos\sound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\string.cpp"
+			RelativePath="..\..\engines\agos\string.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\subroutine.cpp"
+			RelativePath="..\..\engines\agos\subroutine.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\verb.cpp"
+			RelativePath="..\..\engines\agos\verb.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\vga.cpp"
+			RelativePath="..\..\engines\agos\vga.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\vga.h"
+			RelativePath="..\..\engines\agos\vga.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\simon\window.cpp"
+			RelativePath="..\..\engines\agos\window.cpp"
 			>
 		</File>
 	</Files>