diff --git a/fluidsynth/src/CMakeLists.txt b/fluidsynth/src/CMakeLists.txt
index aff6d6fd..7eea99bc 100644
--- a/fluidsynth/src/CMakeLists.txt
+++ b/fluidsynth/src/CMakeLists.txt
@@ -24,6 +24,8 @@ include_directories (
     ${CMAKE_SOURCE_DIR}/src 
     ${CMAKE_SOURCE_DIR}/src/rvoice
     ${CMAKE_SOURCE_DIR}/src/datatypes
+    ${CMAKE_SOURCE_DIR}/src/sfloader
+    ${CMAKE_SOURCE_DIR}/src/bindings
     ${CMAKE_SOURCE_DIR}/include 
     ${CMAKE_BINARY_DIR}/include 
     ${PTHREADS_INCLUDE_DIR}
@@ -56,7 +58,7 @@ if ( COREMIDI_SUPPORT )
 endif ( COREMIDI_SUPPORT )
 
 if ( DBUS_SUPPORT )
-  set ( fluid_dbus_SOURCES fluid_rtkit.c fluid_rtkit.h )
+  set ( fluid_dbus_SOURCES bindings/fluid_rtkit.c bindings/fluid_rtkit.h )
   include_directories ( ${DBUS_INCLUDEDIR} ${DBUS_INCLUDE_DIRS} )
 endif ( DBUS_SUPPORT )
 
@@ -79,7 +81,7 @@ if ( OSS_SUPPORT )
 endif ( OSS_SUPPORT )
 
 if ( LASH_SUPPORT OR LADCCA_SUPPORT )
-  set ( fluid_lash_SOURCES fluid_lash.c fluid_lash.h )
+  set ( fluid_lash_SOURCES bindings/fluid_lash.c bindings/fluid_lash.h )
   include_directories ( ${LASH_INCLUDEDIR} ${LADCCA_INCLUDEDIR} 
                         ${LASH_INCLUDE_DIRS} ${LADCCA_INCLUDE_DIRS} )
 endif ( LASH_SUPPORT OR LADCCA_SUPPORT )
@@ -94,7 +96,7 @@ if ( LIBSNDFILE_SUPPORT )
 endif ( LIBSNDFILE_SUPPORT )
 
 if ( LADSPA_SUPPORT )
-  set ( fluid_ladspa_SOURCES fluid_ladspa.c fluid_ladspa.h )
+  set ( fluid_ladspa_SOURCES bindings/fluid_ladspa.c bindings/fluid_ladspa.h )
 endif ( LADSPA_SUPPORT )
 
 if ( MIDISHARE_SUPPORT )
@@ -113,8 +115,11 @@ set ( libfluidsynth_SOURCES
     fluid_cmd.h
     fluid_conv.c 
     fluid_conv.h 
-    fluid_defsfont.c 
-    fluid_defsfont.h 
+    sfloader/fluid_defsfont.c 
+    sfloader/fluid_defsfont.h 
+    sfloader/fluid_ramsfont.c 
+    sfloader/fluid_ramsfont.h 
+    sfloader/fluid_sfont.h 
     fluid_event.c 
     fluid_event_priv.h 
     fluid_event_queue.c 
@@ -141,15 +146,12 @@ set ( libfluidsynth_SOURCES
     fluid_midi_router.h 
     fluid_mod.c 
     fluid_mod.h 
-    fluid_ramsfont.c 
-    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 
     fluidsynth_priv.h 
@@ -159,7 +161,7 @@ set ( libfluidsynth_SOURCES
     fluid_tuning.h 
     fluid_voice.c 
     fluid_voice.h 
-    fluid_filerenderer.c 
+    bindings/fluid_filerenderer.c 
     drivers/fluid_aufile.c 
 ) 
 
diff --git a/fluidsynth/src/Makefile.am b/fluidsynth/src/Makefile.am
index d1074974..45e3bce8 100644
--- a/fluidsynth/src/Makefile.am
+++ b/fluidsynth/src/Makefile.am
@@ -21,7 +21,7 @@ fluid_coremidi = drivers/fluid_coremidi.c
 endif
 
 if DBUS_SUPPORT
-fluid_rtkit = fluid_rtkit.c
+fluid_rtkit = bindings/fluid_rtkit.c
 endif
 
 if JACK_SUPPORT
@@ -42,10 +42,10 @@ endif
 
 # if LASH_SUPPORT || LADCCA_SUPPORT (Makefile supports OR?)
 if LASH_SUPPORT
-fluid_lash = fluid_lash.c
+fluid_lash = bindings/fluid_lash.c
 else
 if LADCCA_SUPPORT
-fluid_lash = fluid_lash.c
+fluid_lash = bindings/fluid_lash.c
 endif
 endif
 
@@ -96,8 +96,8 @@ libfluidsynth_la_SOURCES = \
 	fluid_gen.h \
 	datatypes/fluid_hash.c \
 	datatypes/fluid_hash.h \
-	fluid_ladspa.c \
-	fluid_ladspa.h \
+	bindings/fluid_ladspa.c \
+	bindings/fluid_ladspa.h \
 	fluid_lash.h \
 	datatypes/fluid_list.c \
 	datatypes/fluid_list.h \
@@ -133,11 +133,11 @@ libfluidsynth_la_SOURCES = \
 	rvoice/fluid_iir_filter.h \
 	rvoice/fluid_adsr_env.h \
 	rvoice/fluid_lfo.h \
-	fluid_filerenderer.c \
+	bindings/fluid_filerenderer.c \
 	drivers/fluid_aufile.c 
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/rvoice \
-  -I$(top_srcdir)/src/datatypes \
+  -I$(top_srcdir)/src/datatypes -I$(top_srcdir)/src/bindings/ \
   $(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_filerenderer.c b/fluidsynth/src/bindings/fluid_filerenderer.c
similarity index 100%
rename from fluidsynth/src/fluid_filerenderer.c
rename to fluidsynth/src/bindings/fluid_filerenderer.c
diff --git a/fluidsynth/src/fluid_ladspa.c b/fluidsynth/src/bindings/fluid_ladspa.c
similarity index 100%
rename from fluidsynth/src/fluid_ladspa.c
rename to fluidsynth/src/bindings/fluid_ladspa.c
diff --git a/fluidsynth/src/fluid_ladspa.h b/fluidsynth/src/bindings/fluid_ladspa.h
similarity index 100%
rename from fluidsynth/src/fluid_ladspa.h
rename to fluidsynth/src/bindings/fluid_ladspa.h
diff --git a/fluidsynth/src/fluid_lash.c b/fluidsynth/src/bindings/fluid_lash.c
similarity index 100%
rename from fluidsynth/src/fluid_lash.c
rename to fluidsynth/src/bindings/fluid_lash.c
diff --git a/fluidsynth/src/fluid_lash.h b/fluidsynth/src/bindings/fluid_lash.h
similarity index 100%
rename from fluidsynth/src/fluid_lash.h
rename to fluidsynth/src/bindings/fluid_lash.h
diff --git a/fluidsynth/src/fluid_rtkit.c b/fluidsynth/src/bindings/fluid_rtkit.c
similarity index 100%
rename from fluidsynth/src/fluid_rtkit.c
rename to fluidsynth/src/bindings/fluid_rtkit.c
diff --git a/fluidsynth/src/fluid_rtkit.h b/fluidsynth/src/bindings/fluid_rtkit.h
similarity index 100%
rename from fluidsynth/src/fluid_rtkit.h
rename to fluidsynth/src/bindings/fluid_rtkit.h
diff --git a/fluidsynth/src/fluid_defsfont.c b/fluidsynth/src/sfloader/fluid_defsfont.c
similarity index 100%
rename from fluidsynth/src/fluid_defsfont.c
rename to fluidsynth/src/sfloader/fluid_defsfont.c
diff --git a/fluidsynth/src/fluid_defsfont.h b/fluidsynth/src/sfloader/fluid_defsfont.h
similarity index 100%
rename from fluidsynth/src/fluid_defsfont.h
rename to fluidsynth/src/sfloader/fluid_defsfont.h
diff --git a/fluidsynth/src/fluid_ramsfont.c b/fluidsynth/src/sfloader/fluid_ramsfont.c
similarity index 100%
rename from fluidsynth/src/fluid_ramsfont.c
rename to fluidsynth/src/sfloader/fluid_ramsfont.c
diff --git a/fluidsynth/src/fluid_ramsfont.h b/fluidsynth/src/sfloader/fluid_ramsfont.h
similarity index 100%
rename from fluidsynth/src/fluid_ramsfont.h
rename to fluidsynth/src/sfloader/fluid_ramsfont.h
diff --git a/fluidsynth/src/fluid_sfont.h b/fluidsynth/src/sfloader/fluid_sfont.h
similarity index 100%
rename from fluidsynth/src/fluid_sfont.h
rename to fluidsynth/src/sfloader/fluid_sfont.h