diff --git a/grauph/src/clients/patches/303.om b/grauph/patches/303.om
similarity index 100%
rename from grauph/src/clients/patches/303.om
rename to grauph/patches/303.om
diff --git a/grauph/src/clients/patches/COPYING b/grauph/patches/COPYING
similarity index 100%
rename from grauph/src/clients/patches/COPYING
rename to grauph/patches/COPYING
diff --git a/grauph/src/clients/patches/Makefile.am b/grauph/patches/Makefile.am
similarity index 100%
rename from grauph/src/clients/patches/Makefile.am
rename to grauph/patches/Makefile.am
diff --git a/grauph/src/clients/patches/OLDpatches/808snare3.om b/grauph/patches/OLDpatches/808snare3.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/808snare3.om
rename to grauph/patches/OLDpatches/808snare3.om
diff --git a/grauph/src/clients/patches/OLDpatches/808snare3.om.xml b/grauph/patches/OLDpatches/808snare3.om.xml
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/808snare3.om.xml
rename to grauph/patches/OLDpatches/808snare3.om.xml
diff --git a/grauph/src/clients/patches/OLDpatches/benassi.om b/grauph/patches/OLDpatches/benassi.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/benassi.om
rename to grauph/patches/OLDpatches/benassi.om
diff --git a/grauph/src/clients/patches/OLDpatches/connectiontest.om b/grauph/patches/OLDpatches/connectiontest.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/connectiontest.om
rename to grauph/patches/OLDpatches/connectiontest.om
diff --git a/grauph/src/clients/patches/OLDpatches/connectiontest.om.xml b/grauph/patches/OLDpatches/connectiontest.om.xml
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/connectiontest.om.xml
rename to grauph/patches/OLDpatches/connectiontest.om.xml
diff --git a/grauph/src/clients/patches/OLDpatches/drum-test.om b/grauph/patches/OLDpatches/drum-test.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/drum-test.om
rename to grauph/patches/OLDpatches/drum-test.om
diff --git a/grauph/src/clients/patches/OLDpatches/drum-test.om.xml b/grauph/patches/OLDpatches/drum-test.om.xml
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/drum-test.om.xml
rename to grauph/patches/OLDpatches/drum-test.om.xml
diff --git a/grauph/src/clients/patches/OLDpatches/foo.om b/grauph/patches/OLDpatches/foo.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/foo.om
rename to grauph/patches/OLDpatches/foo.om
diff --git a/grauph/src/clients/patches/OLDpatches/foo.om.xml b/grauph/patches/OLDpatches/foo.om.xml
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/foo.om.xml
rename to grauph/patches/OLDpatches/foo.om.xml
diff --git a/grauph/src/clients/patches/OLDpatches/fractal_filter.om b/grauph/patches/OLDpatches/fractal_filter.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/fractal_filter.om
rename to grauph/patches/OLDpatches/fractal_filter.om
diff --git a/grauph/src/clients/patches/OLDpatches/fractal_filter_2.om b/grauph/patches/OLDpatches/fractal_filter_2.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/fractal_filter_2.om
rename to grauph/patches/OLDpatches/fractal_filter_2.om
diff --git a/grauph/src/clients/patches/OLDpatches/kick.om b/grauph/patches/OLDpatches/kick.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/kick.om
rename to grauph/patches/OLDpatches/kick.om
diff --git a/grauph/src/clients/patches/OLDpatches/kick.om.xml b/grauph/patches/OLDpatches/kick.om.xml
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/kick.om.xml
rename to grauph/patches/OLDpatches/kick.om.xml
diff --git a/grauph/src/clients/patches/OLDpatches/midi_binding_test.om b/grauph/patches/OLDpatches/midi_binding_test.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/midi_binding_test.om
rename to grauph/patches/OLDpatches/midi_binding_test.om
diff --git a/grauph/src/clients/patches/OLDpatches/miditest.om b/grauph/patches/OLDpatches/miditest.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/miditest.om
rename to grauph/patches/OLDpatches/miditest.om
diff --git a/grauph/src/clients/patches/OLDpatches/monomidi.om b/grauph/patches/OLDpatches/monomidi.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/monomidi.om
rename to grauph/patches/OLDpatches/monomidi.om
diff --git a/grauph/src/clients/patches/OLDpatches/new-controller.om b/grauph/patches/OLDpatches/new-controller.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/new-controller.om
rename to grauph/patches/OLDpatches/new-controller.om
diff --git a/grauph/src/clients/patches/OLDpatches/noise.om b/grauph/patches/OLDpatches/noise.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/noise.om
rename to grauph/patches/OLDpatches/noise.om
diff --git a/grauph/src/clients/patches/OLDpatches/oscillator.om b/grauph/patches/OLDpatches/oscillator.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/oscillator.om
rename to grauph/patches/OLDpatches/oscillator.om
diff --git a/grauph/src/clients/patches/OLDpatches/overcompress.om b/grauph/patches/OLDpatches/overcompress.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/overcompress.om
rename to grauph/patches/OLDpatches/overcompress.om
diff --git a/grauph/src/clients/patches/OLDpatches/poly-oscillator.om b/grauph/patches/OLDpatches/poly-oscillator.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/poly-oscillator.om
rename to grauph/patches/OLDpatches/poly-oscillator.om
diff --git a/grauph/src/clients/patches/OLDpatches/polymidi.om b/grauph/patches/OLDpatches/polymidi.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/polymidi.om
rename to grauph/patches/OLDpatches/polymidi.om
diff --git a/grauph/src/clients/patches/OLDpatches/polytest.om b/grauph/patches/OLDpatches/polytest.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/polytest.om
rename to grauph/patches/OLDpatches/polytest.om
diff --git a/grauph/src/clients/patches/OLDpatches/simple_midi_binding_test.om b/grauph/patches/OLDpatches/simple_midi_binding_test.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/simple_midi_binding_test.om
rename to grauph/patches/OLDpatches/simple_midi_binding_test.om
diff --git a/grauph/src/clients/patches/OLDpatches/simplemonosynth.om b/grauph/patches/OLDpatches/simplemonosynth.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/simplemonosynth.om
rename to grauph/patches/OLDpatches/simplemonosynth.om
diff --git a/grauph/src/clients/patches/OLDpatches/simplepolysynth.om b/grauph/patches/OLDpatches/simplepolysynth.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/simplepolysynth.om
rename to grauph/patches/OLDpatches/simplepolysynth.om
diff --git a/grauph/src/clients/patches/OLDpatches/synth.om b/grauph/patches/OLDpatches/synth.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/synth.om
rename to grauph/patches/OLDpatches/synth.om
diff --git a/grauph/src/clients/patches/OLDpatches/synth.om.xml b/grauph/patches/OLDpatches/synth.om.xml
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/synth.om.xml
rename to grauph/patches/OLDpatches/synth.om.xml
diff --git a/grauph/src/clients/patches/OLDpatches/test-patch.om b/grauph/patches/OLDpatches/test-patch.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/test-patch.om
rename to grauph/patches/OLDpatches/test-patch.om
diff --git a/grauph/src/clients/patches/OLDpatches/test-patch.om.xml b/grauph/patches/OLDpatches/test-patch.om.xml
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/test-patch.om.xml
rename to grauph/patches/OLDpatches/test-patch.om.xml
diff --git a/grauph/src/clients/patches/OLDpatches/trance.om b/grauph/patches/OLDpatches/trance.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/trance.om
rename to grauph/patches/OLDpatches/trance.om
diff --git a/grauph/src/clients/patches/OLDpatches/trigger-test.om b/grauph/patches/OLDpatches/trigger-test.om
similarity index 100%
rename from grauph/src/clients/patches/OLDpatches/trigger-test.om
rename to grauph/patches/OLDpatches/trigger-test.om
diff --git a/grauph/src/clients/patches/bak/fm_operator.om b/grauph/patches/bak/fm_operator.om
similarity index 100%
rename from grauph/src/clients/patches/bak/fm_operator.om
rename to grauph/patches/bak/fm_operator.om
diff --git a/grauph/src/clients/patches/bak/op1.om b/grauph/patches/bak/op1.om
similarity index 100%
rename from grauph/src/clients/patches/bak/op1.om
rename to grauph/patches/bak/op1.om
diff --git a/grauph/src/clients/patches/bak/op2.om b/grauph/patches/bak/op2.om
similarity index 100%
rename from grauph/src/clients/patches/bak/op2.om
rename to grauph/patches/bak/op2.om
diff --git a/grauph/src/clients/patches/bak/op3.om b/grauph/patches/bak/op3.om
similarity index 100%
rename from grauph/src/clients/patches/bak/op3.om
rename to grauph/patches/bak/op3.om
diff --git a/grauph/src/clients/patches/bak/rhodes.om b/grauph/patches/bak/rhodes.om
similarity index 100%
rename from grauph/src/clients/patches/bak/rhodes.om
rename to grauph/patches/bak/rhodes.om
diff --git a/grauph/src/clients/patches/broken_bass_synth.om b/grauph/patches/broken_bass_synth.om
similarity index 100%
rename from grauph/src/clients/patches/broken_bass_synth.om
rename to grauph/patches/broken_bass_synth.om
diff --git a/grauph/src/clients/patches/broken_oscillator.om b/grauph/patches/broken_oscillator.om
similarity index 100%
rename from grauph/src/clients/patches/broken_oscillator.om
rename to grauph/patches/broken_oscillator.om
diff --git a/grauph/src/clients/patches/evildistbass.om b/grauph/patches/evildistbass.om
similarity index 100%
rename from grauph/src/clients/patches/evildistbass.om
rename to grauph/patches/evildistbass.om
diff --git a/grauph/src/clients/patches/files b/grauph/patches/files
similarity index 100%
rename from grauph/src/clients/patches/files
rename to grauph/patches/files
diff --git a/grauph/src/clients/patches/fm_operator.om b/grauph/patches/fm_operator.om
similarity index 100%
rename from grauph/src/clients/patches/fm_operator.om
rename to grauph/patches/fm_operator.om
diff --git a/grauph/src/clients/patches/glitch_drums/glitch_drums.om b/grauph/patches/glitch_drums/glitch_drums.om
similarity index 100%
rename from grauph/src/clients/patches/glitch_drums/glitch_drums.om
rename to grauph/patches/glitch_drums/glitch_drums.om
diff --git a/grauph/src/clients/patches/glitch_drums/rezzy_noise_wahp.om b/grauph/patches/glitch_drums/rezzy_noise_wahp.om
similarity index 100%
rename from grauph/src/clients/patches/glitch_drums/rezzy_noise_wahp.om
rename to grauph/patches/glitch_drums/rezzy_noise_wahp.om
diff --git a/grauph/src/clients/patches/glitch_drums/snare.om b/grauph/patches/glitch_drums/snare.om
similarity index 100%
rename from grauph/src/clients/patches/glitch_drums/snare.om
rename to grauph/patches/glitch_drums/snare.om
diff --git a/grauph/src/clients/patches/glitch_drums/whippy_hat.om b/grauph/patches/glitch_drums/whippy_hat.om
similarity index 100%
rename from grauph/src/clients/patches/glitch_drums/whippy_hat.om
rename to grauph/patches/glitch_drums/whippy_hat.om
diff --git a/grauph/src/clients/patches/house_ensemble.om b/grauph/patches/house_ensemble.om
similarity index 100%
rename from grauph/src/clients/patches/house_ensemble.om
rename to grauph/patches/house_ensemble.om
diff --git a/grauph/src/clients/patches/hugebass.om b/grauph/patches/hugebass.om
similarity index 100%
rename from grauph/src/clients/patches/hugebass.om
rename to grauph/patches/hugebass.om
diff --git a/grauph/src/clients/patches/karplus_strong_digeridoo.om b/grauph/patches/karplus_strong_digeridoo.om
similarity index 100%
rename from grauph/src/clients/patches/karplus_strong_digeridoo.om
rename to grauph/patches/karplus_strong_digeridoo.om
diff --git a/grauph/src/clients/patches/kick.om b/grauph/patches/kick.om
similarity index 100%
rename from grauph/src/clients/patches/kick.om
rename to grauph/patches/kick.om
diff --git a/grauph/src/clients/patches/meanbass.om b/grauph/patches/meanbass.om
similarity index 100%
rename from grauph/src/clients/patches/meanbass.om
rename to grauph/patches/meanbass.om
diff --git a/grauph/src/clients/patches/organ.om b/grauph/patches/organ.om
similarity index 100%
rename from grauph/src/clients/patches/organ.om
rename to grauph/patches/organ.om
diff --git a/grauph/src/clients/patches/pad.om b/grauph/patches/pad.om
similarity index 100%
rename from grauph/src/clients/patches/pad.om
rename to grauph/patches/pad.om
diff --git a/grauph/src/clients/patches/quick_bass.om b/grauph/patches/quick_bass.om
similarity index 100%
rename from grauph/src/clients/patches/quick_bass.om
rename to grauph/patches/quick_bass.om
diff --git a/grauph/src/clients/patches/rhodes.om b/grauph/patches/rhodes.om
similarity index 100%
rename from grauph/src/clients/patches/rhodes.om
rename to grauph/patches/rhodes.om
diff --git a/grauph/src/clients/patches/saw_detuned.om b/grauph/patches/saw_detuned.om
similarity index 100%
rename from grauph/src/clients/patches/saw_detuned.om
rename to grauph/patches/saw_detuned.om
diff --git a/grauph/src/clients/patches/saw_lp.om b/grauph/patches/saw_lp.om
similarity index 100%
rename from grauph/src/clients/patches/saw_lp.om
rename to grauph/patches/saw_lp.om
diff --git a/grauph/src/clients/patches/sine.om b/grauph/patches/sine.om
similarity index 100%
rename from grauph/src/clients/patches/sine.om
rename to grauph/patches/sine.om
diff --git a/grauph/src/clients/patches/slapbass.om b/grauph/patches/slapbass.om
similarity index 100%
rename from grauph/src/clients/patches/slapbass.om
rename to grauph/patches/slapbass.om
diff --git a/grauph/src/clients/patches/testing/303-test.om b/grauph/patches/testing/303-test.om
similarity index 100%
rename from grauph/src/clients/patches/testing/303-test.om
rename to grauph/patches/testing/303-test.om
diff --git a/grauph/src/clients/patches/testing/bar.om b/grauph/patches/testing/bar.om
similarity index 100%
rename from grauph/src/clients/patches/testing/bar.om
rename to grauph/patches/testing/bar.om
diff --git a/grauph/src/clients/patches/testing/connecttest.om b/grauph/patches/testing/connecttest.om
similarity index 100%
rename from grauph/src/clients/patches/testing/connecttest.om
rename to grauph/patches/testing/connecttest.om
diff --git a/grauph/src/clients/patches/testing/convert_test.om b/grauph/patches/testing/convert_test.om
similarity index 100%
rename from grauph/src/clients/patches/testing/convert_test.om
rename to grauph/patches/testing/convert_test.om
diff --git a/grauph/src/clients/patches/testing/convert_test2.om b/grauph/patches/testing/convert_test2.om
similarity index 100%
rename from grauph/src/clients/patches/testing/convert_test2.om
rename to grauph/patches/testing/convert_test2.om
diff --git a/grauph/src/clients/patches/testing/dssi_test.om b/grauph/patches/testing/dssi_test.om
similarity index 100%
rename from grauph/src/clients/patches/testing/dssi_test.om
rename to grauph/patches/testing/dssi_test.om
diff --git a/grauph/src/clients/patches/testing/envtest.om b/grauph/patches/testing/envtest.om
similarity index 100%
rename from grauph/src/clients/patches/testing/envtest.om
rename to grauph/patches/testing/envtest.om
diff --git a/grauph/src/clients/patches/testing/exptest.om b/grauph/patches/testing/exptest.om
similarity index 100%
rename from grauph/src/clients/patches/testing/exptest.om
rename to grauph/patches/testing/exptest.om
diff --git a/grauph/src/clients/patches/testing/foo.om b/grauph/patches/testing/foo.om
similarity index 100%
rename from grauph/src/clients/patches/testing/foo.om
rename to grauph/patches/testing/foo.om
diff --git a/grauph/src/clients/patches/testing/formanttest.om b/grauph/patches/testing/formanttest.om
similarity index 100%
rename from grauph/src/clients/patches/testing/formanttest.om
rename to grauph/patches/testing/formanttest.om
diff --git a/grauph/src/clients/patches/testing/learntest.om b/grauph/patches/testing/learntest.om
similarity index 100%
rename from grauph/src/clients/patches/testing/learntest.om
rename to grauph/patches/testing/learntest.om
diff --git a/grauph/src/clients/patches/testing/miditest.om b/grauph/patches/testing/miditest.om
similarity index 100%
rename from grauph/src/clients/patches/testing/miditest.om
rename to grauph/patches/testing/miditest.om
diff --git a/grauph/src/clients/patches/testing/new_test/master.om b/grauph/patches/testing/new_test/master.om
similarity index 100%
rename from grauph/src/clients/patches/testing/new_test/master.om
rename to grauph/patches/testing/new_test/master.om
diff --git a/grauph/src/clients/patches/testing/new_test/quick-bass.om b/grauph/patches/testing/new_test/quick-bass.om
similarity index 100%
rename from grauph/src/clients/patches/testing/new_test/quick-bass.om
rename to grauph/patches/testing/new_test/quick-bass.om
diff --git a/grauph/src/clients/patches/testing/rangetest.om b/grauph/patches/testing/rangetest.om
similarity index 100%
rename from grauph/src/clients/patches/testing/rangetest.om
rename to grauph/patches/testing/rangetest.om
diff --git a/grauph/src/clients/patches/testing/rangetest2.om b/grauph/patches/testing/rangetest2.om
similarity index 100%
rename from grauph/src/clients/patches/testing/rangetest2.om
rename to grauph/patches/testing/rangetest2.om
diff --git a/grauph/src/clients/patches/testing/subpatching/bar.om b/grauph/patches/testing/subpatching/bar.om
similarity index 100%
rename from grauph/src/clients/patches/testing/subpatching/bar.om
rename to grauph/patches/testing/subpatching/bar.om
diff --git a/grauph/src/clients/patches/testing/subpatching/baz.om b/grauph/patches/testing/subpatching/baz.om
similarity index 100%
rename from grauph/src/clients/patches/testing/subpatching/baz.om
rename to grauph/patches/testing/subpatching/baz.om
diff --git a/grauph/src/clients/patches/testing/subpatching/baz2.om b/grauph/patches/testing/subpatching/baz2.om
similarity index 100%
rename from grauph/src/clients/patches/testing/subpatching/baz2.om
rename to grauph/patches/testing/subpatching/baz2.om
diff --git a/grauph/src/clients/patches/testing/subpatching/blah.om b/grauph/patches/testing/subpatching/blah.om
similarity index 100%
rename from grauph/src/clients/patches/testing/subpatching/blah.om
rename to grauph/patches/testing/subpatching/blah.om
diff --git a/grauph/src/clients/patches/testing/subpatching/blahz0r.om b/grauph/patches/testing/subpatching/blahz0r.om
similarity index 100%
rename from grauph/src/clients/patches/testing/subpatching/blahz0r.om
rename to grauph/patches/testing/subpatching/blahz0r.om
diff --git a/grauph/src/clients/patches/testing/subpatching/foo.om b/grauph/patches/testing/subpatching/foo.om
similarity index 100%
rename from grauph/src/clients/patches/testing/subpatching/foo.om
rename to grauph/patches/testing/subpatching/foo.om
diff --git a/grauph/src/clients/patches/testing/subpatching/quuux.om b/grauph/patches/testing/subpatching/quuux.om
similarity index 100%
rename from grauph/src/clients/patches/testing/subpatching/quuux.om
rename to grauph/patches/testing/subpatching/quuux.om
diff --git a/grauph/src/clients/patches/testing/subpatching/quuux2.om b/grauph/patches/testing/subpatching/quuux2.om
similarity index 100%
rename from grauph/src/clients/patches/testing/subpatching/quuux2.om
rename to grauph/patches/testing/subpatching/quuux2.om
diff --git a/grauph/src/clients/patches/testing/subpatching/quux.om b/grauph/patches/testing/subpatching/quux.om
similarity index 100%
rename from grauph/src/clients/patches/testing/subpatching/quux.om
rename to grauph/patches/testing/subpatching/quux.om
diff --git a/grauph/src/clients/patches/testing/subpatching/qwe.om b/grauph/patches/testing/subpatching/qwe.om
similarity index 100%
rename from grauph/src/clients/patches/testing/subpatching/qwe.om
rename to grauph/patches/testing/subpatching/qwe.om
diff --git a/grauph/src/clients/patches/testing/test.om b/grauph/patches/testing/test.om
similarity index 100%
rename from grauph/src/clients/patches/testing/test.om
rename to grauph/patches/testing/test.om
diff --git a/grauph/src/clients/patches/testing/transport-test.om b/grauph/patches/testing/transport-test.om
similarity index 100%
rename from grauph/src/clients/patches/testing/transport-test.om
rename to grauph/patches/testing/transport-test.om
diff --git a/grauph/src/clients/patches/testing/voice_test.om b/grauph/patches/testing/voice_test.om
similarity index 100%
rename from grauph/src/clients/patches/testing/voice_test.om
rename to grauph/patches/testing/voice_test.om
diff --git a/grauph/src/clients/patches/trance.om b/grauph/patches/trance.om
similarity index 100%
rename from grauph/src/clients/patches/trance.om
rename to grauph/patches/trance.om
diff --git a/grauph/src/clients/patches/wah_bass.om b/grauph/patches/wah_bass.om
similarity index 100%
rename from grauph/src/clients/patches/wah_bass.om
rename to grauph/patches/wah_bass.om
diff --git a/grauph/src/progs/Makefile.am b/grauph/src/progs/Makefile.am
new file mode 100644
index 00000000..685976dc
--- /dev/null
+++ b/grauph/src/progs/Makefile.am
@@ -0,0 +1,12 @@
+AM_CXXFLAGS = -I$(top_srcdir)/src/common -fno-exceptions -fno-rtti
+
+SUBDIRS = . python supercollider
+
+if BUILD_CONSOLE_CLIENTS
+SUBDIRS += patch_loader patches demolition
+endif
+
+if BUILD_GTK_CLIENT
+SUBDIRS += gtk
+endif
+