2 files changed, 40 insertions, 28 deletions
diff --git a/scumm.dsp b/scumm.dsp
index 527d5bd3dd..13586d6dc8 100644
--- a/scumm.dsp
+++ b/scumm.dsp
@@ -223,6 +223,10 @@ SOURCE=.\scumm\akos.h
 # End Source File
 # Begin Source File
 
+SOURCE=".\scumm\base-costume.cpp"
+# End Source File
+# Begin Source File
+
 SOURCE=".\scumm\base-costume.h"
 # End Source File
 # Begin Source File
@@ -243,6 +247,10 @@ SOURCE=.\scumm\bundle.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\scumm\camera.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\scumm\charset.cpp
 # End Source File
 # Begin Source File
diff --git a/sky.dsp b/sky.dsp
index 5aee35c4c6..2b301dc2ec 100644
--- a/sky.dsp
+++ b/sky.dsp
@@ -441,117 +441,121 @@ SOURCE=.\sky\compacts\objects.h
 SOURCE=.\sky\compacts\z_compac.h
 # End Source File
 # End Group
+# Begin Group "music"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\sky\adlibchannel.cpp
+SOURCE=.\sky\music\adlibchannel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\adlibchannel.h
+SOURCE=.\sky\music\adlibchannel.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\adlibmusic.cpp
+SOURCE=.\sky\music\adlibmusic.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\adlibmusic.h
+SOURCE=.\sky\music\adlibmusic.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\autoroute.cpp
+SOURCE=.\sky\music\gmchannel.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\autoroute.h
+SOURCE=.\sky\music\gmchannel.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\cd_intro.cpp
+SOURCE=.\sky\music\gmmusic.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\compact.cpp
+SOURCE=.\sky\music\gmmusic.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\compact.h
+SOURCE=.\sky\music\mt32music.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\debug.cpp
+SOURCE=.\sky\music\mt32music.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\debug.h
+SOURCE=.\sky\music\musicbase.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\disk.cpp
+SOURCE=.\sky\music\musicbase.h
 # End Source File
+# End Group
 # Begin Source File
 
-SOURCE=.\sky\disk.h
+SOURCE=.\sky\autoroute.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\gmchannel.cpp
+SOURCE=.\sky\autoroute.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\gmchannel.h
+SOURCE=.\sky\cd_intro.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\gmmusic.cpp
+SOURCE=.\sky\compact.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\gmmusic.h
+SOURCE=.\sky\compact.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\grid.cpp
+SOURCE=.\sky\debug.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\grid.h
+SOURCE=.\sky\debug.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\intro.cpp
+SOURCE=.\sky\disk.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\logic.cpp
+SOURCE=.\sky\disk.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\logic.h
+SOURCE=.\sky\grid.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\mouse.cpp
+SOURCE=.\sky\grid.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\mouse.h
+SOURCE=.\sky\intro.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\mt32music.cpp
+SOURCE=.\sky\logic.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\mt32music.h
+SOURCE=.\sky\logic.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\musicbase.cpp
+SOURCE=.\sky\mouse.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sky\musicbase.h
+SOURCE=.\sky\mouse.h
 # End Source File
 # Begin Source File