diff --git a/fluidsynth/src/CMakeLists.txt b/fluidsynth/src/CMakeLists.txt
index 8db0acea..0e326451 100644
--- a/fluidsynth/src/CMakeLists.txt
+++ b/fluidsynth/src/CMakeLists.txt
@@ -22,6 +22,7 @@
 include_directories (
     ${CMAKE_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/src 
+    ${CMAKE_SOURCE_DIR}/src/synth
     ${CMAKE_SOURCE_DIR}/src/rvoice
     ${CMAKE_SOURCE_DIR}/src/datatypes
     ${CMAKE_SOURCE_DIR}/src/sfloader
@@ -107,12 +108,12 @@ endif ( MIDISHARE_SUPPORT )
 set ( libfluidsynth_SOURCES 
     fluid_adriver.c 
     fluid_adriver.h 
-    fluid_chan.c 
-    fluid_chan.h 
+    synth/fluid_chan.c 
+    synth/fluid_chan.h 
     fluid_chorus.c 
     fluid_chorus.h 
-    fluid_cmd.c 
-    fluid_cmd.h
+    bindings/fluid_cmd.c 
+    bindings/fluid_cmd.h
     fluid_conv.c 
     fluid_conv.h 
     sfloader/fluid_defsfont.c 
@@ -123,8 +124,8 @@ set ( libfluidsynth_SOURCES
     fluid_event.c 
     fluid_event_priv.h 
     fluid_event_queue.h 
-    fluid_gen.c 
-    fluid_gen.h 
+    synth/fluid_gen.c 
+    synth/fluid_gen.h 
     datatypes/fluid_hash.c 
     datatypes/fluid_hash.h 
     datatypes/fluid_list.c 
@@ -150,23 +151,23 @@ set ( libfluidsynth_SOURCES
     fluid_midi.h 
     fluid_midi_router.c 
     fluid_midi_router.h 
-    fluid_mod.c 
-    fluid_mod.h 
+    synth/fluid_mod.c 
+    synth/fluid_mod.h 
     fluid_rev.c 
     fluid_rev.h 
     fluid_seqbind.c 
     fluid_seq.c 
     fluid_settings.c 
     fluid_settings.h 
-    fluid_synth.c 
-    fluid_synth.h 
+    synth/fluid_synth.c 
+    synth/fluid_synth.h 
     fluidsynth_priv.h 
     fluid_sys.c 
     fluid_sys.h 
-    fluid_tuning.c 
-    fluid_tuning.h 
-    fluid_voice.c 
-    fluid_voice.h 
+    synth/fluid_tuning.c 
+    synth/fluid_tuning.h 
+    synth/fluid_voice.c 
+    synth/fluid_voice.h 
     bindings/fluid_filerenderer.c 
     drivers/fluid_aufile.c 
 ) 
diff --git a/fluidsynth/src/Makefile.am b/fluidsynth/src/Makefile.am
index 45e3bce8..ebfc9192 100644
--- a/fluidsynth/src/Makefile.am
+++ b/fluidsynth/src/Makefile.am
@@ -77,16 +77,16 @@ libfluidsynth_la_SOURCES = \
 	$(fluid_rtkit) \
 	fluid_adriver.c \
 	fluid_adriver.h \
-	fluid_chan.c \
-	fluid_chan.h \
+	synth/fluid_chan.c \
+	synth/fluid_chan.h \
 	fluid_chorus.c \
 	fluid_chorus.h \
-	fluid_cmd.c \
-	fluid_cmd.h \
+	bindings/fluid_cmd.c \
+	bindings/fluid_cmd.h \
 	fluid_conv.c \
 	fluid_conv.h \
-	fluid_defsfont.c \
-	fluid_defsfont.h \
+	sfloader/fluid_defsfont.c \
+	sfloader/fluid_defsfont.h \
 	fluid_dsp_float.c \
 	fluid_event.c \
 	fluid_event_priv.h \
@@ -108,27 +108,27 @@ libfluidsynth_la_SOURCES = \
 	fluid_midi_router.c \
 	fluid_midi_router.h \
         drivers/fluid_midishare.c \
-	fluid_mod.c \
-	fluid_mod.h \
+	synth/fluid_mod.c \
+	synth/fluid_mod.h \
 	rvoice/fluid_phase.h \
-	fluid_ramsfont.c \
-	fluid_ramsfont.h \
+	sfloader/fluid_ramsfont.c \
+	sfloader/fluid_ramsfont.h \
 	fluid_rev.c \
 	fluid_rev.h \
 	fluid_seqbind.c \
 	fluid_seq.c \
 	fluid_settings.c \
 	fluid_settings.h \
-	fluid_sfont.h \
-	fluid_synth.c \
-	fluid_synth.h \
+	sfloader/fluid_sfont.h \
+	synth/fluid_synth.c \
+	synth/fluid_synth.h \
 	fluidsynth_priv.h \
 	fluid_sys.c \
 	fluid_sys.h \
-	fluid_tuning.c \
-	fluid_tuning.h \
-	fluid_voice.c \
-	fluid_voice.h \
+	synth/fluid_tuning.c \
+	synth/fluid_tuning.h \
+	synth/fluid_voice.c \
+	synth/fluid_voice.h \
 	rvoice/fluid_iir_filter.c \
 	rvoice/fluid_iir_filter.h \
 	rvoice/fluid_adsr_env.h \
@@ -137,7 +137,8 @@ libfluidsynth_la_SOURCES = \
 	drivers/fluid_aufile.c 
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/rvoice \
-  -I$(top_srcdir)/src/datatypes -I$(top_srcdir)/src/bindings/ \
+  -I$(top_srcdir)/src/datatypes -I$(top_srcdir)/src/bindings \
+  -I$(top_srcdir)/src/synth \
   $(LASH_CFLAGS) $(LADCCA_CFLAGS) \
   $(READLINE_CFLAGS) $(JACK_CFLAGS) $(ALSA_CFLAGS) $(PULSE_CFLAGS) \
   $(PORTAUDIO_CFLAGS) $(DART_CFLAGS) $(GLIB_CFLAGS) $(LIBSNDFILE_CFLAGS) \
diff --git a/fluidsynth/src/fluid_cmd.c b/fluidsynth/src/bindings/fluid_cmd.c
similarity index 100%
rename from fluidsynth/src/fluid_cmd.c
rename to fluidsynth/src/bindings/fluid_cmd.c
diff --git a/fluidsynth/src/fluid_cmd.h b/fluidsynth/src/bindings/fluid_cmd.h
similarity index 100%
rename from fluidsynth/src/fluid_cmd.h
rename to fluidsynth/src/bindings/fluid_cmd.h
diff --git a/fluidsynth/src/fluid_chan.c b/fluidsynth/src/synth/fluid_chan.c
similarity index 100%
rename from fluidsynth/src/fluid_chan.c
rename to fluidsynth/src/synth/fluid_chan.c
diff --git a/fluidsynth/src/fluid_chan.h b/fluidsynth/src/synth/fluid_chan.h
similarity index 100%
rename from fluidsynth/src/fluid_chan.h
rename to fluidsynth/src/synth/fluid_chan.h
diff --git a/fluidsynth/src/fluid_gen.c b/fluidsynth/src/synth/fluid_gen.c
similarity index 100%
rename from fluidsynth/src/fluid_gen.c
rename to fluidsynth/src/synth/fluid_gen.c
diff --git a/fluidsynth/src/fluid_gen.h b/fluidsynth/src/synth/fluid_gen.h
similarity index 100%
rename from fluidsynth/src/fluid_gen.h
rename to fluidsynth/src/synth/fluid_gen.h
diff --git a/fluidsynth/src/fluid_mod.c b/fluidsynth/src/synth/fluid_mod.c
similarity index 100%
rename from fluidsynth/src/fluid_mod.c
rename to fluidsynth/src/synth/fluid_mod.c
diff --git a/fluidsynth/src/fluid_mod.h b/fluidsynth/src/synth/fluid_mod.h
similarity index 100%
rename from fluidsynth/src/fluid_mod.h
rename to fluidsynth/src/synth/fluid_mod.h
diff --git a/fluidsynth/src/fluid_synth.c b/fluidsynth/src/synth/fluid_synth.c
similarity index 100%
rename from fluidsynth/src/fluid_synth.c
rename to fluidsynth/src/synth/fluid_synth.c
diff --git a/fluidsynth/src/fluid_synth.h b/fluidsynth/src/synth/fluid_synth.h
similarity index 100%
rename from fluidsynth/src/fluid_synth.h
rename to fluidsynth/src/synth/fluid_synth.h
diff --git a/fluidsynth/src/fluid_tuning.c b/fluidsynth/src/synth/fluid_tuning.c
similarity index 100%
rename from fluidsynth/src/fluid_tuning.c
rename to fluidsynth/src/synth/fluid_tuning.c
diff --git a/fluidsynth/src/fluid_tuning.h b/fluidsynth/src/synth/fluid_tuning.h
similarity index 100%
rename from fluidsynth/src/fluid_tuning.h
rename to fluidsynth/src/synth/fluid_tuning.h
diff --git a/fluidsynth/src/fluid_voice.c b/fluidsynth/src/synth/fluid_voice.c
similarity index 100%
rename from fluidsynth/src/fluid_voice.c
rename to fluidsynth/src/synth/fluid_voice.c
diff --git a/fluidsynth/src/fluid_voice.h b/fluidsynth/src/synth/fluid_voice.h
similarity index 100%
rename from fluidsynth/src/fluid_voice.h
rename to fluidsynth/src/synth/fluid_voice.h