diff --git a/source/backend/standalone/Makefile b/source/backend/standalone/Makefile index d25bf13ce..13d3449b5 100644 --- a/source/backend/standalone/Makefile +++ b/source/backend/standalone/Makefile @@ -75,7 +75,7 @@ endif # ---------------------------------------------------------------------------------------------------------------------------- # Native -STATIC_LIBS += ../../modules/daz.a +STATIC_LIBS += ../../modules/daz-plugins.a ifeq ($(HAVE_AF_DEPS),true) LINK_FLAGS += $(shell pkg-config --libs sndfile) diff --git a/source/bridges/CarlaBridgePlugin.cpp b/source/bridges/CarlaBridgePlugin.cpp index 8d96a015e..92290542d 100644 --- a/source/bridges/CarlaBridgePlugin.cpp +++ b/source/bridges/CarlaBridgePlugin.cpp @@ -117,10 +117,10 @@ public: if (curDir.getChildFile("resources").exists()) carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("resources").getFullPathName().toRawUTF8()); - else if (curDir.getChildFile("../../modules/daz/resources").exists()) - carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("../../modules/daz/resources").getFullPathName().toRawUTF8()); + else if (curDir.getChildFile("../../modules/daz-plugins/resources").exists()) + carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("../../modules/daz-plugins/resources").getFullPathName().toRawUTF8()); else - carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("../modules/daz/resources").getFullPathName().toRawUTF8()); + carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("../modules/daz-plugins/resources").getFullPathName().toRawUTF8()); #endif if (useBridge) diff --git a/source/bridges/Makefile b/source/bridges/Makefile index 65b52488a..a2eaf1061 100644 --- a/source/bridges/Makefile +++ b/source/bridges/Makefile @@ -414,7 +414,7 @@ OBJS_NATIVE += \ ../modules/juce_events.a endif -# ../modules/daz.a \ +# ../modules/daz-plugins.a \ # ../modules/juce_data_structures.a \ # ../modules/juce_graphics.a \ # ../modules/juce_gui_basics.a \ diff --git a/source/bridges/qtcreator/carla-bridge-plugin.pro b/source/bridges/qtcreator/carla-bridge-plugin.pro index c3e803a25..086398446 100644 --- a/source/bridges/qtcreator/carla-bridge-plugin.pro +++ b/source/bridges/qtcreator/carla-bridge-plugin.pro @@ -135,7 +135,7 @@ INCLUDEPATH = .. \ # ----------------------------------------------------------- LIBS = -ldl -lpthread -lrt -LIBS += ../../modules/daz.a +LIBS += ../../modules/daz-plugins.a LIBS += ../../modules/juce_audio_basics.a LIBS += ../../modules/juce_core.a LIBS += ../../modules/juce_data_structures.a diff --git a/source/carla_shared.py b/source/carla_shared.py index c2aa382e6..a19801a07 100644 --- a/source/carla_shared.py +++ b/source/carla_shared.py @@ -555,7 +555,7 @@ def initHost(appName, libPrefix = None, failError = True): # ------------------------------------------------------------- # Set resource path - localResources = os.path.join(libfolder, "..", "modules", "daz", "resources") + localResources = os.path.join(libfolder, "..", "modules", "daz-plugins", "resources") systemResources = os.path.join(libfolder, "resources") if os.path.exists(localResources): diff --git a/source/modules/Makefile b/source/modules/Makefile index e10178110..c944db747 100644 --- a/source/modules/Makefile +++ b/source/modules/Makefile @@ -8,8 +8,8 @@ all: # -------------------------------------------------------------- -daz: - $(MAKE) -C daz +daz-plugins: + $(MAKE) -C daz-plugins # -------------------------------------------------------------- @@ -166,7 +166,7 @@ lib%.so: clean: rm -f *.a *.def *.dll *.dylib *.so - $(MAKE) clean -C daz + $(MAKE) clean -C daz-plugins $(MAKE) clean -C distrho/dgl $(MAKE) clean -C jackbridge $(MAKE) clean -C juce_audio_basics @@ -188,7 +188,7 @@ clean: # -------------------------------------------------------------- .PHONY: \ - daz jackbridge lilv rtaudio rtmidi rtmempool stk theme \ + daz-plugins jackbridge lilv rtaudio rtmidi rtmempool stk theme \ juce_audio_basics juce_audio_devices juce_audio_formats juce_audio_processors juce_core juce_data_structures juce_events juce_graphics juce_gui_basics # -------------------------------------------------------------- diff --git a/source/modules/daz/3bandeq/DistrhoArtwork3BandEQ.cpp b/source/modules/daz-plugins/3bandeq/DistrhoArtwork3BandEQ.cpp similarity index 100% rename from source/modules/daz/3bandeq/DistrhoArtwork3BandEQ.cpp rename to source/modules/daz-plugins/3bandeq/DistrhoArtwork3BandEQ.cpp diff --git a/source/modules/daz/3bandeq/DistrhoArtwork3BandEQ.hpp b/source/modules/daz-plugins/3bandeq/DistrhoArtwork3BandEQ.hpp similarity index 100% rename from source/modules/daz/3bandeq/DistrhoArtwork3BandEQ.hpp rename to source/modules/daz-plugins/3bandeq/DistrhoArtwork3BandEQ.hpp diff --git a/source/modules/daz/3bandeq/DistrhoPlugin3BandEQ.cpp b/source/modules/daz-plugins/3bandeq/DistrhoPlugin3BandEQ.cpp similarity index 100% rename from source/modules/daz/3bandeq/DistrhoPlugin3BandEQ.cpp rename to source/modules/daz-plugins/3bandeq/DistrhoPlugin3BandEQ.cpp diff --git a/source/modules/daz/3bandeq/DistrhoPlugin3BandEQ.hpp b/source/modules/daz-plugins/3bandeq/DistrhoPlugin3BandEQ.hpp similarity index 100% rename from source/modules/daz/3bandeq/DistrhoPlugin3BandEQ.hpp rename to source/modules/daz-plugins/3bandeq/DistrhoPlugin3BandEQ.hpp diff --git a/source/modules/daz/3bandeq/DistrhoPluginInfo.h b/source/modules/daz-plugins/3bandeq/DistrhoPluginInfo.h similarity index 100% rename from source/modules/daz/3bandeq/DistrhoPluginInfo.h rename to source/modules/daz-plugins/3bandeq/DistrhoPluginInfo.h diff --git a/source/modules/daz/3bandeq/DistrhoUI3BandEQ.cpp b/source/modules/daz-plugins/3bandeq/DistrhoUI3BandEQ.cpp similarity index 100% rename from source/modules/daz/3bandeq/DistrhoUI3BandEQ.cpp rename to source/modules/daz-plugins/3bandeq/DistrhoUI3BandEQ.cpp diff --git a/source/modules/daz/3bandeq/DistrhoUI3BandEQ.hpp b/source/modules/daz-plugins/3bandeq/DistrhoUI3BandEQ.hpp similarity index 100% rename from source/modules/daz/3bandeq/DistrhoUI3BandEQ.hpp rename to source/modules/daz-plugins/3bandeq/DistrhoUI3BandEQ.hpp diff --git a/source/modules/daz/3bandeq/artwork/about.png b/source/modules/daz-plugins/3bandeq/artwork/about.png similarity index 100% rename from source/modules/daz/3bandeq/artwork/about.png rename to source/modules/daz-plugins/3bandeq/artwork/about.png diff --git a/source/modules/daz/3bandeq/artwork/aboutButtonHover.png b/source/modules/daz-plugins/3bandeq/artwork/aboutButtonHover.png similarity index 100% rename from source/modules/daz/3bandeq/artwork/aboutButtonHover.png rename to source/modules/daz-plugins/3bandeq/artwork/aboutButtonHover.png diff --git a/source/modules/daz/3bandeq/artwork/aboutButtonNormal.png b/source/modules/daz-plugins/3bandeq/artwork/aboutButtonNormal.png similarity index 100% rename from source/modules/daz/3bandeq/artwork/aboutButtonNormal.png rename to source/modules/daz-plugins/3bandeq/artwork/aboutButtonNormal.png diff --git a/source/modules/daz/3bandeq/artwork/background.png b/source/modules/daz-plugins/3bandeq/artwork/background.png similarity index 100% rename from source/modules/daz/3bandeq/artwork/background.png rename to source/modules/daz-plugins/3bandeq/artwork/background.png diff --git a/source/modules/daz/3bandeq/artwork/knob.png b/source/modules/daz-plugins/3bandeq/artwork/knob.png similarity index 100% rename from source/modules/daz/3bandeq/artwork/knob.png rename to source/modules/daz-plugins/3bandeq/artwork/knob.png diff --git a/source/modules/daz/3bandeq/artwork/slider.png b/source/modules/daz-plugins/3bandeq/artwork/slider.png similarity index 100% rename from source/modules/daz/3bandeq/artwork/slider.png rename to source/modules/daz-plugins/3bandeq/artwork/slider.png diff --git a/source/modules/daz/3bandsplitter/DistrhoArtwork3BandSplitter.cpp b/source/modules/daz-plugins/3bandsplitter/DistrhoArtwork3BandSplitter.cpp similarity index 100% rename from source/modules/daz/3bandsplitter/DistrhoArtwork3BandSplitter.cpp rename to source/modules/daz-plugins/3bandsplitter/DistrhoArtwork3BandSplitter.cpp diff --git a/source/modules/daz/3bandsplitter/DistrhoArtwork3BandSplitter.hpp b/source/modules/daz-plugins/3bandsplitter/DistrhoArtwork3BandSplitter.hpp similarity index 100% rename from source/modules/daz/3bandsplitter/DistrhoArtwork3BandSplitter.hpp rename to source/modules/daz-plugins/3bandsplitter/DistrhoArtwork3BandSplitter.hpp diff --git a/source/modules/daz/3bandsplitter/DistrhoPlugin3BandSplitter.cpp b/source/modules/daz-plugins/3bandsplitter/DistrhoPlugin3BandSplitter.cpp similarity index 100% rename from source/modules/daz/3bandsplitter/DistrhoPlugin3BandSplitter.cpp rename to source/modules/daz-plugins/3bandsplitter/DistrhoPlugin3BandSplitter.cpp diff --git a/source/modules/daz/3bandsplitter/DistrhoPlugin3BandSplitter.hpp b/source/modules/daz-plugins/3bandsplitter/DistrhoPlugin3BandSplitter.hpp similarity index 100% rename from source/modules/daz/3bandsplitter/DistrhoPlugin3BandSplitter.hpp rename to source/modules/daz-plugins/3bandsplitter/DistrhoPlugin3BandSplitter.hpp diff --git a/source/modules/daz/3bandsplitter/DistrhoPluginInfo.h b/source/modules/daz-plugins/3bandsplitter/DistrhoPluginInfo.h similarity index 100% rename from source/modules/daz/3bandsplitter/DistrhoPluginInfo.h rename to source/modules/daz-plugins/3bandsplitter/DistrhoPluginInfo.h diff --git a/source/modules/daz/3bandsplitter/DistrhoUI3BandSplitter.cpp b/source/modules/daz-plugins/3bandsplitter/DistrhoUI3BandSplitter.cpp similarity index 100% rename from source/modules/daz/3bandsplitter/DistrhoUI3BandSplitter.cpp rename to source/modules/daz-plugins/3bandsplitter/DistrhoUI3BandSplitter.cpp diff --git a/source/modules/daz/3bandsplitter/DistrhoUI3BandSplitter.hpp b/source/modules/daz-plugins/3bandsplitter/DistrhoUI3BandSplitter.hpp similarity index 100% rename from source/modules/daz/3bandsplitter/DistrhoUI3BandSplitter.hpp rename to source/modules/daz-plugins/3bandsplitter/DistrhoUI3BandSplitter.hpp diff --git a/source/modules/daz/3bandsplitter/artwork/about.png b/source/modules/daz-plugins/3bandsplitter/artwork/about.png similarity index 100% rename from source/modules/daz/3bandsplitter/artwork/about.png rename to source/modules/daz-plugins/3bandsplitter/artwork/about.png diff --git a/source/modules/daz/3bandsplitter/artwork/aboutButtonHover.png b/source/modules/daz-plugins/3bandsplitter/artwork/aboutButtonHover.png similarity index 100% rename from source/modules/daz/3bandsplitter/artwork/aboutButtonHover.png rename to source/modules/daz-plugins/3bandsplitter/artwork/aboutButtonHover.png diff --git a/source/modules/daz/3bandsplitter/artwork/aboutButtonNormal.png b/source/modules/daz-plugins/3bandsplitter/artwork/aboutButtonNormal.png similarity index 100% rename from source/modules/daz/3bandsplitter/artwork/aboutButtonNormal.png rename to source/modules/daz-plugins/3bandsplitter/artwork/aboutButtonNormal.png diff --git a/source/modules/daz/3bandsplitter/artwork/background.png b/source/modules/daz-plugins/3bandsplitter/artwork/background.png similarity index 100% rename from source/modules/daz/3bandsplitter/artwork/background.png rename to source/modules/daz-plugins/3bandsplitter/artwork/background.png diff --git a/source/modules/daz/3bandsplitter/artwork/knob.png b/source/modules/daz-plugins/3bandsplitter/artwork/knob.png similarity index 100% rename from source/modules/daz/3bandsplitter/artwork/knob.png rename to source/modules/daz-plugins/3bandsplitter/artwork/knob.png diff --git a/source/modules/daz/3bandsplitter/artwork/slider.png b/source/modules/daz-plugins/3bandsplitter/artwork/slider.png similarity index 100% rename from source/modules/daz/3bandsplitter/artwork/slider.png rename to source/modules/daz-plugins/3bandsplitter/artwork/slider.png diff --git a/source/modules/daz/Makefile b/source/modules/daz-plugins/Makefile similarity index 97% rename from source/modules/daz/Makefile rename to source/modules/daz-plugins/Makefile index ffce93eec..71be0a478 100644 --- a/source/modules/daz/Makefile +++ b/source/modules/daz-plugins/Makefile @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# Makefile for daz # +# Makefile for daz-plugins # # ---------------- # # Created by falkTX # @@ -187,21 +187,21 @@ endif # -------------------------------------------------------------- -all: ../daz.a +all: ../daz-plugins.a # -------------------------------------------------------------- -../daz.a: $(OBJS) +../daz-plugins.a: $(OBJS) $(RM) $@ $(AR) crs $@ $^ -../libdaz.dll: $(OBJS) +../libdaz-plugins.dll: $(OBJS) $(CXX) $^ -shared $(LINK_FLAGS) -o $@ -../libdaz.dylib: $(OBJS) +../libdaz-plugins.dylib: $(OBJS) $(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@ -../libdaz.so: $(OBJS) +../libdaz-plugins.so: $(OBJS) $(CXX) $^ -shared $(LINK_FLAGS) -o $@ # -------------------------------------------------------------- @@ -284,7 +284,7 @@ zynaddsubfx/UI/%.h: zynaddsubfx/UI/%.fl # -------------------------------------------------------------- clean: - $(RM) $(OBJS) ../daz*.a ../libdaz.* + $(RM) $(OBJS) ../daz-plugins*.a ../libdaz-plugins.* $(RM) $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP) debug: diff --git a/source/modules/daz/_all.c b/source/modules/daz-plugins/_all.c similarity index 100% rename from source/modules/daz/_all.c rename to source/modules/daz-plugins/_all.c diff --git a/source/modules/daz/_link.c b/source/modules/daz-plugins/_link.c similarity index 100% rename from source/modules/daz/_link.c rename to source/modules/daz-plugins/_link.c diff --git a/source/modules/daz/audio-base.hpp b/source/modules/daz-plugins/audio-base.hpp similarity index 100% rename from source/modules/daz/audio-base.hpp rename to source/modules/daz-plugins/audio-base.hpp diff --git a/source/modules/daz/audio-file.cpp b/source/modules/daz-plugins/audio-file.cpp similarity index 100% rename from source/modules/daz/audio-file.cpp rename to source/modules/daz-plugins/audio-file.cpp diff --git a/source/modules/daz/audio_decoder/ad.h b/source/modules/daz-plugins/audio_decoder/ad.h similarity index 100% rename from source/modules/daz/audio_decoder/ad.h rename to source/modules/daz-plugins/audio_decoder/ad.h diff --git a/source/modules/daz/audio_decoder/ad_ffmpeg.c b/source/modules/daz-plugins/audio_decoder/ad_ffmpeg.c similarity index 100% rename from source/modules/daz/audio_decoder/ad_ffmpeg.c rename to source/modules/daz-plugins/audio_decoder/ad_ffmpeg.c diff --git a/source/modules/daz/audio_decoder/ad_plugin.c b/source/modules/daz-plugins/audio_decoder/ad_plugin.c similarity index 100% rename from source/modules/daz/audio_decoder/ad_plugin.c rename to source/modules/daz-plugins/audio_decoder/ad_plugin.c diff --git a/source/modules/daz/audio_decoder/ad_plugin.h b/source/modules/daz-plugins/audio_decoder/ad_plugin.h similarity index 100% rename from source/modules/daz/audio_decoder/ad_plugin.h rename to source/modules/daz-plugins/audio_decoder/ad_plugin.h diff --git a/source/modules/daz/audio_decoder/ad_soundfile.c b/source/modules/daz-plugins/audio_decoder/ad_soundfile.c similarity index 100% rename from source/modules/daz/audio_decoder/ad_soundfile.c rename to source/modules/daz-plugins/audio_decoder/ad_soundfile.c diff --git a/source/modules/daz/audio_decoder/ffcompat.h b/source/modules/daz-plugins/audio_decoder/ffcompat.h similarity index 100% rename from source/modules/daz/audio_decoder/ffcompat.h rename to source/modules/daz-plugins/audio_decoder/ffcompat.h diff --git a/source/modules/daz/bigmeter/DistrhoPluginBigMeter.cpp b/source/modules/daz-plugins/bigmeter/DistrhoPluginBigMeter.cpp similarity index 100% rename from source/modules/daz/bigmeter/DistrhoPluginBigMeter.cpp rename to source/modules/daz-plugins/bigmeter/DistrhoPluginBigMeter.cpp diff --git a/source/modules/daz/bigmeter/DistrhoPluginBigMeter.hpp b/source/modules/daz-plugins/bigmeter/DistrhoPluginBigMeter.hpp similarity index 100% rename from source/modules/daz/bigmeter/DistrhoPluginBigMeter.hpp rename to source/modules/daz-plugins/bigmeter/DistrhoPluginBigMeter.hpp diff --git a/source/modules/daz/bigmeter/DistrhoPluginInfo.h b/source/modules/daz-plugins/bigmeter/DistrhoPluginInfo.h similarity index 100% rename from source/modules/daz/bigmeter/DistrhoPluginInfo.h rename to source/modules/daz-plugins/bigmeter/DistrhoPluginInfo.h diff --git a/source/modules/daz/bigmeter/DistrhoUIBigMeter.cpp b/source/modules/daz-plugins/bigmeter/DistrhoUIBigMeter.cpp similarity index 100% rename from source/modules/daz/bigmeter/DistrhoUIBigMeter.cpp rename to source/modules/daz-plugins/bigmeter/DistrhoUIBigMeter.cpp diff --git a/source/modules/daz/bigmeter/DistrhoUIBigMeter.hpp b/source/modules/daz-plugins/bigmeter/DistrhoUIBigMeter.hpp similarity index 100% rename from source/modules/daz/bigmeter/DistrhoUIBigMeter.hpp rename to source/modules/daz-plugins/bigmeter/DistrhoUIBigMeter.hpp diff --git a/source/modules/daz/bigmeterM/DistrhoPluginBigMeter.cpp b/source/modules/daz-plugins/bigmeterM/DistrhoPluginBigMeter.cpp similarity index 100% rename from source/modules/daz/bigmeterM/DistrhoPluginBigMeter.cpp rename to source/modules/daz-plugins/bigmeterM/DistrhoPluginBigMeter.cpp diff --git a/source/modules/daz/bigmeterM/DistrhoPluginBigMeter.hpp b/source/modules/daz-plugins/bigmeterM/DistrhoPluginBigMeter.hpp similarity index 100% rename from source/modules/daz/bigmeterM/DistrhoPluginBigMeter.hpp rename to source/modules/daz-plugins/bigmeterM/DistrhoPluginBigMeter.hpp diff --git a/source/modules/daz/bigmeterM/DistrhoPluginInfo.h b/source/modules/daz-plugins/bigmeterM/DistrhoPluginInfo.h similarity index 100% rename from source/modules/daz/bigmeterM/DistrhoPluginInfo.h rename to source/modules/daz-plugins/bigmeterM/DistrhoPluginInfo.h diff --git a/source/modules/daz/bigmeterM/DistrhoUIBigMeter.cpp b/source/modules/daz-plugins/bigmeterM/DistrhoUIBigMeter.cpp similarity index 100% rename from source/modules/daz/bigmeterM/DistrhoUIBigMeter.cpp rename to source/modules/daz-plugins/bigmeterM/DistrhoUIBigMeter.cpp diff --git a/source/modules/daz/bigmeterM/DistrhoUIBigMeter.hpp b/source/modules/daz-plugins/bigmeterM/DistrhoUIBigMeter.hpp similarity index 100% rename from source/modules/daz/bigmeterM/DistrhoUIBigMeter.hpp rename to source/modules/daz-plugins/bigmeterM/DistrhoUIBigMeter.hpp diff --git a/source/modules/daz/bypass.c b/source/modules/daz-plugins/bypass.c similarity index 100% rename from source/modules/daz/bypass.c rename to source/modules/daz-plugins/bypass.c diff --git a/source/modules/daz/distrho-3bandeq.cpp b/source/modules/daz-plugins/distrho-3bandeq.cpp similarity index 100% rename from source/modules/daz/distrho-3bandeq.cpp rename to source/modules/daz-plugins/distrho-3bandeq.cpp diff --git a/source/modules/daz/distrho-3bandsplitter.cpp b/source/modules/daz-plugins/distrho-3bandsplitter.cpp similarity index 100% rename from source/modules/daz/distrho-3bandsplitter.cpp rename to source/modules/daz-plugins/distrho-3bandsplitter.cpp diff --git a/source/modules/daz/distrho-bigmeter.cpp b/source/modules/daz-plugins/distrho-bigmeter.cpp similarity index 100% rename from source/modules/daz/distrho-bigmeter.cpp rename to source/modules/daz-plugins/distrho-bigmeter.cpp diff --git a/source/modules/daz/distrho-bigmeterM.cpp b/source/modules/daz-plugins/distrho-bigmeterM.cpp similarity index 100% rename from source/modules/daz/distrho-bigmeterM.cpp rename to source/modules/daz-plugins/distrho-bigmeterM.cpp diff --git a/source/modules/daz/distrho-nekobi.cpp b/source/modules/daz-plugins/distrho-nekobi.cpp similarity index 100% rename from source/modules/daz/distrho-nekobi.cpp rename to source/modules/daz-plugins/distrho-nekobi.cpp diff --git a/source/modules/daz/distrho-notes.cpp b/source/modules/daz-plugins/distrho-notes.cpp similarity index 100% rename from source/modules/daz/distrho-notes.cpp rename to source/modules/daz-plugins/distrho-notes.cpp diff --git a/source/modules/daz/distrho-pingpongpan.cpp b/source/modules/daz-plugins/distrho-pingpongpan.cpp similarity index 100% rename from source/modules/daz/distrho-pingpongpan.cpp rename to source/modules/daz-plugins/distrho-pingpongpan.cpp diff --git a/source/modules/daz/distrho-stereoenhancer.cpp b/source/modules/daz-plugins/distrho-stereoenhancer.cpp similarity index 100% rename from source/modules/daz/distrho-stereoenhancer.cpp rename to source/modules/daz-plugins/distrho-stereoenhancer.cpp diff --git a/source/modules/daz/distrho/DistrhoPluginCarla.cpp b/source/modules/daz-plugins/distrho/DistrhoPluginCarla.cpp similarity index 100% rename from source/modules/daz/distrho/DistrhoPluginCarla.cpp rename to source/modules/daz-plugins/distrho/DistrhoPluginCarla.cpp diff --git a/source/modules/daz/lfo.c b/source/modules/daz-plugins/lfo.c similarity index 100% rename from source/modules/daz/lfo.c rename to source/modules/daz-plugins/lfo.c diff --git a/source/modules/daz/midi-base.hpp b/source/modules/daz-plugins/midi-base.hpp similarity index 100% rename from source/modules/daz/midi-base.hpp rename to source/modules/daz-plugins/midi-base.hpp diff --git a/source/modules/daz/midi-file.cpp b/source/modules/daz-plugins/midi-file.cpp similarity index 100% rename from source/modules/daz/midi-file.cpp rename to source/modules/daz-plugins/midi-file.cpp diff --git a/source/modules/daz/midi-gain.c b/source/modules/daz-plugins/midi-gain.c similarity index 100% rename from source/modules/daz/midi-gain.c rename to source/modules/daz-plugins/midi-gain.c diff --git a/source/modules/daz/midi-sequencer.cpp b/source/modules/daz-plugins/midi-sequencer.cpp similarity index 100% rename from source/modules/daz/midi-sequencer.cpp rename to source/modules/daz-plugins/midi-sequencer.cpp diff --git a/source/modules/daz/midi-split.c b/source/modules/daz-plugins/midi-split.c similarity index 100% rename from source/modules/daz/midi-split.c rename to source/modules/daz-plugins/midi-split.c diff --git a/source/modules/daz/midi-through.c b/source/modules/daz-plugins/midi-through.c similarity index 100% rename from source/modules/daz/midi-through.c rename to source/modules/daz-plugins/midi-through.c diff --git a/source/modules/daz/midi-transpose.c b/source/modules/daz-plugins/midi-transpose.c similarity index 100% rename from source/modules/daz/midi-transpose.c rename to source/modules/daz-plugins/midi-transpose.c diff --git a/source/modules/daz/nekobi/DistrhoArtworkNekobi.cpp b/source/modules/daz-plugins/nekobi/DistrhoArtworkNekobi.cpp similarity index 100% rename from source/modules/daz/nekobi/DistrhoArtworkNekobi.cpp rename to source/modules/daz-plugins/nekobi/DistrhoArtworkNekobi.cpp diff --git a/source/modules/daz/nekobi/DistrhoArtworkNekobi.hpp b/source/modules/daz-plugins/nekobi/DistrhoArtworkNekobi.hpp similarity index 100% rename from source/modules/daz/nekobi/DistrhoArtworkNekobi.hpp rename to source/modules/daz-plugins/nekobi/DistrhoArtworkNekobi.hpp diff --git a/source/modules/daz/nekobi/DistrhoPluginInfo.h b/source/modules/daz-plugins/nekobi/DistrhoPluginInfo.h similarity index 100% rename from source/modules/daz/nekobi/DistrhoPluginInfo.h rename to source/modules/daz-plugins/nekobi/DistrhoPluginInfo.h diff --git a/source/modules/daz/nekobi/DistrhoPluginNekobi.cpp b/source/modules/daz-plugins/nekobi/DistrhoPluginNekobi.cpp similarity index 100% rename from source/modules/daz/nekobi/DistrhoPluginNekobi.cpp rename to source/modules/daz-plugins/nekobi/DistrhoPluginNekobi.cpp diff --git a/source/modules/daz/nekobi/DistrhoPluginNekobi.hpp b/source/modules/daz-plugins/nekobi/DistrhoPluginNekobi.hpp similarity index 100% rename from source/modules/daz/nekobi/DistrhoPluginNekobi.hpp rename to source/modules/daz-plugins/nekobi/DistrhoPluginNekobi.hpp diff --git a/source/modules/daz/nekobi/DistrhoUINekobi.cpp b/source/modules/daz-plugins/nekobi/DistrhoUINekobi.cpp similarity index 100% rename from source/modules/daz/nekobi/DistrhoUINekobi.cpp rename to source/modules/daz-plugins/nekobi/DistrhoUINekobi.cpp diff --git a/source/modules/daz/nekobi/DistrhoUINekobi.hpp b/source/modules/daz-plugins/nekobi/DistrhoUINekobi.hpp similarity index 100% rename from source/modules/daz/nekobi/DistrhoUINekobi.hpp rename to source/modules/daz-plugins/nekobi/DistrhoUINekobi.hpp diff --git a/source/modules/daz/nekobi/NekoWidget.hpp b/source/modules/daz-plugins/nekobi/NekoWidget.hpp similarity index 100% rename from source/modules/daz/nekobi/NekoWidget.hpp rename to source/modules/daz-plugins/nekobi/NekoWidget.hpp diff --git a/source/modules/daz/nekobi/artwork/about.png b/source/modules/daz-plugins/nekobi/artwork/about.png similarity index 100% rename from source/modules/daz/nekobi/artwork/about.png rename to source/modules/daz-plugins/nekobi/artwork/about.png diff --git a/source/modules/daz/nekobi/artwork/aboutButtonHover.png b/source/modules/daz-plugins/nekobi/artwork/aboutButtonHover.png similarity index 100% rename from source/modules/daz/nekobi/artwork/aboutButtonHover.png rename to source/modules/daz-plugins/nekobi/artwork/aboutButtonHover.png diff --git a/source/modules/daz/nekobi/artwork/aboutButtonNormal.png b/source/modules/daz-plugins/nekobi/artwork/aboutButtonNormal.png similarity index 100% rename from source/modules/daz/nekobi/artwork/aboutButtonNormal.png rename to source/modules/daz-plugins/nekobi/artwork/aboutButtonNormal.png diff --git a/source/modules/daz/nekobi/artwork/background.png b/source/modules/daz-plugins/nekobi/artwork/background.png similarity index 100% rename from source/modules/daz/nekobi/artwork/background.png rename to source/modules/daz-plugins/nekobi/artwork/background.png diff --git a/source/modules/daz/nekobi/artwork/claw1.png b/source/modules/daz-plugins/nekobi/artwork/claw1.png similarity index 100% rename from source/modules/daz/nekobi/artwork/claw1.png rename to source/modules/daz-plugins/nekobi/artwork/claw1.png diff --git a/source/modules/daz/nekobi/artwork/claw2.png b/source/modules/daz-plugins/nekobi/artwork/claw2.png similarity index 100% rename from source/modules/daz/nekobi/artwork/claw2.png rename to source/modules/daz-plugins/nekobi/artwork/claw2.png diff --git a/source/modules/daz/nekobi/artwork/knob.png b/source/modules/daz-plugins/nekobi/artwork/knob.png similarity index 100% rename from source/modules/daz/nekobi/artwork/knob.png rename to source/modules/daz-plugins/nekobi/artwork/knob.png diff --git a/source/modules/daz/nekobi/artwork/run1.png b/source/modules/daz-plugins/nekobi/artwork/run1.png similarity index 100% rename from source/modules/daz/nekobi/artwork/run1.png rename to source/modules/daz-plugins/nekobi/artwork/run1.png diff --git a/source/modules/daz/nekobi/artwork/run2.png b/source/modules/daz-plugins/nekobi/artwork/run2.png similarity index 100% rename from source/modules/daz/nekobi/artwork/run2.png rename to source/modules/daz-plugins/nekobi/artwork/run2.png diff --git a/source/modules/daz/nekobi/artwork/run3.png b/source/modules/daz-plugins/nekobi/artwork/run3.png similarity index 100% rename from source/modules/daz/nekobi/artwork/run3.png rename to source/modules/daz-plugins/nekobi/artwork/run3.png diff --git a/source/modules/daz/nekobi/artwork/run4.png b/source/modules/daz-plugins/nekobi/artwork/run4.png similarity index 100% rename from source/modules/daz/nekobi/artwork/run4.png rename to source/modules/daz-plugins/nekobi/artwork/run4.png diff --git a/source/modules/daz/nekobi/artwork/scratch1.png b/source/modules/daz-plugins/nekobi/artwork/scratch1.png similarity index 100% rename from source/modules/daz/nekobi/artwork/scratch1.png rename to source/modules/daz-plugins/nekobi/artwork/scratch1.png diff --git a/source/modules/daz/nekobi/artwork/scratch2.png b/source/modules/daz-plugins/nekobi/artwork/scratch2.png similarity index 100% rename from source/modules/daz/nekobi/artwork/scratch2.png rename to source/modules/daz-plugins/nekobi/artwork/scratch2.png diff --git a/source/modules/daz/nekobi/artwork/sit.png b/source/modules/daz-plugins/nekobi/artwork/sit.png similarity index 100% rename from source/modules/daz/nekobi/artwork/sit.png rename to source/modules/daz-plugins/nekobi/artwork/sit.png diff --git a/source/modules/daz/nekobi/artwork/slider.png b/source/modules/daz-plugins/nekobi/artwork/slider.png similarity index 100% rename from source/modules/daz/nekobi/artwork/slider.png rename to source/modules/daz-plugins/nekobi/artwork/slider.png diff --git a/source/modules/daz/nekobi/artwork/tail.png b/source/modules/daz-plugins/nekobi/artwork/tail.png similarity index 100% rename from source/modules/daz/nekobi/artwork/tail.png rename to source/modules/daz-plugins/nekobi/artwork/tail.png diff --git a/source/modules/daz/nekobi/nekobee-src/minblep_tables.c b/source/modules/daz-plugins/nekobi/nekobee-src/minblep_tables.c similarity index 100% rename from source/modules/daz/nekobi/nekobee-src/minblep_tables.c rename to source/modules/daz-plugins/nekobi/nekobee-src/minblep_tables.c diff --git a/source/modules/daz/nekobi/nekobee-src/nekobee.h b/source/modules/daz-plugins/nekobi/nekobee-src/nekobee.h similarity index 100% rename from source/modules/daz/nekobi/nekobee-src/nekobee.h rename to source/modules/daz-plugins/nekobi/nekobee-src/nekobee.h diff --git a/source/modules/daz/nekobi/nekobee-src/nekobee_synth.c b/source/modules/daz-plugins/nekobi/nekobee-src/nekobee_synth.c similarity index 100% rename from source/modules/daz/nekobi/nekobee-src/nekobee_synth.c rename to source/modules/daz-plugins/nekobi/nekobee-src/nekobee_synth.c diff --git a/source/modules/daz/nekobi/nekobee-src/nekobee_synth.h b/source/modules/daz-plugins/nekobi/nekobee-src/nekobee_synth.h similarity index 100% rename from source/modules/daz/nekobi/nekobee-src/nekobee_synth.h rename to source/modules/daz-plugins/nekobi/nekobee-src/nekobee_synth.h diff --git a/source/modules/daz/nekobi/nekobee-src/nekobee_types.h b/source/modules/daz-plugins/nekobi/nekobee-src/nekobee_types.h similarity index 100% rename from source/modules/daz/nekobi/nekobee-src/nekobee_types.h rename to source/modules/daz-plugins/nekobi/nekobee-src/nekobee_types.h diff --git a/source/modules/daz/nekobi/nekobee-src/nekobee_voice.c b/source/modules/daz-plugins/nekobi/nekobee-src/nekobee_voice.c similarity index 100% rename from source/modules/daz/nekobi/nekobee-src/nekobee_voice.c rename to source/modules/daz-plugins/nekobi/nekobee-src/nekobee_voice.c diff --git a/source/modules/daz/nekobi/nekobee-src/nekobee_voice.h b/source/modules/daz-plugins/nekobi/nekobee-src/nekobee_voice.h similarity index 100% rename from source/modules/daz/nekobi/nekobee-src/nekobee_voice.h rename to source/modules/daz-plugins/nekobi/nekobee-src/nekobee_voice.h diff --git a/source/modules/daz/nekobi/nekobee-src/nekobee_voice_render.c b/source/modules/daz-plugins/nekobi/nekobee-src/nekobee_voice_render.c similarity index 100% rename from source/modules/daz/nekobi/nekobee-src/nekobee_voice_render.c rename to source/modules/daz-plugins/nekobi/nekobee-src/nekobee_voice_render.c diff --git a/source/modules/daz/nekofilter.c b/source/modules/daz-plugins/nekofilter.c similarity index 100% rename from source/modules/daz/nekofilter.c rename to source/modules/daz-plugins/nekofilter.c diff --git a/source/modules/daz/nekofilter/filter.c b/source/modules/daz-plugins/nekofilter/filter.c similarity index 100% rename from source/modules/daz/nekofilter/filter.c rename to source/modules/daz-plugins/nekofilter/filter.c diff --git a/source/modules/daz/nekofilter/filter.h b/source/modules/daz-plugins/nekofilter/filter.h similarity index 100% rename from source/modules/daz/nekofilter/filter.h rename to source/modules/daz-plugins/nekofilter/filter.h diff --git a/source/modules/daz/nekofilter/log.c b/source/modules/daz-plugins/nekofilter/log.c similarity index 100% rename from source/modules/daz/nekofilter/log.c rename to source/modules/daz-plugins/nekofilter/log.c diff --git a/source/modules/daz/nekofilter/log.h b/source/modules/daz-plugins/nekofilter/log.h similarity index 100% rename from source/modules/daz/nekofilter/log.h rename to source/modules/daz-plugins/nekofilter/log.h diff --git a/source/modules/daz/nekofilter/nekofilter.c b/source/modules/daz-plugins/nekofilter/nekofilter.c similarity index 100% rename from source/modules/daz/nekofilter/nekofilter.c rename to source/modules/daz-plugins/nekofilter/nekofilter.c diff --git a/source/modules/daz/nekofilter/ui.c b/source/modules/daz-plugins/nekofilter/ui.c similarity index 100% rename from source/modules/daz/nekofilter/ui.c rename to source/modules/daz-plugins/nekofilter/ui.c diff --git a/source/modules/daz/notes/DistrhoPluginInfo.h b/source/modules/daz-plugins/notes/DistrhoPluginInfo.h similarity index 100% rename from source/modules/daz/notes/DistrhoPluginInfo.h rename to source/modules/daz-plugins/notes/DistrhoPluginInfo.h diff --git a/source/modules/daz/notes/DistrhoPluginNotes.cpp b/source/modules/daz-plugins/notes/DistrhoPluginNotes.cpp similarity index 100% rename from source/modules/daz/notes/DistrhoPluginNotes.cpp rename to source/modules/daz-plugins/notes/DistrhoPluginNotes.cpp diff --git a/source/modules/daz/notes/DistrhoPluginNotes.hpp b/source/modules/daz-plugins/notes/DistrhoPluginNotes.hpp similarity index 100% rename from source/modules/daz/notes/DistrhoPluginNotes.hpp rename to source/modules/daz-plugins/notes/DistrhoPluginNotes.hpp diff --git a/source/modules/daz/notes/DistrhoUINotes.cpp b/source/modules/daz-plugins/notes/DistrhoUINotes.cpp similarity index 100% rename from source/modules/daz/notes/DistrhoUINotes.cpp rename to source/modules/daz-plugins/notes/DistrhoUINotes.cpp diff --git a/source/modules/daz/notes/DistrhoUINotes.hpp b/source/modules/daz-plugins/notes/DistrhoUINotes.hpp similarity index 100% rename from source/modules/daz/notes/DistrhoUINotes.hpp rename to source/modules/daz-plugins/notes/DistrhoUINotes.hpp diff --git a/source/modules/daz/pingpongpan/DistrhoArtworkPingPongPan.cpp b/source/modules/daz-plugins/pingpongpan/DistrhoArtworkPingPongPan.cpp similarity index 100% rename from source/modules/daz/pingpongpan/DistrhoArtworkPingPongPan.cpp rename to source/modules/daz-plugins/pingpongpan/DistrhoArtworkPingPongPan.cpp diff --git a/source/modules/daz/pingpongpan/DistrhoArtworkPingPongPan.hpp b/source/modules/daz-plugins/pingpongpan/DistrhoArtworkPingPongPan.hpp similarity index 100% rename from source/modules/daz/pingpongpan/DistrhoArtworkPingPongPan.hpp rename to source/modules/daz-plugins/pingpongpan/DistrhoArtworkPingPongPan.hpp diff --git a/source/modules/daz/pingpongpan/DistrhoPluginInfo.h b/source/modules/daz-plugins/pingpongpan/DistrhoPluginInfo.h similarity index 100% rename from source/modules/daz/pingpongpan/DistrhoPluginInfo.h rename to source/modules/daz-plugins/pingpongpan/DistrhoPluginInfo.h diff --git a/source/modules/daz/pingpongpan/DistrhoPluginPingPongPan.cpp b/source/modules/daz-plugins/pingpongpan/DistrhoPluginPingPongPan.cpp similarity index 100% rename from source/modules/daz/pingpongpan/DistrhoPluginPingPongPan.cpp rename to source/modules/daz-plugins/pingpongpan/DistrhoPluginPingPongPan.cpp diff --git a/source/modules/daz/pingpongpan/DistrhoPluginPingPongPan.hpp b/source/modules/daz-plugins/pingpongpan/DistrhoPluginPingPongPan.hpp similarity index 100% rename from source/modules/daz/pingpongpan/DistrhoPluginPingPongPan.hpp rename to source/modules/daz-plugins/pingpongpan/DistrhoPluginPingPongPan.hpp diff --git a/source/modules/daz/pingpongpan/DistrhoUIPingPongPan.cpp b/source/modules/daz-plugins/pingpongpan/DistrhoUIPingPongPan.cpp similarity index 100% rename from source/modules/daz/pingpongpan/DistrhoUIPingPongPan.cpp rename to source/modules/daz-plugins/pingpongpan/DistrhoUIPingPongPan.cpp diff --git a/source/modules/daz/pingpongpan/DistrhoUIPingPongPan.hpp b/source/modules/daz-plugins/pingpongpan/DistrhoUIPingPongPan.hpp similarity index 100% rename from source/modules/daz/pingpongpan/DistrhoUIPingPongPan.hpp rename to source/modules/daz-plugins/pingpongpan/DistrhoUIPingPongPan.hpp diff --git a/source/modules/daz/pingpongpan/artwork/about.png b/source/modules/daz-plugins/pingpongpan/artwork/about.png similarity index 100% rename from source/modules/daz/pingpongpan/artwork/about.png rename to source/modules/daz-plugins/pingpongpan/artwork/about.png diff --git a/source/modules/daz/pingpongpan/artwork/aboutButtonHover.png b/source/modules/daz-plugins/pingpongpan/artwork/aboutButtonHover.png similarity index 100% rename from source/modules/daz/pingpongpan/artwork/aboutButtonHover.png rename to source/modules/daz-plugins/pingpongpan/artwork/aboutButtonHover.png diff --git a/source/modules/daz/pingpongpan/artwork/aboutButtonNormal.png b/source/modules/daz-plugins/pingpongpan/artwork/aboutButtonNormal.png similarity index 100% rename from source/modules/daz/pingpongpan/artwork/aboutButtonNormal.png rename to source/modules/daz-plugins/pingpongpan/artwork/aboutButtonNormal.png diff --git a/source/modules/daz/pingpongpan/artwork/background.png b/source/modules/daz-plugins/pingpongpan/artwork/background.png similarity index 100% rename from source/modules/daz/pingpongpan/artwork/background.png rename to source/modules/daz-plugins/pingpongpan/artwork/background.png diff --git a/source/modules/daz/pingpongpan/artwork/knob.png b/source/modules/daz-plugins/pingpongpan/artwork/knob.png similarity index 100% rename from source/modules/daz/pingpongpan/artwork/knob.png rename to source/modules/daz-plugins/pingpongpan/artwork/knob.png diff --git a/source/modules/daz/qtcreator/CarlaNative.pro b/source/modules/daz-plugins/qtcreator/CarlaNative.pro similarity index 100% rename from source/modules/daz/qtcreator/CarlaNative.pro rename to source/modules/daz-plugins/qtcreator/CarlaNative.pro diff --git a/source/modules/daz/qtcreator/main.c b/source/modules/daz-plugins/qtcreator/main.c similarity index 100% rename from source/modules/daz/qtcreator/main.c rename to source/modules/daz-plugins/qtcreator/main.c diff --git a/source/modules/daz/resources/bigmeter-ui b/source/modules/daz-plugins/resources/bigmeter-ui similarity index 100% rename from source/modules/daz/resources/bigmeter-ui rename to source/modules/daz-plugins/resources/bigmeter-ui diff --git a/source/modules/daz/resources/bigmeterM-ui b/source/modules/daz-plugins/resources/bigmeterM-ui similarity index 100% rename from source/modules/daz/resources/bigmeterM-ui rename to source/modules/daz-plugins/resources/bigmeterM-ui diff --git a/source/modules/daz/resources/carla-ui b/source/modules/daz-plugins/resources/carla-ui similarity index 100% rename from source/modules/daz/resources/carla-ui rename to source/modules/daz-plugins/resources/carla-ui diff --git a/source/modules/daz/resources/digitalpeakmeter.py b/source/modules/daz-plugins/resources/digitalpeakmeter.py similarity index 100% rename from source/modules/daz/resources/digitalpeakmeter.py rename to source/modules/daz-plugins/resources/digitalpeakmeter.py diff --git a/source/modules/daz/resources/externalui.py b/source/modules/daz-plugins/resources/externalui.py similarity index 100% rename from source/modules/daz/resources/externalui.py rename to source/modules/daz-plugins/resources/externalui.py diff --git a/source/modules/daz/resources/nekofilter-ui b/source/modules/daz-plugins/resources/nekofilter-ui similarity index 100% rename from source/modules/daz/resources/nekofilter-ui rename to source/modules/daz-plugins/resources/nekofilter-ui diff --git a/source/modules/daz/resources/nekofilter/lv2logo.png b/source/modules/daz-plugins/resources/nekofilter/lv2logo.png similarity index 100% rename from source/modules/daz/resources/nekofilter/lv2logo.png rename to source/modules/daz-plugins/resources/nekofilter/lv2logo.png diff --git a/source/modules/daz/resources/notes-ui b/source/modules/daz-plugins/resources/notes-ui similarity index 100% rename from source/modules/daz/resources/notes-ui rename to source/modules/daz-plugins/resources/notes-ui diff --git a/source/modules/daz/resources/paramspinbox.py b/source/modules/daz-plugins/resources/paramspinbox.py similarity index 100% rename from source/modules/daz/resources/paramspinbox.py rename to source/modules/daz-plugins/resources/paramspinbox.py diff --git a/source/modules/daz/resources/zynaddsubfx/black_key.png b/source/modules/daz-plugins/resources/zynaddsubfx/black_key.png similarity index 100% rename from source/modules/daz/resources/zynaddsubfx/black_key.png rename to source/modules/daz-plugins/resources/zynaddsubfx/black_key.png diff --git a/source/modules/daz/resources/zynaddsubfx/black_key_pressed.png b/source/modules/daz-plugins/resources/zynaddsubfx/black_key_pressed.png similarity index 100% rename from source/modules/daz/resources/zynaddsubfx/black_key_pressed.png rename to source/modules/daz-plugins/resources/zynaddsubfx/black_key_pressed.png diff --git a/source/modules/daz/resources/zynaddsubfx/knob.png b/source/modules/daz-plugins/resources/zynaddsubfx/knob.png similarity index 100% rename from source/modules/daz/resources/zynaddsubfx/knob.png rename to source/modules/daz-plugins/resources/zynaddsubfx/knob.png diff --git a/source/modules/daz/resources/zynaddsubfx/module_backdrop.png b/source/modules/daz-plugins/resources/zynaddsubfx/module_backdrop.png similarity index 100% rename from source/modules/daz/resources/zynaddsubfx/module_backdrop.png rename to source/modules/daz-plugins/resources/zynaddsubfx/module_backdrop.png diff --git a/source/modules/daz/resources/zynaddsubfx/white_key.png b/source/modules/daz-plugins/resources/zynaddsubfx/white_key.png similarity index 100% rename from source/modules/daz/resources/zynaddsubfx/white_key.png rename to source/modules/daz-plugins/resources/zynaddsubfx/white_key.png diff --git a/source/modules/daz/resources/zynaddsubfx/white_key_pressed.png b/source/modules/daz-plugins/resources/zynaddsubfx/white_key_pressed.png similarity index 100% rename from source/modules/daz/resources/zynaddsubfx/white_key_pressed.png rename to source/modules/daz-plugins/resources/zynaddsubfx/white_key_pressed.png diff --git a/source/modules/daz/resources/zynaddsubfx/window_backdrop.png b/source/modules/daz-plugins/resources/zynaddsubfx/window_backdrop.png similarity index 100% rename from source/modules/daz/resources/zynaddsubfx/window_backdrop.png rename to source/modules/daz-plugins/resources/zynaddsubfx/window_backdrop.png diff --git a/source/modules/daz/stereoenhancer/DistrhoArtworkStereoEnhancer.cpp b/source/modules/daz-plugins/stereoenhancer/DistrhoArtworkStereoEnhancer.cpp similarity index 100% rename from source/modules/daz/stereoenhancer/DistrhoArtworkStereoEnhancer.cpp rename to source/modules/daz-plugins/stereoenhancer/DistrhoArtworkStereoEnhancer.cpp diff --git a/source/modules/daz/stereoenhancer/DistrhoArtworkStereoEnhancer.hpp b/source/modules/daz-plugins/stereoenhancer/DistrhoArtworkStereoEnhancer.hpp similarity index 100% rename from source/modules/daz/stereoenhancer/DistrhoArtworkStereoEnhancer.hpp rename to source/modules/daz-plugins/stereoenhancer/DistrhoArtworkStereoEnhancer.hpp diff --git a/source/modules/daz/stereoenhancer/DistrhoPluginInfo.h b/source/modules/daz-plugins/stereoenhancer/DistrhoPluginInfo.h similarity index 100% rename from source/modules/daz/stereoenhancer/DistrhoPluginInfo.h rename to source/modules/daz-plugins/stereoenhancer/DistrhoPluginInfo.h diff --git a/source/modules/daz/stereoenhancer/DistrhoPluginStereoEnhancer.cpp b/source/modules/daz-plugins/stereoenhancer/DistrhoPluginStereoEnhancer.cpp similarity index 100% rename from source/modules/daz/stereoenhancer/DistrhoPluginStereoEnhancer.cpp rename to source/modules/daz-plugins/stereoenhancer/DistrhoPluginStereoEnhancer.cpp diff --git a/source/modules/daz/stereoenhancer/DistrhoPluginStereoEnhancer.hpp b/source/modules/daz-plugins/stereoenhancer/DistrhoPluginStereoEnhancer.hpp similarity index 100% rename from source/modules/daz/stereoenhancer/DistrhoPluginStereoEnhancer.hpp rename to source/modules/daz-plugins/stereoenhancer/DistrhoPluginStereoEnhancer.hpp diff --git a/source/modules/daz/stereoenhancer/DistrhoUIStereoEnhancer.cpp b/source/modules/daz-plugins/stereoenhancer/DistrhoUIStereoEnhancer.cpp similarity index 100% rename from source/modules/daz/stereoenhancer/DistrhoUIStereoEnhancer.cpp rename to source/modules/daz-plugins/stereoenhancer/DistrhoUIStereoEnhancer.cpp diff --git a/source/modules/daz/stereoenhancer/DistrhoUIStereoEnhancer.hpp b/source/modules/daz-plugins/stereoenhancer/DistrhoUIStereoEnhancer.hpp similarity index 100% rename from source/modules/daz/stereoenhancer/DistrhoUIStereoEnhancer.hpp rename to source/modules/daz-plugins/stereoenhancer/DistrhoUIStereoEnhancer.hpp diff --git a/source/modules/daz/stereoenhancer/artwork/about.png b/source/modules/daz-plugins/stereoenhancer/artwork/about.png similarity index 100% rename from source/modules/daz/stereoenhancer/artwork/about.png rename to source/modules/daz-plugins/stereoenhancer/artwork/about.png diff --git a/source/modules/daz/stereoenhancer/artwork/aboutButtonHover.png b/source/modules/daz-plugins/stereoenhancer/artwork/aboutButtonHover.png similarity index 100% rename from source/modules/daz/stereoenhancer/artwork/aboutButtonHover.png rename to source/modules/daz-plugins/stereoenhancer/artwork/aboutButtonHover.png diff --git a/source/modules/daz/stereoenhancer/artwork/aboutButtonNormal.png b/source/modules/daz-plugins/stereoenhancer/artwork/aboutButtonNormal.png similarity index 100% rename from source/modules/daz/stereoenhancer/artwork/aboutButtonNormal.png rename to source/modules/daz-plugins/stereoenhancer/artwork/aboutButtonNormal.png diff --git a/source/modules/daz/stereoenhancer/artwork/background.png b/source/modules/daz-plugins/stereoenhancer/artwork/background.png similarity index 100% rename from source/modules/daz/stereoenhancer/artwork/background.png rename to source/modules/daz-plugins/stereoenhancer/artwork/background.png diff --git a/source/modules/daz/stereoenhancer/artwork/knob.png b/source/modules/daz-plugins/stereoenhancer/artwork/knob.png similarity index 100% rename from source/modules/daz/stereoenhancer/artwork/knob.png rename to source/modules/daz-plugins/stereoenhancer/artwork/knob.png diff --git a/source/modules/daz/sunvox-file.cpp b/source/modules/daz-plugins/sunvox-file.cpp similarity index 100% rename from source/modules/daz/sunvox-file.cpp rename to source/modules/daz-plugins/sunvox-file.cpp diff --git a/source/modules/daz/vex-fx.cpp b/source/modules/daz-plugins/vex-fx.cpp similarity index 100% rename from source/modules/daz/vex-fx.cpp rename to source/modules/daz-plugins/vex-fx.cpp diff --git a/source/modules/daz/vex-src.cpp b/source/modules/daz-plugins/vex-src.cpp similarity index 100% rename from source/modules/daz/vex-src.cpp rename to source/modules/daz-plugins/vex-src.cpp diff --git a/source/modules/daz/vex-synth.cpp b/source/modules/daz-plugins/vex-synth.cpp similarity index 100% rename from source/modules/daz/vex-synth.cpp rename to source/modules/daz-plugins/vex-synth.cpp diff --git a/source/modules/daz/vex/PeggyViewComponent.h b/source/modules/daz-plugins/vex/PeggyViewComponent.h similarity index 100% rename from source/modules/daz/vex/PeggyViewComponent.h rename to source/modules/daz-plugins/vex/PeggyViewComponent.h diff --git a/source/modules/daz/vex/VexADSR.h b/source/modules/daz-plugins/vex/VexADSR.h similarity index 100% rename from source/modules/daz/vex/VexADSR.h rename to source/modules/daz-plugins/vex/VexADSR.h diff --git a/source/modules/daz/vex/VexArp.h b/source/modules/daz-plugins/vex/VexArp.h similarity index 100% rename from source/modules/daz/vex/VexArp.h rename to source/modules/daz-plugins/vex/VexArp.h diff --git a/source/modules/daz/vex/VexArpSettings.h b/source/modules/daz-plugins/vex/VexArpSettings.h similarity index 100% rename from source/modules/daz/vex/VexArpSettings.h rename to source/modules/daz-plugins/vex/VexArpSettings.h diff --git a/source/modules/daz/vex/VexChorus.h b/source/modules/daz-plugins/vex/VexChorus.h similarity index 100% rename from source/modules/daz/vex/VexChorus.h rename to source/modules/daz-plugins/vex/VexChorus.h diff --git a/source/modules/daz/vex/VexDelay.h b/source/modules/daz-plugins/vex/VexDelay.h similarity index 100% rename from source/modules/daz/vex/VexDelay.h rename to source/modules/daz-plugins/vex/VexDelay.h diff --git a/source/modules/daz/vex/VexReverb.h b/source/modules/daz-plugins/vex/VexReverb.h similarity index 100% rename from source/modules/daz/vex/VexReverb.h rename to source/modules/daz-plugins/vex/VexReverb.h diff --git a/source/modules/daz/vex/VexSyntModule.h b/source/modules/daz-plugins/vex/VexSyntModule.h similarity index 100% rename from source/modules/daz/vex/VexSyntModule.h rename to source/modules/daz-plugins/vex/VexSyntModule.h diff --git a/source/modules/daz/vex/VexVoice.cpp b/source/modules/daz-plugins/vex/VexVoice.cpp similarity index 100% rename from source/modules/daz/vex/VexVoice.cpp rename to source/modules/daz-plugins/vex/VexVoice.cpp diff --git a/source/modules/daz/vex/VexVoice.h b/source/modules/daz-plugins/vex/VexVoice.h similarity index 100% rename from source/modules/daz/vex/VexVoice.h rename to source/modules/daz-plugins/vex/VexVoice.h diff --git a/source/modules/daz/vex/VexWaveRenderer.cpp b/source/modules/daz-plugins/vex/VexWaveRenderer.cpp similarity index 100% rename from source/modules/daz/vex/VexWaveRenderer.cpp rename to source/modules/daz-plugins/vex/VexWaveRenderer.cpp diff --git a/source/modules/daz/vex/VexWaveRenderer.h b/source/modules/daz-plugins/vex/VexWaveRenderer.h similarity index 100% rename from source/modules/daz/vex/VexWaveRenderer.h rename to source/modules/daz-plugins/vex/VexWaveRenderer.h diff --git a/source/modules/daz/vex/freeverb/allpass.cpp b/source/modules/daz-plugins/vex/freeverb/allpass.cpp similarity index 100% rename from source/modules/daz/vex/freeverb/allpass.cpp rename to source/modules/daz-plugins/vex/freeverb/allpass.cpp diff --git a/source/modules/daz/vex/freeverb/allpass.hpp b/source/modules/daz-plugins/vex/freeverb/allpass.hpp similarity index 100% rename from source/modules/daz/vex/freeverb/allpass.hpp rename to source/modules/daz-plugins/vex/freeverb/allpass.hpp diff --git a/source/modules/daz/vex/freeverb/comb.cpp b/source/modules/daz-plugins/vex/freeverb/comb.cpp similarity index 100% rename from source/modules/daz/vex/freeverb/comb.cpp rename to source/modules/daz-plugins/vex/freeverb/comb.cpp diff --git a/source/modules/daz/vex/freeverb/comb.hpp b/source/modules/daz-plugins/vex/freeverb/comb.hpp similarity index 100% rename from source/modules/daz/vex/freeverb/comb.hpp rename to source/modules/daz-plugins/vex/freeverb/comb.hpp diff --git a/source/modules/daz/vex/freeverb/denormals.h b/source/modules/daz-plugins/vex/freeverb/denormals.h similarity index 100% rename from source/modules/daz/vex/freeverb/denormals.h rename to source/modules/daz-plugins/vex/freeverb/denormals.h diff --git a/source/modules/daz/vex/freeverb/revmodel.cpp b/source/modules/daz-plugins/vex/freeverb/revmodel.cpp similarity index 100% rename from source/modules/daz/vex/freeverb/revmodel.cpp rename to source/modules/daz-plugins/vex/freeverb/revmodel.cpp diff --git a/source/modules/daz/vex/freeverb/revmodel.hpp b/source/modules/daz-plugins/vex/freeverb/revmodel.hpp similarity index 100% rename from source/modules/daz/vex/freeverb/revmodel.hpp rename to source/modules/daz-plugins/vex/freeverb/revmodel.hpp diff --git a/source/modules/daz/vex/freeverb/tuning.h b/source/modules/daz-plugins/vex/freeverb/tuning.h similarity index 100% rename from source/modules/daz/vex/freeverb/tuning.h rename to source/modules/daz-plugins/vex/freeverb/tuning.h diff --git a/source/modules/daz/vex/gui/BoolGridComponent.h b/source/modules/daz-plugins/vex/gui/BoolGridComponent.h similarity index 100% rename from source/modules/daz/vex/gui/BoolGridComponent.h rename to source/modules/daz-plugins/vex/gui/BoolGridComponent.h diff --git a/source/modules/daz/vex/gui/SliderFieldComponent.h b/source/modules/daz-plugins/vex/gui/SliderFieldComponent.h similarity index 100% rename from source/modules/daz/vex/gui/SliderFieldComponent.h rename to source/modules/daz-plugins/vex/gui/SliderFieldComponent.h diff --git a/source/modules/daz/vex/gui/SnappingSlider.h b/source/modules/daz-plugins/vex/gui/SnappingSlider.h similarity index 100% rename from source/modules/daz/vex/gui/SnappingSlider.h rename to source/modules/daz-plugins/vex/gui/SnappingSlider.h diff --git a/source/modules/daz/vex/lookandfeel/MyLookAndFeel.cpp b/source/modules/daz-plugins/vex/lookandfeel/MyLookAndFeel.cpp similarity index 100% rename from source/modules/daz/vex/lookandfeel/MyLookAndFeel.cpp rename to source/modules/daz-plugins/vex/lookandfeel/MyLookAndFeel.cpp diff --git a/source/modules/daz/vex/lookandfeel/MyLookAndFeel.h b/source/modules/daz-plugins/vex/lookandfeel/MyLookAndFeel.h similarity index 100% rename from source/modules/daz/vex/lookandfeel/MyLookAndFeel.h rename to source/modules/daz-plugins/vex/lookandfeel/MyLookAndFeel.h diff --git a/source/modules/daz/vex/resources/Resources.cpp b/source/modules/daz-plugins/vex/resources/Resources.cpp similarity index 100% rename from source/modules/daz/vex/resources/Resources.cpp rename to source/modules/daz-plugins/vex/resources/Resources.cpp diff --git a/source/modules/daz/vex/resources/Resources.h b/source/modules/daz-plugins/vex/resources/Resources.h similarity index 100% rename from source/modules/daz/vex/resources/Resources.h rename to source/modules/daz-plugins/vex/resources/Resources.h diff --git a/source/modules/daz/vex/resources/old/ResourceFile.cpp.old b/source/modules/daz-plugins/vex/resources/old/ResourceFile.cpp.old similarity index 100% rename from source/modules/daz/vex/resources/old/ResourceFile.cpp.old rename to source/modules/daz-plugins/vex/resources/old/ResourceFile.cpp.old diff --git a/source/modules/daz/vex/resources/old/Resources.cpp.old b/source/modules/daz-plugins/vex/resources/old/Resources.cpp.old similarity index 100% rename from source/modules/daz/vex/resources/old/Resources.cpp.old rename to source/modules/daz-plugins/vex/resources/old/Resources.cpp.old diff --git a/source/modules/daz/zynaddsubfx-fx.cpp b/source/modules/daz-plugins/zynaddsubfx-fx.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx-fx.cpp rename to source/modules/daz-plugins/zynaddsubfx-fx.cpp diff --git a/source/modules/daz/zynaddsubfx-src.cpp b/source/modules/daz-plugins/zynaddsubfx-src.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx-src.cpp rename to source/modules/daz-plugins/zynaddsubfx-src.cpp diff --git a/source/modules/daz/zynaddsubfx-synth.cpp b/source/modules/daz-plugins/zynaddsubfx-synth.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx-synth.cpp rename to source/modules/daz-plugins/zynaddsubfx-synth.cpp diff --git a/source/modules/daz/zynaddsubfx-ui.cpp b/source/modules/daz-plugins/zynaddsubfx-ui.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx-ui.cpp rename to source/modules/daz-plugins/zynaddsubfx-ui.cpp diff --git a/source/modules/daz/zynaddsubfx/CMakeLists.txt b/source/modules/daz-plugins/zynaddsubfx/CMakeLists.txt similarity index 100% rename from source/modules/daz/zynaddsubfx/CMakeLists.txt rename to source/modules/daz-plugins/zynaddsubfx/CMakeLists.txt diff --git a/source/modules/daz/zynaddsubfx/DSP/AnalogFilter.cpp b/source/modules/daz-plugins/zynaddsubfx/DSP/AnalogFilter.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/AnalogFilter.cpp rename to source/modules/daz-plugins/zynaddsubfx/DSP/AnalogFilter.cpp diff --git a/source/modules/daz/zynaddsubfx/DSP/AnalogFilter.h b/source/modules/daz-plugins/zynaddsubfx/DSP/AnalogFilter.h similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/AnalogFilter.h rename to source/modules/daz-plugins/zynaddsubfx/DSP/AnalogFilter.h diff --git a/source/modules/daz/zynaddsubfx/DSP/CMakeLists.txt b/source/modules/daz-plugins/zynaddsubfx/DSP/CMakeLists.txt similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/CMakeLists.txt rename to source/modules/daz-plugins/zynaddsubfx/DSP/CMakeLists.txt diff --git a/source/modules/daz/zynaddsubfx/DSP/FFTwrapper.cpp b/source/modules/daz-plugins/zynaddsubfx/DSP/FFTwrapper.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/FFTwrapper.cpp rename to source/modules/daz-plugins/zynaddsubfx/DSP/FFTwrapper.cpp diff --git a/source/modules/daz/zynaddsubfx/DSP/FFTwrapper.h b/source/modules/daz-plugins/zynaddsubfx/DSP/FFTwrapper.h similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/FFTwrapper.h rename to source/modules/daz-plugins/zynaddsubfx/DSP/FFTwrapper.h diff --git a/source/modules/daz/zynaddsubfx/DSP/Filter.cpp b/source/modules/daz-plugins/zynaddsubfx/DSP/Filter.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/Filter.cpp rename to source/modules/daz-plugins/zynaddsubfx/DSP/Filter.cpp diff --git a/source/modules/daz/zynaddsubfx/DSP/Filter.h b/source/modules/daz-plugins/zynaddsubfx/DSP/Filter.h similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/Filter.h rename to source/modules/daz-plugins/zynaddsubfx/DSP/Filter.h diff --git a/source/modules/daz/zynaddsubfx/DSP/FormantFilter.cpp b/source/modules/daz-plugins/zynaddsubfx/DSP/FormantFilter.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/FormantFilter.cpp rename to source/modules/daz-plugins/zynaddsubfx/DSP/FormantFilter.cpp diff --git a/source/modules/daz/zynaddsubfx/DSP/FormantFilter.h b/source/modules/daz-plugins/zynaddsubfx/DSP/FormantFilter.h similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/FormantFilter.h rename to source/modules/daz-plugins/zynaddsubfx/DSP/FormantFilter.h diff --git a/source/modules/daz/zynaddsubfx/DSP/SVFilter.cpp b/source/modules/daz-plugins/zynaddsubfx/DSP/SVFilter.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/SVFilter.cpp rename to source/modules/daz-plugins/zynaddsubfx/DSP/SVFilter.cpp diff --git a/source/modules/daz/zynaddsubfx/DSP/SVFilter.h b/source/modules/daz-plugins/zynaddsubfx/DSP/SVFilter.h similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/SVFilter.h rename to source/modules/daz-plugins/zynaddsubfx/DSP/SVFilter.h diff --git a/source/modules/daz/zynaddsubfx/DSP/Unison.cpp b/source/modules/daz-plugins/zynaddsubfx/DSP/Unison.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/Unison.cpp rename to source/modules/daz-plugins/zynaddsubfx/DSP/Unison.cpp diff --git a/source/modules/daz/zynaddsubfx/DSP/Unison.h b/source/modules/daz-plugins/zynaddsubfx/DSP/Unison.h similarity index 100% rename from source/modules/daz/zynaddsubfx/DSP/Unison.h rename to source/modules/daz-plugins/zynaddsubfx/DSP/Unison.h diff --git a/source/modules/daz/zynaddsubfx/Effects/Alienwah.cpp b/source/modules/daz-plugins/zynaddsubfx/Effects/Alienwah.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Alienwah.cpp rename to source/modules/daz-plugins/zynaddsubfx/Effects/Alienwah.cpp diff --git a/source/modules/daz/zynaddsubfx/Effects/Alienwah.h b/source/modules/daz-plugins/zynaddsubfx/Effects/Alienwah.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Alienwah.h rename to source/modules/daz-plugins/zynaddsubfx/Effects/Alienwah.h diff --git a/source/modules/daz/zynaddsubfx/Effects/CMakeLists.txt b/source/modules/daz-plugins/zynaddsubfx/Effects/CMakeLists.txt similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/CMakeLists.txt rename to source/modules/daz-plugins/zynaddsubfx/Effects/CMakeLists.txt diff --git a/source/modules/daz/zynaddsubfx/Effects/Chorus.cpp b/source/modules/daz-plugins/zynaddsubfx/Effects/Chorus.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Chorus.cpp rename to source/modules/daz-plugins/zynaddsubfx/Effects/Chorus.cpp diff --git a/source/modules/daz/zynaddsubfx/Effects/Chorus.h b/source/modules/daz-plugins/zynaddsubfx/Effects/Chorus.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Chorus.h rename to source/modules/daz-plugins/zynaddsubfx/Effects/Chorus.h diff --git a/source/modules/daz/zynaddsubfx/Effects/Distorsion.cpp b/source/modules/daz-plugins/zynaddsubfx/Effects/Distorsion.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Distorsion.cpp rename to source/modules/daz-plugins/zynaddsubfx/Effects/Distorsion.cpp diff --git a/source/modules/daz/zynaddsubfx/Effects/Distorsion.h b/source/modules/daz-plugins/zynaddsubfx/Effects/Distorsion.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Distorsion.h rename to source/modules/daz-plugins/zynaddsubfx/Effects/Distorsion.h diff --git a/source/modules/daz/zynaddsubfx/Effects/DynamicFilter.cpp b/source/modules/daz-plugins/zynaddsubfx/Effects/DynamicFilter.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/DynamicFilter.cpp rename to source/modules/daz-plugins/zynaddsubfx/Effects/DynamicFilter.cpp diff --git a/source/modules/daz/zynaddsubfx/Effects/DynamicFilter.h b/source/modules/daz-plugins/zynaddsubfx/Effects/DynamicFilter.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/DynamicFilter.h rename to source/modules/daz-plugins/zynaddsubfx/Effects/DynamicFilter.h diff --git a/source/modules/daz/zynaddsubfx/Effects/EQ.cpp b/source/modules/daz-plugins/zynaddsubfx/Effects/EQ.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/EQ.cpp rename to source/modules/daz-plugins/zynaddsubfx/Effects/EQ.cpp diff --git a/source/modules/daz/zynaddsubfx/Effects/EQ.h b/source/modules/daz-plugins/zynaddsubfx/Effects/EQ.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/EQ.h rename to source/modules/daz-plugins/zynaddsubfx/Effects/EQ.h diff --git a/source/modules/daz/zynaddsubfx/Effects/Echo.cpp b/source/modules/daz-plugins/zynaddsubfx/Effects/Echo.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Echo.cpp rename to source/modules/daz-plugins/zynaddsubfx/Effects/Echo.cpp diff --git a/source/modules/daz/zynaddsubfx/Effects/Echo.h b/source/modules/daz-plugins/zynaddsubfx/Effects/Echo.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Echo.h rename to source/modules/daz-plugins/zynaddsubfx/Effects/Echo.h diff --git a/source/modules/daz/zynaddsubfx/Effects/Effect.cpp b/source/modules/daz-plugins/zynaddsubfx/Effects/Effect.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Effect.cpp rename to source/modules/daz-plugins/zynaddsubfx/Effects/Effect.cpp diff --git a/source/modules/daz/zynaddsubfx/Effects/Effect.h b/source/modules/daz-plugins/zynaddsubfx/Effects/Effect.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Effect.h rename to source/modules/daz-plugins/zynaddsubfx/Effects/Effect.h diff --git a/source/modules/daz/zynaddsubfx/Effects/EffectLFO.cpp b/source/modules/daz-plugins/zynaddsubfx/Effects/EffectLFO.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/EffectLFO.cpp rename to source/modules/daz-plugins/zynaddsubfx/Effects/EffectLFO.cpp diff --git a/source/modules/daz/zynaddsubfx/Effects/EffectLFO.h b/source/modules/daz-plugins/zynaddsubfx/Effects/EffectLFO.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/EffectLFO.h rename to source/modules/daz-plugins/zynaddsubfx/Effects/EffectLFO.h diff --git a/source/modules/daz/zynaddsubfx/Effects/EffectMgr.cpp b/source/modules/daz-plugins/zynaddsubfx/Effects/EffectMgr.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/EffectMgr.cpp rename to source/modules/daz-plugins/zynaddsubfx/Effects/EffectMgr.cpp diff --git a/source/modules/daz/zynaddsubfx/Effects/EffectMgr.h b/source/modules/daz-plugins/zynaddsubfx/Effects/EffectMgr.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/EffectMgr.h rename to source/modules/daz-plugins/zynaddsubfx/Effects/EffectMgr.h diff --git a/source/modules/daz/zynaddsubfx/Effects/Phaser.cpp b/source/modules/daz-plugins/zynaddsubfx/Effects/Phaser.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Phaser.cpp rename to source/modules/daz-plugins/zynaddsubfx/Effects/Phaser.cpp diff --git a/source/modules/daz/zynaddsubfx/Effects/Phaser.h b/source/modules/daz-plugins/zynaddsubfx/Effects/Phaser.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Phaser.h rename to source/modules/daz-plugins/zynaddsubfx/Effects/Phaser.h diff --git a/source/modules/daz/zynaddsubfx/Effects/Reverb.cpp b/source/modules/daz-plugins/zynaddsubfx/Effects/Reverb.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Reverb.cpp rename to source/modules/daz-plugins/zynaddsubfx/Effects/Reverb.cpp diff --git a/source/modules/daz/zynaddsubfx/Effects/Reverb.h b/source/modules/daz-plugins/zynaddsubfx/Effects/Reverb.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Effects/Reverb.h rename to source/modules/daz-plugins/zynaddsubfx/Effects/Reverb.h diff --git a/source/modules/daz/zynaddsubfx/Misc/Bank.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/Bank.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Bank.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/Bank.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/Bank.h b/source/modules/daz-plugins/zynaddsubfx/Misc/Bank.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Bank.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/Bank.h diff --git a/source/modules/daz/zynaddsubfx/Misc/CMakeLists.txt b/source/modules/daz-plugins/zynaddsubfx/Misc/CMakeLists.txt similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/CMakeLists.txt rename to source/modules/daz-plugins/zynaddsubfx/Misc/CMakeLists.txt diff --git a/source/modules/daz/zynaddsubfx/Misc/Config.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/Config.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Config.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/Config.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/Config.h b/source/modules/daz-plugins/zynaddsubfx/Misc/Config.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Config.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/Config.h diff --git a/source/modules/daz/zynaddsubfx/Misc/Control.h b/source/modules/daz-plugins/zynaddsubfx/Misc/Control.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Control.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/Control.h diff --git a/source/modules/daz/zynaddsubfx/Misc/Dump.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/Dump.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Dump.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/Dump.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/Dump.h b/source/modules/daz-plugins/zynaddsubfx/Misc/Dump.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Dump.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/Dump.h diff --git a/source/modules/daz/zynaddsubfx/Misc/LASHClient.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/LASHClient.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/LASHClient.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/LASHClient.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/LASHClient.h b/source/modules/daz-plugins/zynaddsubfx/Misc/LASHClient.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/LASHClient.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/LASHClient.h diff --git a/source/modules/daz/zynaddsubfx/Misc/Master.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/Master.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Master.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/Master.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/Master.h b/source/modules/daz-plugins/zynaddsubfx/Misc/Master.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Master.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/Master.h diff --git a/source/modules/daz/zynaddsubfx/Misc/Microtonal.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/Microtonal.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Microtonal.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/Microtonal.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/Microtonal.h b/source/modules/daz-plugins/zynaddsubfx/Misc/Microtonal.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Microtonal.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/Microtonal.h diff --git a/source/modules/daz/zynaddsubfx/Misc/Part.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/Part.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Part.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/Part.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/Part.h b/source/modules/daz-plugins/zynaddsubfx/Misc/Part.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Part.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/Part.h diff --git a/source/modules/daz/zynaddsubfx/Misc/Recorder.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/Recorder.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Recorder.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/Recorder.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/Recorder.h b/source/modules/daz-plugins/zynaddsubfx/Misc/Recorder.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Recorder.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/Recorder.h diff --git a/source/modules/daz/zynaddsubfx/Misc/Stereo.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/Stereo.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Stereo.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/Stereo.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/Stereo.h b/source/modules/daz-plugins/zynaddsubfx/Misc/Stereo.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Stereo.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/Stereo.h diff --git a/source/modules/daz/zynaddsubfx/Misc/Util.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/Util.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Util.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/Util.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/Util.h b/source/modules/daz-plugins/zynaddsubfx/Misc/Util.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/Util.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/Util.h diff --git a/source/modules/daz/zynaddsubfx/Misc/WavFile.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/WavFile.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/WavFile.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/WavFile.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/WavFile.h b/source/modules/daz-plugins/zynaddsubfx/Misc/WavFile.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/WavFile.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/WavFile.h diff --git a/source/modules/daz/zynaddsubfx/Misc/WaveShapeSmps.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/WaveShapeSmps.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/WaveShapeSmps.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/WaveShapeSmps.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/WaveShapeSmps.h b/source/modules/daz-plugins/zynaddsubfx/Misc/WaveShapeSmps.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/WaveShapeSmps.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/WaveShapeSmps.h diff --git a/source/modules/daz/zynaddsubfx/Misc/XMLwrapper.cpp b/source/modules/daz-plugins/zynaddsubfx/Misc/XMLwrapper.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/XMLwrapper.cpp rename to source/modules/daz-plugins/zynaddsubfx/Misc/XMLwrapper.cpp diff --git a/source/modules/daz/zynaddsubfx/Misc/XMLwrapper.h b/source/modules/daz-plugins/zynaddsubfx/Misc/XMLwrapper.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Misc/XMLwrapper.h rename to source/modules/daz-plugins/zynaddsubfx/Misc/XMLwrapper.h diff --git a/source/modules/daz/zynaddsubfx/Nio/AlsaEngine.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/AlsaEngine.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/AlsaEngine.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/AlsaEngine.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/AlsaEngine.h b/source/modules/daz-plugins/zynaddsubfx/Nio/AlsaEngine.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/AlsaEngine.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/AlsaEngine.h diff --git a/source/modules/daz/zynaddsubfx/Nio/AudioOut.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/AudioOut.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/AudioOut.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/AudioOut.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/AudioOut.h b/source/modules/daz-plugins/zynaddsubfx/Nio/AudioOut.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/AudioOut.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/AudioOut.h diff --git a/source/modules/daz/zynaddsubfx/Nio/CMakeLists.txt b/source/modules/daz-plugins/zynaddsubfx/Nio/CMakeLists.txt similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/CMakeLists.txt rename to source/modules/daz-plugins/zynaddsubfx/Nio/CMakeLists.txt diff --git a/source/modules/daz/zynaddsubfx/Nio/Engine.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/Engine.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/Engine.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/Engine.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/Engine.h b/source/modules/daz-plugins/zynaddsubfx/Nio/Engine.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/Engine.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/Engine.h diff --git a/source/modules/daz/zynaddsubfx/Nio/EngineMgr.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/EngineMgr.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/EngineMgr.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/EngineMgr.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/EngineMgr.h b/source/modules/daz-plugins/zynaddsubfx/Nio/EngineMgr.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/EngineMgr.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/EngineMgr.h diff --git a/source/modules/daz/zynaddsubfx/Nio/InMgr.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/InMgr.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/InMgr.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/InMgr.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/InMgr.h b/source/modules/daz-plugins/zynaddsubfx/Nio/InMgr.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/InMgr.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/InMgr.h diff --git a/source/modules/daz/zynaddsubfx/Nio/JackEngine.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/JackEngine.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/JackEngine.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/JackEngine.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/JackEngine.h b/source/modules/daz-plugins/zynaddsubfx/Nio/JackEngine.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/JackEngine.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/JackEngine.h diff --git a/source/modules/daz/zynaddsubfx/Nio/MidiIn.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/MidiIn.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/MidiIn.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/MidiIn.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/MidiIn.h b/source/modules/daz-plugins/zynaddsubfx/Nio/MidiIn.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/MidiIn.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/MidiIn.h diff --git a/source/modules/daz/zynaddsubfx/Nio/Nio.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/Nio.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/Nio.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/Nio.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/Nio.h b/source/modules/daz-plugins/zynaddsubfx/Nio/Nio.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/Nio.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/Nio.h diff --git a/source/modules/daz/zynaddsubfx/Nio/NulEngine.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/NulEngine.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/NulEngine.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/NulEngine.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/NulEngine.h b/source/modules/daz-plugins/zynaddsubfx/Nio/NulEngine.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/NulEngine.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/NulEngine.h diff --git a/source/modules/daz/zynaddsubfx/Nio/OssEngine.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/OssEngine.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/OssEngine.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/OssEngine.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/OssEngine.h b/source/modules/daz-plugins/zynaddsubfx/Nio/OssEngine.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/OssEngine.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/OssEngine.h diff --git a/source/modules/daz/zynaddsubfx/Nio/OutMgr.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/OutMgr.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/OutMgr.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/OutMgr.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/OutMgr.h b/source/modules/daz-plugins/zynaddsubfx/Nio/OutMgr.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/OutMgr.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/OutMgr.h diff --git a/source/modules/daz/zynaddsubfx/Nio/PaEngine.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/PaEngine.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/PaEngine.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/PaEngine.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/PaEngine.h b/source/modules/daz-plugins/zynaddsubfx/Nio/PaEngine.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/PaEngine.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/PaEngine.h diff --git a/source/modules/daz/zynaddsubfx/Nio/SafeQueue.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/SafeQueue.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/SafeQueue.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/SafeQueue.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/SafeQueue.h b/source/modules/daz-plugins/zynaddsubfx/Nio/SafeQueue.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/SafeQueue.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/SafeQueue.h diff --git a/source/modules/daz/zynaddsubfx/Nio/WavEngine.cpp b/source/modules/daz-plugins/zynaddsubfx/Nio/WavEngine.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/WavEngine.cpp rename to source/modules/daz-plugins/zynaddsubfx/Nio/WavEngine.cpp diff --git a/source/modules/daz/zynaddsubfx/Nio/WavEngine.h b/source/modules/daz-plugins/zynaddsubfx/Nio/WavEngine.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Nio/WavEngine.h rename to source/modules/daz-plugins/zynaddsubfx/Nio/WavEngine.h diff --git a/source/modules/daz/zynaddsubfx/Output/DSSIaudiooutput.cpp b/source/modules/daz-plugins/zynaddsubfx/Output/DSSIaudiooutput.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Output/DSSIaudiooutput.cpp rename to source/modules/daz-plugins/zynaddsubfx/Output/DSSIaudiooutput.cpp diff --git a/source/modules/daz/zynaddsubfx/Output/DSSIaudiooutput.h b/source/modules/daz-plugins/zynaddsubfx/Output/DSSIaudiooutput.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Output/DSSIaudiooutput.h rename to source/modules/daz-plugins/zynaddsubfx/Output/DSSIaudiooutput.h diff --git a/source/modules/daz/zynaddsubfx/Params/ADnoteParameters.cpp b/source/modules/daz-plugins/zynaddsubfx/Params/ADnoteParameters.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/ADnoteParameters.cpp rename to source/modules/daz-plugins/zynaddsubfx/Params/ADnoteParameters.cpp diff --git a/source/modules/daz/zynaddsubfx/Params/ADnoteParameters.h b/source/modules/daz-plugins/zynaddsubfx/Params/ADnoteParameters.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/ADnoteParameters.h rename to source/modules/daz-plugins/zynaddsubfx/Params/ADnoteParameters.h diff --git a/source/modules/daz/zynaddsubfx/Params/CMakeLists.txt b/source/modules/daz-plugins/zynaddsubfx/Params/CMakeLists.txt similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/CMakeLists.txt rename to source/modules/daz-plugins/zynaddsubfx/Params/CMakeLists.txt diff --git a/source/modules/daz/zynaddsubfx/Params/Controller.cpp b/source/modules/daz-plugins/zynaddsubfx/Params/Controller.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/Controller.cpp rename to source/modules/daz-plugins/zynaddsubfx/Params/Controller.cpp diff --git a/source/modules/daz/zynaddsubfx/Params/Controller.h b/source/modules/daz-plugins/zynaddsubfx/Params/Controller.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/Controller.h rename to source/modules/daz-plugins/zynaddsubfx/Params/Controller.h diff --git a/source/modules/daz/zynaddsubfx/Params/EnvelopeParams.cpp b/source/modules/daz-plugins/zynaddsubfx/Params/EnvelopeParams.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/EnvelopeParams.cpp rename to source/modules/daz-plugins/zynaddsubfx/Params/EnvelopeParams.cpp diff --git a/source/modules/daz/zynaddsubfx/Params/EnvelopeParams.h b/source/modules/daz-plugins/zynaddsubfx/Params/EnvelopeParams.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/EnvelopeParams.h rename to source/modules/daz-plugins/zynaddsubfx/Params/EnvelopeParams.h diff --git a/source/modules/daz/zynaddsubfx/Params/FilterParams.cpp b/source/modules/daz-plugins/zynaddsubfx/Params/FilterParams.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/FilterParams.cpp rename to source/modules/daz-plugins/zynaddsubfx/Params/FilterParams.cpp diff --git a/source/modules/daz/zynaddsubfx/Params/FilterParams.h b/source/modules/daz-plugins/zynaddsubfx/Params/FilterParams.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/FilterParams.h rename to source/modules/daz-plugins/zynaddsubfx/Params/FilterParams.h diff --git a/source/modules/daz/zynaddsubfx/Params/LFOParams.cpp b/source/modules/daz-plugins/zynaddsubfx/Params/LFOParams.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/LFOParams.cpp rename to source/modules/daz-plugins/zynaddsubfx/Params/LFOParams.cpp diff --git a/source/modules/daz/zynaddsubfx/Params/LFOParams.h b/source/modules/daz-plugins/zynaddsubfx/Params/LFOParams.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/LFOParams.h rename to source/modules/daz-plugins/zynaddsubfx/Params/LFOParams.h diff --git a/source/modules/daz/zynaddsubfx/Params/PADnoteParameters.cpp b/source/modules/daz-plugins/zynaddsubfx/Params/PADnoteParameters.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/PADnoteParameters.cpp rename to source/modules/daz-plugins/zynaddsubfx/Params/PADnoteParameters.cpp diff --git a/source/modules/daz/zynaddsubfx/Params/PADnoteParameters.h b/source/modules/daz-plugins/zynaddsubfx/Params/PADnoteParameters.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/PADnoteParameters.h rename to source/modules/daz-plugins/zynaddsubfx/Params/PADnoteParameters.h diff --git a/source/modules/daz/zynaddsubfx/Params/Presets.cpp b/source/modules/daz-plugins/zynaddsubfx/Params/Presets.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/Presets.cpp rename to source/modules/daz-plugins/zynaddsubfx/Params/Presets.cpp diff --git a/source/modules/daz/zynaddsubfx/Params/Presets.h b/source/modules/daz-plugins/zynaddsubfx/Params/Presets.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/Presets.h rename to source/modules/daz-plugins/zynaddsubfx/Params/Presets.h diff --git a/source/modules/daz/zynaddsubfx/Params/PresetsArray.cpp b/source/modules/daz-plugins/zynaddsubfx/Params/PresetsArray.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/PresetsArray.cpp rename to source/modules/daz-plugins/zynaddsubfx/Params/PresetsArray.cpp diff --git a/source/modules/daz/zynaddsubfx/Params/PresetsArray.h b/source/modules/daz-plugins/zynaddsubfx/Params/PresetsArray.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/PresetsArray.h rename to source/modules/daz-plugins/zynaddsubfx/Params/PresetsArray.h diff --git a/source/modules/daz/zynaddsubfx/Params/PresetsStore.cpp b/source/modules/daz-plugins/zynaddsubfx/Params/PresetsStore.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/PresetsStore.cpp rename to source/modules/daz-plugins/zynaddsubfx/Params/PresetsStore.cpp diff --git a/source/modules/daz/zynaddsubfx/Params/PresetsStore.h b/source/modules/daz-plugins/zynaddsubfx/Params/PresetsStore.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/PresetsStore.h rename to source/modules/daz-plugins/zynaddsubfx/Params/PresetsStore.h diff --git a/source/modules/daz/zynaddsubfx/Params/SUBnoteParameters.cpp b/source/modules/daz-plugins/zynaddsubfx/Params/SUBnoteParameters.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/SUBnoteParameters.cpp rename to source/modules/daz-plugins/zynaddsubfx/Params/SUBnoteParameters.cpp diff --git a/source/modules/daz/zynaddsubfx/Params/SUBnoteParameters.h b/source/modules/daz-plugins/zynaddsubfx/Params/SUBnoteParameters.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Params/SUBnoteParameters.h rename to source/modules/daz-plugins/zynaddsubfx/Params/SUBnoteParameters.h diff --git a/source/modules/daz/zynaddsubfx/Synth/ADnote.cpp b/source/modules/daz-plugins/zynaddsubfx/Synth/ADnote.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/ADnote.cpp rename to source/modules/daz-plugins/zynaddsubfx/Synth/ADnote.cpp diff --git a/source/modules/daz/zynaddsubfx/Synth/ADnote.h b/source/modules/daz-plugins/zynaddsubfx/Synth/ADnote.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/ADnote.h rename to source/modules/daz-plugins/zynaddsubfx/Synth/ADnote.h diff --git a/source/modules/daz/zynaddsubfx/Synth/CMakeLists.txt b/source/modules/daz-plugins/zynaddsubfx/Synth/CMakeLists.txt similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/CMakeLists.txt rename to source/modules/daz-plugins/zynaddsubfx/Synth/CMakeLists.txt diff --git a/source/modules/daz/zynaddsubfx/Synth/Envelope.cpp b/source/modules/daz-plugins/zynaddsubfx/Synth/Envelope.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/Envelope.cpp rename to source/modules/daz-plugins/zynaddsubfx/Synth/Envelope.cpp diff --git a/source/modules/daz/zynaddsubfx/Synth/Envelope.h b/source/modules/daz-plugins/zynaddsubfx/Synth/Envelope.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/Envelope.h rename to source/modules/daz-plugins/zynaddsubfx/Synth/Envelope.h diff --git a/source/modules/daz/zynaddsubfx/Synth/LFO.cpp b/source/modules/daz-plugins/zynaddsubfx/Synth/LFO.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/LFO.cpp rename to source/modules/daz-plugins/zynaddsubfx/Synth/LFO.cpp diff --git a/source/modules/daz/zynaddsubfx/Synth/LFO.h b/source/modules/daz-plugins/zynaddsubfx/Synth/LFO.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/LFO.h rename to source/modules/daz-plugins/zynaddsubfx/Synth/LFO.h diff --git a/source/modules/daz/zynaddsubfx/Synth/OscilGen.cpp b/source/modules/daz-plugins/zynaddsubfx/Synth/OscilGen.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/OscilGen.cpp rename to source/modules/daz-plugins/zynaddsubfx/Synth/OscilGen.cpp diff --git a/source/modules/daz/zynaddsubfx/Synth/OscilGen.h b/source/modules/daz-plugins/zynaddsubfx/Synth/OscilGen.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/OscilGen.h rename to source/modules/daz-plugins/zynaddsubfx/Synth/OscilGen.h diff --git a/source/modules/daz/zynaddsubfx/Synth/PADnote.cpp b/source/modules/daz-plugins/zynaddsubfx/Synth/PADnote.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/PADnote.cpp rename to source/modules/daz-plugins/zynaddsubfx/Synth/PADnote.cpp diff --git a/source/modules/daz/zynaddsubfx/Synth/PADnote.h b/source/modules/daz-plugins/zynaddsubfx/Synth/PADnote.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/PADnote.h rename to source/modules/daz-plugins/zynaddsubfx/Synth/PADnote.h diff --git a/source/modules/daz/zynaddsubfx/Synth/Resonance.cpp b/source/modules/daz-plugins/zynaddsubfx/Synth/Resonance.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/Resonance.cpp rename to source/modules/daz-plugins/zynaddsubfx/Synth/Resonance.cpp diff --git a/source/modules/daz/zynaddsubfx/Synth/Resonance.h b/source/modules/daz-plugins/zynaddsubfx/Synth/Resonance.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/Resonance.h rename to source/modules/daz-plugins/zynaddsubfx/Synth/Resonance.h diff --git a/source/modules/daz/zynaddsubfx/Synth/SUBnote.cpp b/source/modules/daz-plugins/zynaddsubfx/Synth/SUBnote.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/SUBnote.cpp rename to source/modules/daz-plugins/zynaddsubfx/Synth/SUBnote.cpp diff --git a/source/modules/daz/zynaddsubfx/Synth/SUBnote.h b/source/modules/daz-plugins/zynaddsubfx/Synth/SUBnote.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/SUBnote.h rename to source/modules/daz-plugins/zynaddsubfx/Synth/SUBnote.h diff --git a/source/modules/daz/zynaddsubfx/Synth/SynthNote.cpp b/source/modules/daz-plugins/zynaddsubfx/Synth/SynthNote.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/SynthNote.cpp rename to source/modules/daz-plugins/zynaddsubfx/Synth/SynthNote.cpp diff --git a/source/modules/daz/zynaddsubfx/Synth/SynthNote.h b/source/modules/daz-plugins/zynaddsubfx/Synth/SynthNote.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Synth/SynthNote.h rename to source/modules/daz-plugins/zynaddsubfx/Synth/SynthNote.h diff --git a/source/modules/daz/zynaddsubfx/Tests/AdNoteTest.h b/source/modules/daz-plugins/zynaddsubfx/Tests/AdNoteTest.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/AdNoteTest.h rename to source/modules/daz-plugins/zynaddsubfx/Tests/AdNoteTest.h diff --git a/source/modules/daz/zynaddsubfx/Tests/CMakeLists.txt b/source/modules/daz-plugins/zynaddsubfx/Tests/CMakeLists.txt similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/CMakeLists.txt rename to source/modules/daz-plugins/zynaddsubfx/Tests/CMakeLists.txt diff --git a/source/modules/daz/zynaddsubfx/Tests/ControllerTest.h b/source/modules/daz-plugins/zynaddsubfx/Tests/ControllerTest.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/ControllerTest.h rename to source/modules/daz-plugins/zynaddsubfx/Tests/ControllerTest.h diff --git a/source/modules/daz/zynaddsubfx/Tests/EchoTest.h b/source/modules/daz-plugins/zynaddsubfx/Tests/EchoTest.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/EchoTest.h rename to source/modules/daz-plugins/zynaddsubfx/Tests/EchoTest.h diff --git a/source/modules/daz/zynaddsubfx/Tests/MicrotonalTest.h b/source/modules/daz-plugins/zynaddsubfx/Tests/MicrotonalTest.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/MicrotonalTest.h rename to source/modules/daz-plugins/zynaddsubfx/Tests/MicrotonalTest.h diff --git a/source/modules/daz/zynaddsubfx/Tests/OscilGenTest.h b/source/modules/daz-plugins/zynaddsubfx/Tests/OscilGenTest.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/OscilGenTest.h rename to source/modules/daz-plugins/zynaddsubfx/Tests/OscilGenTest.h diff --git a/source/modules/daz/zynaddsubfx/Tests/PadNoteTest.h b/source/modules/daz-plugins/zynaddsubfx/Tests/PadNoteTest.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/PadNoteTest.h rename to source/modules/daz-plugins/zynaddsubfx/Tests/PadNoteTest.h diff --git a/source/modules/daz/zynaddsubfx/Tests/PluginTest.h b/source/modules/daz-plugins/zynaddsubfx/Tests/PluginTest.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/PluginTest.h rename to source/modules/daz-plugins/zynaddsubfx/Tests/PluginTest.h diff --git a/source/modules/daz/zynaddsubfx/Tests/RandTest.h b/source/modules/daz-plugins/zynaddsubfx/Tests/RandTest.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/RandTest.h rename to source/modules/daz-plugins/zynaddsubfx/Tests/RandTest.h diff --git a/source/modules/daz/zynaddsubfx/Tests/SubNoteTest.h b/source/modules/daz-plugins/zynaddsubfx/Tests/SubNoteTest.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/SubNoteTest.h rename to source/modules/daz-plugins/zynaddsubfx/Tests/SubNoteTest.h diff --git a/source/modules/daz/zynaddsubfx/Tests/XMLwrapperTest.h b/source/modules/daz-plugins/zynaddsubfx/Tests/XMLwrapperTest.h similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/XMLwrapperTest.h rename to source/modules/daz-plugins/zynaddsubfx/Tests/XMLwrapperTest.h diff --git a/source/modules/daz/zynaddsubfx/Tests/guitar-adnote.xmz b/source/modules/daz-plugins/zynaddsubfx/Tests/guitar-adnote.xmz similarity index 100% rename from source/modules/daz/zynaddsubfx/Tests/guitar-adnote.xmz rename to source/modules/daz-plugins/zynaddsubfx/Tests/guitar-adnote.xmz diff --git a/source/modules/daz/zynaddsubfx/UI/ADnoteUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/ADnoteUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/ADnoteUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/ADnoteUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/BankUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/BankUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/BankUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/BankUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/CMakeLists.txt b/source/modules/daz-plugins/zynaddsubfx/UI/CMakeLists.txt similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/CMakeLists.txt rename to source/modules/daz-plugins/zynaddsubfx/UI/CMakeLists.txt diff --git a/source/modules/daz/zynaddsubfx/UI/ConfigUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/ConfigUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/ConfigUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/ConfigUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/EffUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/EffUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/EffUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/EffUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/EnvelopeUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/EnvelopeUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/EnvelopeUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/EnvelopeUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/FilterUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/FilterUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/FilterUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/FilterUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/LFOUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/LFOUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/LFOUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/LFOUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/MasterUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/MasterUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/MasterUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/MasterUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/MicrotonalUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/MicrotonalUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/MicrotonalUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/MicrotonalUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/NSM.C b/source/modules/daz-plugins/zynaddsubfx/UI/NSM.C similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/NSM.C rename to source/modules/daz-plugins/zynaddsubfx/UI/NSM.C diff --git a/source/modules/daz/zynaddsubfx/UI/NSM.H b/source/modules/daz-plugins/zynaddsubfx/UI/NSM.H similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/NSM.H rename to source/modules/daz-plugins/zynaddsubfx/UI/NSM.H diff --git a/source/modules/daz/zynaddsubfx/UI/NSM/Client.C b/source/modules/daz-plugins/zynaddsubfx/UI/NSM/Client.C similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/NSM/Client.C rename to source/modules/daz-plugins/zynaddsubfx/UI/NSM/Client.C diff --git a/source/modules/daz/zynaddsubfx/UI/NSM/Client.H b/source/modules/daz-plugins/zynaddsubfx/UI/NSM/Client.H similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/NSM/Client.H rename to source/modules/daz-plugins/zynaddsubfx/UI/NSM/Client.H diff --git a/source/modules/daz/zynaddsubfx/UI/NioUI.cpp b/source/modules/daz-plugins/zynaddsubfx/UI/NioUI.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/NioUI.cpp rename to source/modules/daz-plugins/zynaddsubfx/UI/NioUI.cpp diff --git a/source/modules/daz/zynaddsubfx/UI/NioUI.h b/source/modules/daz-plugins/zynaddsubfx/UI/NioUI.h similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/NioUI.h rename to source/modules/daz-plugins/zynaddsubfx/UI/NioUI.h diff --git a/source/modules/daz/zynaddsubfx/UI/OscilGenUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/OscilGenUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/OscilGenUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/OscilGenUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/PADnoteUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/PADnoteUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/PADnoteUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/PADnoteUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/PartUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/PartUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/PartUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/PartUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/PresetsUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/PresetsUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/PresetsUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/PresetsUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/ResonanceUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/ResonanceUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/ResonanceUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/ResonanceUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/SUBnoteUI.fl b/source/modules/daz-plugins/zynaddsubfx/UI/SUBnoteUI.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/SUBnoteUI.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/SUBnoteUI.fl diff --git a/source/modules/daz/zynaddsubfx/UI/VirKeyboard.fl b/source/modules/daz-plugins/zynaddsubfx/UI/VirKeyboard.fl similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/VirKeyboard.fl rename to source/modules/daz-plugins/zynaddsubfx/UI/VirKeyboard.fl diff --git a/source/modules/daz/zynaddsubfx/UI/WidgetPDial.cpp b/source/modules/daz-plugins/zynaddsubfx/UI/WidgetPDial.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/WidgetPDial.cpp rename to source/modules/daz-plugins/zynaddsubfx/UI/WidgetPDial.cpp diff --git a/source/modules/daz/zynaddsubfx/UI/WidgetPDial.h b/source/modules/daz-plugins/zynaddsubfx/UI/WidgetPDial.h similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/WidgetPDial.h rename to source/modules/daz-plugins/zynaddsubfx/UI/WidgetPDial.h diff --git a/source/modules/daz/zynaddsubfx/UI/common.H b/source/modules/daz-plugins/zynaddsubfx/UI/common.H similarity index 100% rename from source/modules/daz/zynaddsubfx/UI/common.H rename to source/modules/daz-plugins/zynaddsubfx/UI/common.H diff --git a/source/modules/daz/zynaddsubfx/globals.h b/source/modules/daz-plugins/zynaddsubfx/globals.h similarity index 100% rename from source/modules/daz/zynaddsubfx/globals.h rename to source/modules/daz-plugins/zynaddsubfx/globals.h diff --git a/source/modules/daz/zynaddsubfx/main.cpp b/source/modules/daz-plugins/zynaddsubfx/main.cpp similarity index 100% rename from source/modules/daz/zynaddsubfx/main.cpp rename to source/modules/daz-plugins/zynaddsubfx/main.cpp diff --git a/source/plugin/Makefile b/source/plugin/Makefile index 5caa2e9d3..f39cf809b 100644 --- a/source/plugin/Makefile +++ b/source/plugin/Makefile @@ -93,7 +93,7 @@ endif LIBS += ../backend/carla_engine_plugin.a LIBS += ../backend/carla_plugin.a -LIBS += ../modules/daz.a +LIBS += ../modules/daz-plugins.a LIBS += ../modules/jackbridge.a LIBS += ../modules/rtmempool.a diff --git a/source/tests/Makefile b/source/tests/Makefile index 83fb43d70..4bbe3b7d2 100644 --- a/source/tests/Makefile +++ b/source/tests/Makefile @@ -62,7 +62,7 @@ Engine: Engine.cpp $(CXX) $< \ ../backend/standalone/CarlaStandalone.cpp.o \ -Wl,--start-group \ - ../backend/carla_engine.a ../backend/carla_plugin.a ../modules/daz.a \ + ../backend/carla_engine.a ../backend/carla_plugin.a ../modules/daz-plugins.a \ ../modules/dgl.a ../modules/jackbridge.a ../modules/lilv.a ../modules/rtmempool.a ../modules/rtaudio.a ../modules/rtmidi.a \ -Wl,--end-group \ $(PEDANTIC_CXX_FLAGS) $(shell pkg-config --libs alsa libpulse-simple liblo QtCore QtXml fluidsynth linuxsampler x11 gl smf fftw3 mxml zlib ntk_images ntk) -o $@ @@ -109,11 +109,11 @@ debug: # -------------------------------------------------------------- DISTRHO: DISTRHO.cpp ../modules/distrho/*.hpp ../modules/distrho/src/*.cpp - $(CXX) $< ../modules/dgl.a $(PEDANTIC_CXX_FLAGS) -I../modules/distrho -I../modules/daz/nekobi $(LINK_FLAGS) $(DGL_LIBS) -lpthread -o $@ + $(CXX) $< ../modules/dgl.a $(PEDANTIC_CXX_FLAGS) -I../modules/distrho -I../modules/daz-plugins/nekobi $(LINK_FLAGS) $(DGL_LIBS) -lpthread -o $@ ./DISTRHO DISTRHO.so: DISTRHO.cpp ../modules/distrho/*.hpp ../modules/distrho/src/*.cpp - $(CXX) $< ../modules/dgl.a $(PEDANTIC_CXX_FLAGS) -I../modules/distrho -I../modules/daz/nekobi -DSHARED_DLL $(LINK_FLAGS) $(DGL_LIBS) -lpthread -shared -Wl,--no-undefined -o $@ + $(CXX) $< ../modules/dgl.a $(PEDANTIC_CXX_FLAGS) -I../modules/distrho -I../modules/daz-plugins/nekobi -DSHARED_DLL $(LINK_FLAGS) $(DGL_LIBS) -lpthread -shared -Wl,--no-undefined -o $@ DGL: DGL.cpp ../modules/distrho/dgl/src/Window.cpp $(CXX) $< $(PEDANTIC_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) -o $@