72 files changed, 175 insertions, 175 deletions

diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 75a1d08db2..dfd9a03e62 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -36,15 +36,15 @@
 #include "sci/engine/gc.h"
 #include "sci/engine/kernel_types.h"	// for determine_reg_type
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/songlib.h"	// for SongLibrary
-#include "sci/sfx/iterator/iterator.h"	// for SCI_SONG_ITERATOR_TYPE_SCI0
+#include "sci/sound/iterator/songlib.h"	// for SongLibrary
+#include "sci/sound/iterator/iterator.h"	// for SCI_SONG_ITERATOR_TYPE_SCI0
 #else
-#include "sci/sfx/music.h"
+#include "sci/sound/music.h"
 #endif
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 #include "sci/vocabulary.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_cursor.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_cursor.h"
 
 #include "graphics/video/avi_decoder.h"
 #include "sci/video/seq_decoder.h"
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 133abff3b9..d3006a719e 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -34,8 +34,8 @@
 #include "sci/engine/kernel.h"
 #include "sci/engine/kernel_types.h"
 #include "sci/engine/message.h"
-#include "sci/gui/gui.h"
-#include "sci/sfx/music.h"
+#include "sci/graphics/gui.h"
+#include "sci/sound/music.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kernel32.cpp b/engines/sci/engine/kernel32.cpp
index c7dc629d8f..6350ac1565 100644
--- a/engines/sci/engine/kernel32.cpp
+++ b/engines/sci/engine/kernel32.cpp
@@ -28,7 +28,7 @@
 #include "sci/engine/kernel.h"
 #include "sci/engine/segment.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui.h"
+#include "sci/graphics/gui.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index 4619f29f40..8d04bc7354 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -29,8 +29,8 @@
 #include "sci/console.h"
 #include "sci/debug.h"	// for g_debug_simulated_key
 #include "sci/event.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_cursor.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_cursor.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index ff3783db79..3021aa6f5b 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -33,11 +33,11 @@
 #include "sci/video/seq_decoder.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_animate.h"
-#include "sci/gui/gui_cursor.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_view.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_animate.h"
+#include "sci/graphics/gui_cursor.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_view.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index b3ed6d03e0..d426b9f8a1 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -27,8 +27,8 @@
 #include "sci/resource.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_cursor.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_cursor.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index 76253ee516..4327957ebb 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -31,7 +31,7 @@
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/gc.h"
-#include "sci/gui/gui.h"
+#include "sci/graphics/gui.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 3702035c2d..da667037c6 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -27,7 +27,7 @@
 #include "sci/resource.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui_animate.h"
+#include "sci/graphics/gui_animate.h"
 
 namespace Sci {
 
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 6771e95902..dd446a2737 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -26,7 +26,7 @@
 #include "sci/sci.h"
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
-#include "sci/gui/gui.h"
+#include "sci/graphics/gui.h"
 
 #include "common/list.h"
 
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index d70b23c13f..3881e234ba 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -25,7 +25,7 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/sfx/soundcmd.h"
+#include "sci/sound/soundcmd.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/vm.h"		// for Object
 
diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index cd8b738bde..fcdfe8f7e6 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -36,13 +36,13 @@
 #include "sci/engine/message.h"
 #include "sci/engine/savegame.h"
 #include "sci/engine/vm_types.h"
-#include "sci/gui/gui.h"
-#include "sci/sfx/audio.h"
+#include "sci/graphics/gui.h"
+#include "sci/sound/audio.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/core.h"
-#include "sci/sfx/iterator/iterator.h"
+#include "sci/sound/iterator/core.h"
+#include "sci/sound/iterator/iterator.h"
 #else
-#include "sci/sfx/music.h"
+#include "sci/sound/music.h"
 #endif
 
 namespace Sci {
diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h
index 61f3aa68f2..da5ccdf73e 100644
--- a/engines/sci/engine/state.h
+++ b/engines/sci/engine/state.h
@@ -41,11 +41,11 @@ namespace Common {
 #include "sci/engine/kernel.h"	// for kfunct_sig_pair_t
 #include "sci/engine/script.h"
 #include "sci/engine/seg_manager.h"
-#include "sci/sfx/audio.h"
+#include "sci/sound/audio.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/core.h"
+#include "sci/sound/iterator/core.h"
 #endif
-#include "sci/sfx/soundcmd.h"
+#include "sci/sound/soundcmd.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/graphics/gui.cpp
index 9377d439bf..ee1543995b 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/graphics/gui.cpp
@@ -30,18 +30,18 @@
 #include "sci/debug.h"	// for g_debug_sleeptime_factor
 #include "sci/event.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_cursor.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_windowmgr.h"
-#include "sci/gui/gui_animate.h"
-#include "sci/gui/gui_controls.h"
-#include "sci/gui/gui_menu.h"
-#include "sci/gui/gui_text.h"
-#include "sci/gui/gui_transitions.h"
-#include "sci/gui/gui_view.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_cursor.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_windowmgr.h"
+#include "sci/graphics/gui_animate.h"
+#include "sci/graphics/gui_controls.h"
+#include "sci/graphics/gui_menu.h"
+#include "sci/graphics/gui_text.h"
+#include "sci/graphics/gui_transitions.h"
+#include "sci/graphics/gui_view.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui.h b/engines/sci/graphics/gui.h
index 154ff825a6..1411a2eac6 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/graphics/gui.h
@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_GUI_H
 #define SCI_GUI_GUI_H
 
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_animate.cpp b/engines/sci/graphics/gui_animate.cpp
index 16e67873aa..ad9332e3a1 100644
--- a/engines/sci/gui/gui_animate.cpp
+++ b/engines/sci/graphics/gui_animate.cpp
@@ -30,11 +30,11 @@
 #include "sci/sci.h"
 #include "sci/engine/state.h"
 #include "sci/engine/vm.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_view.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_transitions.h"
-#include "sci/gui/gui_animate.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_view.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_transitions.h"
+#include "sci/graphics/gui_animate.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_animate.h b/engines/sci/graphics/gui_animate.h
index ca6400d0da..51204ef5ac 100644
--- a/engines/sci/gui/gui_animate.h
+++ b/engines/sci/graphics/gui_animate.h
@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_ANIMATE_H
 #define SCI_GUI_ANIMATE_H
 
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_controls.cpp b/engines/sci/graphics/gui_controls.cpp
index 55385084dc..073819a654 100644
--- a/engines/sci/gui/gui_controls.cpp
+++ b/engines/sci/graphics/gui_controls.cpp
@@ -30,10 +30,10 @@
 #include "sci/sci.h"
 #include "sci/event.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_font.h"
-#include "sci/gui/gui_text.h"
-#include "sci/gui/gui_controls.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_font.h"
+#include "sci/graphics/gui_text.h"
+#include "sci/graphics/gui_controls.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_controls.h b/engines/sci/graphics/gui_controls.h
index a2d027d514..a2d027d514 100644
--- a/engines/sci/gui/gui_controls.h
+++ b/engines/sci/graphics/gui_controls.h
diff --git a/engines/sci/gui/gui_cursor.cpp b/engines/sci/graphics/gui_cursor.cpp
index cf6256640f..603b3f589e 100644
--- a/engines/sci/gui/gui_cursor.cpp
+++ b/engines/sci/graphics/gui_cursor.cpp
@@ -29,10 +29,10 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_view.h"
-#include "sci/gui/gui_cursor.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_view.h"
+#include "sci/graphics/gui_cursor.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_cursor.h b/engines/sci/graphics/gui_cursor.h
index 293c508bdb..293c508bdb 100644
--- a/engines/sci/gui/gui_cursor.h
+++ b/engines/sci/graphics/gui_cursor.h
diff --git a/engines/sci/gui/gui_font.cpp b/engines/sci/graphics/gui_font.cpp
index 0af0942c1f..7416a6a467 100644
--- a/engines/sci/gui/gui_font.cpp
+++ b/engines/sci/graphics/gui_font.cpp
@@ -25,8 +25,8 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_font.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_font.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_font.h b/engines/sci/graphics/gui_font.h
index a3b8aa9da5..fa3909dad9 100644
--- a/engines/sci/gui/gui_font.h
+++ b/engines/sci/graphics/gui_font.h
@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_FONT_H
 #define SCI_GUI_FONT_H
 
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/graphics/gui_gfx.cpp
index 18d925e3cf..f6ccfc486e 100644
--- a/engines/sci/gui/gui_gfx.cpp
+++ b/engines/sci/graphics/gui_gfx.cpp
@@ -29,14 +29,14 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_animate.h"
-#include "sci/gui/gui_font.h"
-#include "sci/gui/gui_picture.h"
-#include "sci/gui/gui_view.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_text.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_animate.h"
+#include "sci/graphics/gui_font.h"
+#include "sci/graphics/gui_picture.h"
+#include "sci/graphics/gui_view.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_text.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_gfx.h b/engines/sci/graphics/gui_gfx.h
index 0cbed35f45..75750544f1 100644
--- a/engines/sci/gui/gui_gfx.h
+++ b/engines/sci/graphics/gui_gfx.h
@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_GFX_H
 #define SCI_GUI_GFX_H
 
-#include "sci/gui/gui.h"
+#include "sci/graphics/gui.h"
 
 #include "common/hashmap.h"
 
diff --git a/engines/sci/gui/gui_helpers.h b/engines/sci/graphics/gui_helpers.h
index 554282e312..554282e312 100644
--- a/engines/sci/gui/gui_helpers.h
+++ b/engines/sci/graphics/gui_helpers.h
diff --git a/engines/sci/gui/gui_menu.cpp b/engines/sci/graphics/gui_menu.cpp
index e9795edc5c..e5ca8be68f 100644
--- a/engines/sci/gui/gui_menu.cpp
+++ b/engines/sci/graphics/gui_menu.cpp
@@ -30,13 +30,13 @@
 #include "sci/sci.h"
 #include "sci/event.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_helpers.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_cursor.h"
-#include "sci/gui/gui_font.h"
-#include "sci/gui/gui_text.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_menu.h"
+#include "sci/graphics/gui_helpers.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_cursor.h"
+#include "sci/graphics/gui_font.h"
+#include "sci/graphics/gui_text.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_menu.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_menu.h b/engines/sci/graphics/gui_menu.h
index a396378dc0..a396378dc0 100644
--- a/engines/sci/gui/gui_menu.h
+++ b/engines/sci/graphics/gui_menu.h
diff --git a/engines/sci/gui/gui_palette.cpp b/engines/sci/graphics/gui_palette.cpp
index 977f63e4f9..8e1eea4409 100644
--- a/engines/sci/gui/gui_palette.cpp
+++ b/engines/sci/graphics/gui_palette.cpp
@@ -28,8 +28,8 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_palette.h b/engines/sci/graphics/gui_palette.h
index f3eca7448d..d785e418e1 100644
--- a/engines/sci/gui/gui_palette.h
+++ b/engines/sci/graphics/gui_palette.h
@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_PALETTE_H
 #define SCI_GUI_PALETTE_H
 
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_picture.cpp b/engines/sci/graphics/gui_picture.cpp
index 1ab54a51e1..8505233a2c 100644
--- a/engines/sci/gui/gui_picture.cpp
+++ b/engines/sci/graphics/gui_picture.cpp
@@ -26,10 +26,10 @@
 #include "common/stack.h"
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_picture.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_picture.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_picture.h b/engines/sci/graphics/gui_picture.h
index 4c3283c53b..4c3283c53b 100644
--- a/engines/sci/gui/gui_picture.h
+++ b/engines/sci/graphics/gui_picture.h
diff --git a/engines/sci/gui/gui_portrait.cpp b/engines/sci/graphics/gui_portrait.cpp
index 09eba8a24d..de3da9bc84 100644
--- a/engines/sci/gui/gui_portrait.cpp
+++ b/engines/sci/graphics/gui_portrait.cpp
@@ -29,9 +29,9 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_portrait.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_portrait.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_portrait.h b/engines/sci/graphics/gui_portrait.h
index b97f3dd2a6..b97f3dd2a6 100644
--- a/engines/sci/gui/gui_portrait.h
+++ b/engines/sci/graphics/gui_portrait.h
diff --git a/engines/sci/gui/gui_screen.cpp b/engines/sci/graphics/gui_screen.cpp
index 702b68d6b6..13f969e55f 100644
--- a/engines/sci/gui/gui_screen.cpp
+++ b/engines/sci/graphics/gui_screen.cpp
@@ -29,7 +29,7 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
+#include "sci/graphics/gui_screen.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_screen.h b/engines/sci/graphics/gui_screen.h
index 1429e3d7be..8a54e88829 100644
--- a/engines/sci/gui/gui_screen.h
+++ b/engines/sci/graphics/gui_screen.h
@@ -27,7 +27,7 @@
 #define SCI_GUI_SCREEN_H
 
 #include "sci/sci.h"
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_text.cpp b/engines/sci/graphics/gui_text.cpp
index 218008a95e..430877001e 100644
--- a/engines/sci/gui/gui_text.cpp
+++ b/engines/sci/graphics/gui_text.cpp
@@ -29,9 +29,9 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_font.h"
-#include "sci/gui/gui_text.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_font.h"
+#include "sci/graphics/gui_text.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_text.h b/engines/sci/graphics/gui_text.h
index 8002cdcf0c..8002cdcf0c 100644
--- a/engines/sci/gui/gui_text.h
+++ b/engines/sci/graphics/gui_text.h
diff --git a/engines/sci/gui/gui_transitions.cpp b/engines/sci/graphics/gui_transitions.cpp
index f4c6853bbe..063f497d71 100644
--- a/engines/sci/gui/gui_transitions.cpp
+++ b/engines/sci/graphics/gui_transitions.cpp
@@ -30,10 +30,10 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_transitions.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_transitions.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_transitions.h b/engines/sci/graphics/gui_transitions.h
index b20e22fa5b..691a71af91 100644
--- a/engines/sci/gui/gui_transitions.h
+++ b/engines/sci/graphics/gui_transitions.h
@@ -26,7 +26,7 @@
 #ifndef SCI_GUI_TRANSITIONS_H
 #define SCI_GUI_TRANSITIONS_H
 
-#include "sci/gui/gui_helpers.h"
+#include "sci/graphics/gui_helpers.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_view.cpp b/engines/sci/graphics/gui_view.cpp
index 3442f32eb8..0aeaeb3d96 100644
--- a/engines/sci/gui/gui_view.cpp
+++ b/engines/sci/graphics/gui_view.cpp
@@ -25,10 +25,10 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_view.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_view.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_view.h b/engines/sci/graphics/gui_view.h
index c4ed3db2b0..c4ed3db2b0 100644
--- a/engines/sci/gui/gui_view.h
+++ b/engines/sci/graphics/gui_view.h
diff --git a/engines/sci/gui/gui_windowmgr.cpp b/engines/sci/graphics/gui_windowmgr.cpp
index 9dfa0edf2e..a77b5c3944 100644
--- a/engines/sci/gui/gui_windowmgr.cpp
+++ b/engines/sci/graphics/gui_windowmgr.cpp
@@ -27,11 +27,11 @@
 
 #include "sci/sci.h"
 #include "sci/engine/state.h"
-#include "sci/gui/gui_screen.h"
-#include "sci/gui/gui_gfx.h"
-#include "sci/gui/gui_animate.h"
-#include "sci/gui/gui_text.h"
-#include "sci/gui/gui_windowmgr.h"
+#include "sci/graphics/gui_screen.h"
+#include "sci/graphics/gui_gfx.h"
+#include "sci/graphics/gui_animate.h"
+#include "sci/graphics/gui_text.h"
+#include "sci/graphics/gui_windowmgr.h"
 
 namespace Sci {
 
diff --git a/engines/sci/gui/gui_windowmgr.h b/engines/sci/graphics/gui_windowmgr.h
index 483df9efc5..483df9efc5 100644
--- a/engines/sci/gui/gui_windowmgr.h
+++ b/engines/sci/graphics/gui_windowmgr.h
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index f0cbe16476..db55ecca10 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -35,34 +35,34 @@ MODULE_OBJS := \
 	engine/static_selectors.o \
 	engine/state.o \
 	engine/vm.o \
-	gui/gui.o \
-	gui/gui_animate.o \
-	gui/gui_controls.o \
-	gui/gui_cursor.o \
-	gui/gui_font.o \
-	gui/gui_gfx.o \
-	gui/gui_menu.o \
-	gui/gui_palette.o \
-	gui/gui_picture.o \
-	gui/gui_portrait.o \
-	gui/gui_screen.o \
-	gui/gui_text.o \
-	gui/gui_transitions.o \
-	gui/gui_view.o \
-	gui/gui_windowmgr.o \
-	sfx/audio.o \
-	sfx/midiparser.o \
-	sfx/music.o \
-	sfx/soundcmd.o \
-	sfx/iterator/core.o \
-	sfx/iterator/iterator.o \
-	sfx/iterator/songlib.o \
-	sfx/seq/gm.o \
-	sfx/seq/instrument-map.o \
-	sfx/seq/map-mt32-to-gm.o \
-	sfx/softseq/adlib.o \
-	sfx/softseq/amiga.o \
-	sfx/softseq/pcjr.o \
+	graphics/gui.o \
+	graphics/gui_animate.o \
+	graphics/gui_controls.o \
+	graphics/gui_cursor.o \
+	graphics/gui_font.o \
+	graphics/gui_gfx.o \
+	graphics/gui_menu.o \
+	graphics/gui_palette.o \
+	graphics/gui_picture.o \
+	graphics/gui_portrait.o \
+	graphics/gui_screen.o \
+	graphics/gui_text.o \
+	graphics/gui_transitions.o \
+	graphics/gui_view.o \
+	graphics/gui_windowmgr.o \
+	sound/audio.o \
+	sound/midiparser.o \
+	sound/music.o \
+	sound/soundcmd.o \
+	sound/iterator/core.o \
+	sound/iterator/iterator.o \
+	sound/iterator/songlib.o \
+	sound/seq/gm.o \
+	sound/seq/instrument-map.o \
+	sound/seq/map-mt32-to-gm.o \
+	sound/softseq/adlib.o \
+	sound/softseq/amiga.o \
+	sound/softseq/pcjr.o \
 	video/seq_decoder.o \
 	video/vmd_decoder.o
 	
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index 0801957a8e..dac5c0a634 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -34,7 +34,7 @@
 #include "sound/audiostream.h"
 #include "sound/mixer.h"			// for SoundHandle
 
-#include "gui/gui_helpers.h"		// for ViewType
+#include "graphics/gui_helpers.h"		// for ViewType
 
 #include "sci/decompressor.h"
 #include "sci/sci.h"
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index a75fd27fb3..914ea52a1d 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -36,12 +36,12 @@
 #include "sci/engine/state.h"
 #include "sci/engine/kernel.h"
 
-#include "sci/sfx/audio.h"
-#include "sci/sfx/soundcmd.h"
-#include "sci/gui/gui.h"
-#include "sci/gui/gui_palette.h"
-#include "sci/gui/gui_cursor.h"
-#include "sci/gui/gui_screen.h"
+#include "sci/sound/audio.h"
+#include "sci/sound/soundcmd.h"
+#include "sci/graphics/gui.h"
+#include "sci/graphics/gui_palette.h"
+#include "sci/graphics/gui_cursor.h"
+#include "sci/graphics/gui_screen.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/audio.cpp b/engines/sci/sound/audio.cpp
index d2cb72fec1..801864265f 100644
--- a/engines/sci/sfx/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -26,7 +26,7 @@
 #include "sci/resource.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/seg_manager.h"
-#include "sci/sfx/audio.h"
+#include "sci/sound/audio.h"
 
 #include "common/system.h"
 
diff --git a/engines/sci/sfx/audio.h b/engines/sci/sound/audio.h
index f71cabc735..f71cabc735 100644
--- a/engines/sci/sfx/audio.h
+++ b/engines/sci/sound/audio.h
diff --git a/engines/sci/sfx/iterator/core.cpp b/engines/sci/sound/iterator/core.cpp
index bc90a555a6..89e4c7b14f 100644
--- a/engines/sci/sfx/iterator/core.cpp
+++ b/engines/sci/sound/iterator/core.cpp
@@ -28,11 +28,11 @@
 #include "sci/sci.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 
-#include "sci/sfx/iterator/core.h"
-#include "sci/sfx/iterator/iterator.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/iterator/core.h"
+#include "sci/sound/iterator/iterator.h"
+#include "sci/sound/softseq/mididriver.h"
 
-#include "sci/sfx/softseq/pcjr.h"
+#include "sci/sound/softseq/pcjr.h"
 
 #include "common/system.h"
 #include "common/timer.h"
diff --git a/engines/sci/sfx/iterator/core.h b/engines/sci/sound/iterator/core.h
index 944b3d0a0f..a44fe2ecae 100644
--- a/engines/sci/sfx/iterator/core.h
+++ b/engines/sci/sound/iterator/core.h
@@ -32,7 +32,7 @@
 #include "sci/sci.h"	// for USE_OLD_MUSIC_FUNCTIONS
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/songlib.h"
+#include "sci/sound/iterator/songlib.h"
 #include "sci/resource.h"
 
 namespace Sci {
diff --git a/engines/sci/sfx/iterator/iterator.cpp b/engines/sci/sound/iterator/iterator.cpp
index 924e1de0bc..3359d0155b 100644
--- a/engines/sci/sfx/iterator/iterator.cpp
+++ b/engines/sci/sound/iterator/iterator.cpp
@@ -30,9 +30,9 @@
 #include "sci/sci.h"
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 
-#include "sci/sfx/iterator/iterator_internal.h"
+#include "sci/sound/iterator/iterator_internal.h"
 #include "sci/engine/state.h"	// for sfx_player_tell_synth :/
-#include "sci/sfx/iterator/core.h"	// for sfx_player_tell_synth
+#include "sci/sound/iterator/core.h"	// for sfx_player_tell_synth
 
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
diff --git a/engines/sci/sfx/iterator/iterator.h b/engines/sci/sound/iterator/iterator.h
index ffd0679213..92a619d80e 100644
--- a/engines/sci/sfx/iterator/iterator.h
+++ b/engines/sci/sound/iterator/iterator.h
@@ -31,7 +31,7 @@
 #include "sci/sci.h"	// for USE_OLD_MUSIC_FUNCTIONS
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 
 namespace Audio {
 	class AudioStream;
diff --git a/engines/sci/sfx/iterator/iterator_internal.h b/engines/sci/sound/iterator/iterator_internal.h
index f41b388008..8eb35d7a40 100644
--- a/engines/sci/sfx/iterator/iterator_internal.h
+++ b/engines/sci/sound/iterator/iterator_internal.h
@@ -29,8 +29,8 @@
 #include "sci/sci.h"	// for USE_OLD_MUSIC_FUNCTIONS
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/iterator.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/iterator/iterator.h"
+#include "sci/sound/softseq/mididriver.h"
 
 #include "common/array.h"
 #include "common/list.h"
diff --git a/engines/sci/sfx/iterator/songlib.cpp b/engines/sci/sound/iterator/songlib.cpp
index b5ce9c34ac..8bc2e8f476 100644
--- a/engines/sci/sfx/iterator/songlib.cpp
+++ b/engines/sci/sound/iterator/songlib.cpp
@@ -26,8 +26,8 @@
 #include "sci/sci.h"	// for USE_OLD_MUSIC_FUNCTIONS
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/core.h"
-#include "sci/sfx/iterator/iterator.h"
+#include "sci/sound/iterator/core.h"
+#include "sci/sound/iterator/iterator.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/iterator/songlib.h b/engines/sci/sound/iterator/songlib.h
index acb704edaa..acb704edaa 100644
--- a/engines/sci/sfx/iterator/songlib.h
+++ b/engines/sci/sound/iterator/songlib.h
diff --git a/engines/sci/sfx/iterator/test-iterator.cpp b/engines/sci/sound/iterator/test-iterator.cpp
index 0d603a89fd..0d603a89fd 100644
--- a/engines/sci/sfx/iterator/test-iterator.cpp
+++ b/engines/sci/sound/iterator/test-iterator.cpp
diff --git a/engines/sci/sfx/midiparser.cpp b/engines/sci/sound/midiparser_sci.cpp
index 82b1c89a77..70421d7e15 100644
--- a/engines/sci/sfx/midiparser.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -25,8 +25,8 @@
 
 #include "sci/engine/kernel.h"
 #include "sci/engine/state.h"
-#include "sci/sfx/midiparser.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/midiparser_sci.h"
+#include "sci/sound/softseq/mididriver.h"
 
 namespace Sci {
 
@@ -142,7 +142,7 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
 		if (info.channel() == 0xF) {// SCI special
 			// Reference for some events:
 			// http://wiki.scummvm.org/index.php/SCI/Specifications/Sound/SCI0_Resource_Format#Status_Reference
-			// Also, sci/sfx/iterator/iterator.cpp, function BaseSongIterator::parseMidiCommand()
+			// Also, sci/sound/iterator/iterator.cpp, function BaseSongIterator::parseMidiCommand()
 			switch (info.basic.param1) {
 			case kSetReverb:
 				// TODO: Not implemented yet
diff --git a/engines/sci/sfx/midiparser.h b/engines/sci/sound/midiparser_sci.h
index 0eb2eb0bc1..a5b2074fbc 100644
--- a/engines/sci/sfx/midiparser.h
+++ b/engines/sci/sound/midiparser_sci.h
@@ -27,7 +27,7 @@
 #define SCI_MIDIPARSER_H
 
 #include "sci/resource.h"
-#include "sci/sfx/music.h"
+#include "sci/sound/music.h"
 #include "sound/midiparser.h"
 
 /*
diff --git a/engines/sci/sfx/music.cpp b/engines/sci/sound/music.cpp
index 30721f0531..fe8c0fed09 100644
--- a/engines/sci/sfx/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -31,9 +31,9 @@
 #include "sci/resource.h"
 #include "sci/engine/kernel.h"
 #include "sci/engine/state.h"
-#include "sci/sfx/midiparser.h"
-#include "sci/sfx/music.h"
-#include "sci/sfx/softseq/pcjr.h"
+#include "sci/sound/midiparser_sci.h"
+#include "sci/sound/music.h"
+#include "sci/sound/softseq/pcjr.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/music.h b/engines/sci/sound/music.h
index 0b7d880112..eaed0af64d 100644
--- a/engines/sci/sfx/music.h
+++ b/engines/sci/sound/music.h
@@ -37,7 +37,7 @@
 
 #include "sci/sci.h"
 #include "sci/resource.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/seq/gm.cpp b/engines/sci/sound/seq/gm.cpp
index 9e2a61db47..25f833915c 100644
--- a/engines/sci/sfx/seq/gm.cpp
+++ b/engines/sci/sound/seq/gm.cpp
@@ -25,8 +25,8 @@
 
 #include "common/util.h"
 
-#include "sci/sfx/seq/midiwriter.h"
-#include "sci/sfx/seq/instrument-map.h"
+#include "sci/sound/seq/midiwriter.h"
+#include "sci/sound/seq/instrument-map.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/seq/instrument-map.cpp b/engines/sci/sound/seq/instrument-map.cpp
index 7c13f7f78e..2f1fdb2532 100644
--- a/engines/sci/sfx/seq/instrument-map.cpp
+++ b/engines/sci/sound/seq/instrument-map.cpp
@@ -24,8 +24,8 @@
  */
 
 #include "common/scummsys.h"
-#include "sci/sfx/softseq/mididriver.h"
-#include "sci/sfx/seq/instrument-map.h"
+#include "sci/sound/softseq/mididriver.h"
+#include "sci/sound/seq/instrument-map.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/seq/instrument-map.h b/engines/sci/sound/seq/instrument-map.h
index e0c52ca735..8099dd39fd 100644
--- a/engines/sci/sfx/seq/instrument-map.h
+++ b/engines/sci/sound/seq/instrument-map.h
@@ -28,7 +28,7 @@
 #ifndef SCI_SFX_SEQ_INSTRUMENT_MAP_H
 #define SCI_SFX_SEQ_INSTRUMENT_MAP_H
 
-#include "sci/sfx/seq/midiwriter.h"
+#include "sci/sound/seq/midiwriter.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/seq/map-mt32-to-gm.cpp b/engines/sci/sound/seq/map-mt32-to-gm.cpp
index 269f6cb24f..6bd2c4f6c0 100644
--- a/engines/sci/sfx/seq/map-mt32-to-gm.cpp
+++ b/engines/sci/sound/seq/map-mt32-to-gm.cpp
@@ -26,7 +26,7 @@
 #include "common/scummsys.h"
 #include "sci/resource.h"
 #include "sci/engine/state.h"
-#include "sci/sfx/seq/instrument-map.h"
+#include "sci/sound/seq/instrument-map.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/seq/midiwriter.h b/engines/sci/sound/seq/midiwriter.h
index 24e432ffc4..24e432ffc4 100644
--- a/engines/sci/sfx/seq/midiwriter.h
+++ b/engines/sci/sound/seq/midiwriter.h
diff --git a/engines/sci/sfx/softseq/adlib.cpp b/engines/sci/sound/softseq/adlib.cpp
index 11802917a2..6f73b45650 100644
--- a/engines/sci/sfx/softseq/adlib.cpp
+++ b/engines/sci/sound/softseq/adlib.cpp
@@ -29,7 +29,7 @@
 #include "sound/softsynth/emumidi.h"
 
 #include "sci/resource.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/softseq/amiga.cpp b/engines/sci/sound/softseq/amiga.cpp
index d16e82fab5..452768901a 100644
--- a/engines/sci/sfx/softseq/amiga.cpp
+++ b/engines/sci/sound/softseq/amiga.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "sound/softsynth/emumidi.h"
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 
 #include "common/file.h"
 #include "common/frac.h"
diff --git a/engines/sci/sfx/softseq/mididriver.h b/engines/sci/sound/softseq/mididriver.h
index df0532d732..df0532d732 100644
--- a/engines/sci/sfx/softseq/mididriver.h
+++ b/engines/sci/sound/softseq/mididriver.h
diff --git a/engines/sci/sfx/softseq/pcjr.cpp b/engines/sci/sound/softseq/pcjr.cpp
index a80a188751..c7dd2f6528 100644
--- a/engines/sci/sfx/softseq/pcjr.cpp
+++ b/engines/sci/sound/softseq/pcjr.cpp
@@ -23,8 +23,8 @@
  *
  */
 
-#include "sci/sfx/softseq/mididriver.h"
-#include "sci/sfx/softseq/pcjr.h"
+#include "sci/sound/softseq/mididriver.h"
+#include "sci/sound/softseq/pcjr.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/softseq/pcjr.h b/engines/sci/sound/softseq/pcjr.h
index 60032817fd..e8b0b9f553 100644
--- a/engines/sci/sfx/softseq/pcjr.h
+++ b/engines/sci/sound/softseq/pcjr.h
@@ -23,7 +23,7 @@
  *
  */
 
-#include "sci/sfx/softseq/mididriver.h"
+#include "sci/sound/softseq/mididriver.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index f42ecc1099..06b87afdfd 100644
--- a/engines/sci/sfx/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -26,11 +26,11 @@
 #include "sci/sci.h"	// for USE_OLD_MUSIC_FUNCTIONS
 
 #ifdef USE_OLD_MUSIC_FUNCTIONS
-#include "sci/sfx/iterator/iterator.h"	// for SongIteratorStatus
+#include "sci/sound/iterator/iterator.h"	// for SongIteratorStatus
 #endif
 
-#include "sci/sfx/music.h"
-#include "sci/sfx/soundcmd.h"
+#include "sci/sound/music.h"
+#include "sci/sound/soundcmd.h"
 
 namespace Sci {
 
diff --git a/engines/sci/sfx/soundcmd.h b/engines/sci/sound/soundcmd.h
index 548dcf3889..548dcf3889 100644
--- a/engines/sci/sfx/soundcmd.h
+++ b/engines/sci/sound/soundcmd.h