diff --git a/fluidsynth/src/CMakeLists.txt b/fluidsynth/src/CMakeLists.txt
index ce5a0168..e45bf1fe 100644
--- a/fluidsynth/src/CMakeLists.txt
+++ b/fluidsynth/src/CMakeLists.txt
@@ -20,7 +20,9 @@
 # CMake based build system. Pedro Lopez-Cabanillas <plcl@users.sf.net>
 
 include_directories (
-    ${CMAKE_BINARY_DIR} 
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/src 
+    ${CMAKE_SOURCE_DIR}/src/rvoice
     ${CMAKE_SOURCE_DIR}/include 
     ${CMAKE_BINARY_DIR}/include 
     ${PTHREADS_INCLUDE_DIR}
@@ -35,39 +37,39 @@ if ( READLINE_SUPPORT )
 endif ( READLINE_SUPPORT )
  
 if ( PULSE_SUPPORT ) 
-  set ( fluid_pulse_SOURCES fluid_pulse.c )
+  set ( fluid_pulse_SOURCES drivers/fluid_pulse.c )
   include_directories ( ${PULSE_INCLUDEDIR} ${PULSE_INCLUDE_DIRS} )
 endif ( PULSE_SUPPORT )
 
 if ( ALSA_SUPPORT )
-  set ( fluid_alsa_SOURCES fluid_alsa.c )
+  set ( fluid_alsa_SOURCES drivers/fluid_alsa.c )
   include_directories ( ${ALSA_INCLUDEDIR} ${ALSA_INCLUDE_DIRS} )
 endif ( ALSA_SUPPORT )
 
 if ( COREAUDIO_SUPPORT )
-  set ( fluid_coreaudio_SOURCES fluid_coreaudio.c )
+  set ( fluid_coreaudio_SOURCES drivers/fluid_coreaudio.c )
 endif ( COREAUDIO_SUPPORT )
 
 if ( COREMIDI_SUPPORT )
-  set ( fluid_coremidi_SOURCES fluid_coremidi.c )
+  set ( fluid_coremidi_SOURCES drivers/fluid_coremidi.c )
 endif ( COREMIDI_SUPPORT )
 
 if ( JACK_SUPPORT )
-  set ( fluid_jack_SOURCES fluid_jack.c )
+  set ( fluid_jack_SOURCES drivers/fluid_jack.c )
   include_directories ( ${JACK_INCLUDEDIR} ${JACK_INCLUDE_DIRS} ) 
 endif ( JACK_SUPPORT )
 
 if ( PORTAUDIO_SUPPORT )
-  set ( fluid_portaudio_SOURCES fluid_portaudio.c )
+  set ( fluid_portaudio_SOURCES drivers/fluid_portaudio.c )
   include_directories ( ${PORTAUDIO_INCLUDEDIR} ${PORTAUDIO_INCLUDE_DIRS} )
 endif ( PORTAUDIO_SUPPORT )
 
 if ( WINDOWS_SUPPORT )
-  set ( fluid_windows_SOURCES fluid_dll.c fluid_dsound.c fluid_winmidi.c )
+  set ( fluid_windows_SOURCES fluid_dll.c drivers/fluid_dsound.c drivers/fluid_winmidi.c )
 endif ( WINDOWS_SUPPORT )
 
 if ( OSS_SUPPORT )
-  set ( fluid_oss_SOURCES fluid_oss.c )
+  set ( fluid_oss_SOURCES drivers/fluid_oss.c )
 endif ( OSS_SUPPORT )
 
 if ( LASH_SUPPORT OR LADCCA_SUPPORT )
@@ -77,7 +79,7 @@ if ( LASH_SUPPORT OR LADCCA_SUPPORT )
 endif ( LASH_SUPPORT OR LADCCA_SUPPORT )
 
 if ( DART_SUPPORT )
-  set ( fluid_dart_SOURCES fluid_dart.c )
+  set ( fluid_dart_SOURCES drivers/fluid_dart.c )
   include_directories ( ${DART_INCLUDE_DIRS} ) 
 endif ( DART_SUPPORT )
 
@@ -90,7 +92,7 @@ if ( LADSPA_SUPPORT )
 endif ( LADSPA_SUPPORT )
 
 if ( MIDISHARE_SUPPORT )
-  set ( fluid_midishare_SOURCES fluid_midishare.c )
+  set ( fluid_midishare_SOURCES drivers/fluid_midishare.c )
   include_directories ( ${MidiShare_INCLUDE_DIRS} )
 endif ( MIDISHARE_SUPPORT )
 
@@ -116,6 +118,10 @@ set ( libfluidsynth_SOURCES
     fluid_gen.h 
     fluid_hash.c 
     fluid_hash.h 
+    rvoice/fluid_iir_filter.c
+    rvoice/fluid_iir_filter.h
+    rvoice/fluid_lfo.h
+    rvoice/fluid_adsr_env.h
     fluid_list.c 
     fluid_list.h 
     fluid_mdriver.c 
@@ -146,7 +152,7 @@ set ( libfluidsynth_SOURCES
     fluid_voice.c 
     fluid_voice.h 
     fluid_filerenderer.c 
-    fluid_aufile.c 
+    drivers/fluid_aufile.c 
 ) 
 
 link_directories (
diff --git a/fluidsynth/src/Makefile.am b/fluidsynth/src/Makefile.am
index 72b2d68c..e8f604ae 100644
--- a/fluidsynth/src/Makefile.am
+++ b/fluidsynth/src/Makefile.am
@@ -1,20 +1,23 @@
 ## Process this file with automake to produce Makefile.in
 
-if PULSE_SUPPORT
-fluid_pulse = fluid_pulse.c
-endif
+AUTOMAKE_OPTIONS = subdir-objects
 
 # Tests for optional drivers
+
+if PULSE_SUPPORT
+fluid_pulse = drivers/fluid_pulse.c
+endif
+
 if ALSA_SUPPORT
-fluid_alsa = fluid_alsa.c
+fluid_alsa = drivers/fluid_alsa.c
 endif
 
 if COREAUDIO_SUPPORT
-fluid_coreaudio = fluid_coreaudio.c
+fluid_coreaudio = drivers/fluid_coreaudio.c
 endif
 
 if COREMIDI_SUPPORT
-fluid_coremidi = fluid_coremidi.c
+fluid_coremidi = drivers/fluid_coremidi.c
 endif
 
 if DBUS_SUPPORT
@@ -22,19 +25,19 @@ fluid_rtkit = fluid_rtkit.c
 endif
 
 if JACK_SUPPORT
-fluid_jack = fluid_jack.c
+fluid_jack = drivers/fluid_jack.c
 endif
 
 if PORTAUDIO_SUPPORT
-fluid_portaudio = fluid_portaudio.c
+fluid_portaudio = drivers/fluid_portaudio.c
 endif
 
 if MINGW32_SUPPORT
-fluid_windows = fluid_dll.c fluid_dsound.c fluid_winmidi.c
+fluid_windows = fluid_dll.c drivers/fluid_dsound.c drivers/fluid_winmidi.c
 endif
 
 if OSS_SUPPORT
-fluid_oss = fluid_oss.c
+fluid_oss = drivers/fluid_oss.c
 endif
 
 # if LASH_SUPPORT || LADCCA_SUPPORT (Makefile supports OR?)
@@ -47,15 +50,15 @@ endif
 endif
 
 if DART_SUPPORT
-fluid_dart = fluid_dart.c
+fluid_dart = drivers/fluid_dart.c
 endif
 
 # Extra files and optional drivers
-EXTRA_DIST = fluid_dll.c fluid_dsound.c fluid_winmidi.c fluid_portaudio.c \
-	fluid_coreaudio.c fluid_alsa.c fluid_oss.c fluid_pulse.c \
+EXTRA_DIST = fluid_dll.c drivers/fluid_dsound.c drivers/fluid_winmidi.c drivers/fluid_portaudio.c \
+	drivers/fluid_coreaudio.c drivers/fluid_alsa.c drivers/fluid_oss.c drivers/fluid_pulse.c \
 	fluid_dsp_simple.c \
-	fluid_sndmgr.c config_macos.h config_macosx.h config_macosx_pb.h \
-	config_win32.h fluid_jack.c fluid_dart.c
+	drivers/fluid_sndmgr.c config_macos.h config_macosx.h config_macosx_pb.h \
+	config_win32.h drivers/fluid_jack.c drivers/fluid_dart.c
 
 lib_LTLIBRARIES = libfluidsynth.la
 bin_PROGRAMS = fluidsynth 
@@ -104,7 +107,7 @@ libfluidsynth_la_SOURCES = \
 	fluid_midi.h \
 	fluid_midi_router.c \
 	fluid_midi_router.h \
-	fluid_midishare.c \
+        drivers/fluid_midishare.c \
 	fluid_mod.c \
 	fluid_mod.h \
 	fluid_phase.h \
@@ -126,14 +129,15 @@ libfluidsynth_la_SOURCES = \
 	fluid_tuning.h \
 	fluid_voice.c \
 	fluid_voice.h \
-	fluid_iir_filter.c \
-	fluid_iir_filter.h \
-	fluid_adsr_env.h \
-        fluid_lfo.h \
+	rvoice/fluid_iir_filter.c \
+	rvoice/fluid_iir_filter.h \
+	rvoice/fluid_adsr_env.h \
+	rvoice/fluid_lfo.h \
 	fluid_filerenderer.c \
-	fluid_aufile.c 
+	drivers/fluid_aufile.c 
 
-INCLUDES = -I$(top_srcdir)/include $(LASH_CFLAGS) $(LADCCA_CFLAGS) \
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/rvoice \
+  $(LASH_CFLAGS) $(LADCCA_CFLAGS) \
   $(READLINE_CFLAGS) $(JACK_CFLAGS) $(ALSA_CFLAGS) $(PULSE_CFLAGS) \
   $(PORTAUDIO_CFLAGS) $(DART_CFLAGS) $(GLIB_CFLAGS) $(LIBSNDFILE_CFLAGS) \
   $(DBUS_CFLAGS)
diff --git a/fluidsynth/src/fluid_alsa.c b/fluidsynth/src/drivers/fluid_alsa.c
similarity index 100%
rename from fluidsynth/src/fluid_alsa.c
rename to fluidsynth/src/drivers/fluid_alsa.c
diff --git a/fluidsynth/src/fluid_aufile.c b/fluidsynth/src/drivers/fluid_aufile.c
similarity index 100%
rename from fluidsynth/src/fluid_aufile.c
rename to fluidsynth/src/drivers/fluid_aufile.c
diff --git a/fluidsynth/src/fluid_coreaudio.c b/fluidsynth/src/drivers/fluid_coreaudio.c
similarity index 100%
rename from fluidsynth/src/fluid_coreaudio.c
rename to fluidsynth/src/drivers/fluid_coreaudio.c
diff --git a/fluidsynth/src/fluid_coremidi.c b/fluidsynth/src/drivers/fluid_coremidi.c
similarity index 100%
rename from fluidsynth/src/fluid_coremidi.c
rename to fluidsynth/src/drivers/fluid_coremidi.c
diff --git a/fluidsynth/src/fluid_dart.c b/fluidsynth/src/drivers/fluid_dart.c
similarity index 100%
rename from fluidsynth/src/fluid_dart.c
rename to fluidsynth/src/drivers/fluid_dart.c
diff --git a/fluidsynth/src/fluid_dsound.c b/fluidsynth/src/drivers/fluid_dsound.c
similarity index 100%
rename from fluidsynth/src/fluid_dsound.c
rename to fluidsynth/src/drivers/fluid_dsound.c
diff --git a/fluidsynth/src/fluid_jack.c b/fluidsynth/src/drivers/fluid_jack.c
similarity index 100%
rename from fluidsynth/src/fluid_jack.c
rename to fluidsynth/src/drivers/fluid_jack.c
diff --git a/fluidsynth/src/fluid_midishare.c b/fluidsynth/src/drivers/fluid_midishare.c
similarity index 100%
rename from fluidsynth/src/fluid_midishare.c
rename to fluidsynth/src/drivers/fluid_midishare.c
diff --git a/fluidsynth/src/fluid_oss.c b/fluidsynth/src/drivers/fluid_oss.c
similarity index 100%
rename from fluidsynth/src/fluid_oss.c
rename to fluidsynth/src/drivers/fluid_oss.c
diff --git a/fluidsynth/src/fluid_portaudio.c b/fluidsynth/src/drivers/fluid_portaudio.c
similarity index 100%
rename from fluidsynth/src/fluid_portaudio.c
rename to fluidsynth/src/drivers/fluid_portaudio.c
diff --git a/fluidsynth/src/fluid_pulse.c b/fluidsynth/src/drivers/fluid_pulse.c
similarity index 100%
rename from fluidsynth/src/fluid_pulse.c
rename to fluidsynth/src/drivers/fluid_pulse.c
diff --git a/fluidsynth/src/fluid_sndmgr.c b/fluidsynth/src/drivers/fluid_sndmgr.c
similarity index 100%
rename from fluidsynth/src/fluid_sndmgr.c
rename to fluidsynth/src/drivers/fluid_sndmgr.c
diff --git a/fluidsynth/src/fluid_winmidi.c b/fluidsynth/src/drivers/fluid_winmidi.c
similarity index 100%
rename from fluidsynth/src/fluid_winmidi.c
rename to fluidsynth/src/drivers/fluid_winmidi.c
diff --git a/fluidsynth/src/fluid_adsr_env.h b/fluidsynth/src/rvoice/fluid_adsr_env.h
similarity index 100%
rename from fluidsynth/src/fluid_adsr_env.h
rename to fluidsynth/src/rvoice/fluid_adsr_env.h
diff --git a/fluidsynth/src/fluid_iir_filter.c b/fluidsynth/src/rvoice/fluid_iir_filter.c
similarity index 100%
rename from fluidsynth/src/fluid_iir_filter.c
rename to fluidsynth/src/rvoice/fluid_iir_filter.c
diff --git a/fluidsynth/src/fluid_iir_filter.h b/fluidsynth/src/rvoice/fluid_iir_filter.h
similarity index 100%
rename from fluidsynth/src/fluid_iir_filter.h
rename to fluidsynth/src/rvoice/fluid_iir_filter.h
diff --git a/fluidsynth/src/fluid_lfo.h b/fluidsynth/src/rvoice/fluid_lfo.h
similarity index 100%
rename from fluidsynth/src/fluid_lfo.h
rename to fluidsynth/src/rvoice/fluid_lfo.h