diff --git a/.gitignore b/.gitignore
index 45617be..41ee4d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,11 +40,13 @@ c++/xycontroller/cadence-xycontroller
 
 c++/carla-includes/vst/
 
+doc/caitlib/
 doc/carla-backend/
 doc/carla-bridge/
 doc/carla-engine/
 doc/carla-native/
 doc/carla-plugin/
+doc/distrho/
 
 *-build-*Debug/
 *-build-*Release/
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/dssi b/c++/carla-engine/distrho-plugin-toolkit/src/dssi
deleted file mode 120000
index 7293726..0000000
--- a/c++/carla-engine/distrho-plugin-toolkit/src/dssi
+++ /dev/null
@@ -1 +0,0 @@
-../../../carla-includes/dssi
\ No newline at end of file
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/ladspa b/c++/carla-engine/distrho-plugin-toolkit/src/ladspa
deleted file mode 120000
index 361ed56..0000000
--- a/c++/carla-engine/distrho-plugin-toolkit/src/ladspa
+++ /dev/null
@@ -1 +0,0 @@
-../../../carla-includes/ladspa
\ No newline at end of file
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/lv2-sdk b/c++/carla-engine/distrho-plugin-toolkit/src/lv2-sdk
deleted file mode 120000
index e7df02c..0000000
--- a/c++/carla-engine/distrho-plugin-toolkit/src/lv2-sdk
+++ /dev/null
@@ -1 +0,0 @@
-../../../carla-includes/lv2
\ No newline at end of file
diff --git a/c++/carla-engine/distrho-plugin-toolkit/DistrhoPlugin.h b/c++/distrho-plugin-toolkit/DistrhoPlugin.h
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/DistrhoPlugin.h
rename to c++/distrho-plugin-toolkit/DistrhoPlugin.h
diff --git a/c++/carla-engine/distrho-plugin-toolkit/DistrhoPluginMain.cpp b/c++/distrho-plugin-toolkit/DistrhoPluginMain.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/DistrhoPluginMain.cpp
rename to c++/distrho-plugin-toolkit/DistrhoPluginMain.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/DistrhoUI.h b/c++/distrho-plugin-toolkit/DistrhoUI.h
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/DistrhoUI.h
rename to c++/distrho-plugin-toolkit/DistrhoUI.h
diff --git a/c++/carla-engine/distrho-plugin-toolkit/DistrhoUIMain.cpp b/c++/distrho-plugin-toolkit/DistrhoUIMain.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/DistrhoUIMain.cpp
rename to c++/distrho-plugin-toolkit/DistrhoUIMain.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/DistrhoUIOpenGL.h b/c++/distrho-plugin-toolkit/DistrhoUIOpenGL.h
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/DistrhoUIOpenGL.h
rename to c++/distrho-plugin-toolkit/DistrhoUIOpenGL.h
diff --git a/c++/carla-engine/distrho-plugin-toolkit/DistrhoUIOpenGLExt.h b/c++/distrho-plugin-toolkit/DistrhoUIOpenGLExt.h
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/DistrhoUIOpenGLExt.h
rename to c++/distrho-plugin-toolkit/DistrhoUIOpenGLExt.h
diff --git a/c++/carla-engine/distrho-plugin-toolkit/DistrhoUIQt4.h b/c++/distrho-plugin-toolkit/DistrhoUIQt4.h
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/DistrhoUIQt4.h
rename to c++/distrho-plugin-toolkit/DistrhoUIQt4.h
diff --git a/c++/carla-engine/distrho-plugin-toolkit/DistrhoUtils.h b/c++/distrho-plugin-toolkit/DistrhoUtils.h
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/DistrhoUtils.h
rename to c++/distrho-plugin-toolkit/DistrhoUtils.h
diff --git a/c++/distrho-plugin-toolkit/Makefile b/c++/distrho-plugin-toolkit/Makefile
new file mode 100644
index 0000000..d8b38f4
--- /dev/null
+++ b/c++/distrho-plugin-toolkit/Makefile
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+# Makefile for distrho (docs) #
+# ----------------------------------------- #
+# Created by falkTX
+#
+
+all:
+
+doxygen: distrho.doxygen
+	doxygen $<
diff --git a/c++/carla-engine/distrho-plugin-toolkit/distrho.doxygen b/c++/distrho-plugin-toolkit/distrho.doxygen
similarity index 97%
rename from c++/carla-engine/distrho-plugin-toolkit/distrho.doxygen
rename to c++/distrho-plugin-toolkit/distrho.doxygen
index f59a49a..7b36584 100644
--- a/c++/carla-engine/distrho-plugin-toolkit/distrho.doxygen
+++ b/c++/distrho-plugin-toolkit/distrho.doxygen
@@ -8,7 +8,7 @@ PROJECT_NAME           = "DISTRHO Plugin Toolkit"
 PROJECT_NUMBER         =
 PROJECT_BRIEF          =
 PROJECT_LOGO           =
-OUTPUT_DIRECTORY       = doxygen
+OUTPUT_DIRECTORY       = ../../doc/distrho
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
@@ -99,7 +99,7 @@ INPUT                  =
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = NO
-EXCLUDE                =
+EXCLUDE                = DistrhoPluginMain.cpp DistrhoUIMain.cpp
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       =
 EXCLUDE_SYMBOLS        =
@@ -132,7 +132,7 @@ IGNORE_PREFIX          =
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
-HTML_OUTPUT            = html
+HTML_OUTPUT            = .
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            =
 HTML_FOOTER            =
@@ -242,8 +242,8 @@ SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
 PREDEFINED             = DOXYGEN \
-                         DISTRHO_PLUGIN_TARGET_LADSPA DISTRHO_PLUGIN_TARGET_DSSI DISTRHO_PLUGIN_TARGET_LV2 DISTRHO_PLUGIN_TARGET_VST \
-                         DISTRHO_PLUGIN_HAS_UI DISTRHO_PLUGIN_IS_SYNTH DISTRHO_PLUGIN_WANT_PROGRAMS DISTRHO_PLUGIN_WANT_STATE
+                         DISTRHO_PLUGIN_HAS_UI DISTRHO_PLUGIN_IS_SYNTH DISTRHO_PLUGIN_WANT_PROGRAMS DISTRHO_PLUGIN_WANT_STATE \
+                         DISTRHO_UI_OPENGL DISTRHO_UI_QT4
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoDefines.h b/c++/distrho-plugin-toolkit/src/DistrhoDefines.h
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoDefines.h
rename to c++/distrho-plugin-toolkit/src/DistrhoDefines.h
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPlugin.cpp b/c++/distrho-plugin-toolkit/src/DistrhoPlugin.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPlugin.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoPlugin.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginInternal.h b/c++/distrho-plugin-toolkit/src/DistrhoPluginInternal.h
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginInternal.h
rename to c++/distrho-plugin-toolkit/src/DistrhoPluginInternal.h
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginJACK.cpp b/c++/distrho-plugin-toolkit/src/DistrhoPluginJACK.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginJACK.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoPluginJACK.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLADSPA+DSSI.cpp b/c++/distrho-plugin-toolkit/src/DistrhoPluginLADSPA+DSSI.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLADSPA+DSSI.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoPluginLADSPA+DSSI.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLV2.cpp b/c++/distrho-plugin-toolkit/src/DistrhoPluginLV2.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLV2.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoPluginLV2.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLV2export.cpp b/c++/distrho-plugin-toolkit/src/DistrhoPluginLV2export.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginLV2export.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoPluginLV2export.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginVST.cpp b/c++/distrho-plugin-toolkit/src/DistrhoPluginVST.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoPluginVST.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoPluginVST.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUI.cpp b/c++/distrho-plugin-toolkit/src/DistrhoUI.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUI.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoUI.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIDSSI.cpp b/c++/distrho-plugin-toolkit/src/DistrhoUIDSSI.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIDSSI.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoUIDSSI.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIInternal.h b/c++/distrho-plugin-toolkit/src/DistrhoUIInternal.h
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIInternal.h
rename to c++/distrho-plugin-toolkit/src/DistrhoUIInternal.h
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUILV2.cpp b/c++/distrho-plugin-toolkit/src/DistrhoUILV2.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUILV2.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoUILV2.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIOpenGL.cpp b/c++/distrho-plugin-toolkit/src/DistrhoUIOpenGL.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIOpenGL.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoUIOpenGL.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIOpenGLExt.cpp b/c++/distrho-plugin-toolkit/src/DistrhoUIOpenGLExt.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIOpenGLExt.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoUIOpenGLExt.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIQt4.cpp b/c++/distrho-plugin-toolkit/src/DistrhoUIQt4.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/DistrhoUIQt4.cpp
rename to c++/distrho-plugin-toolkit/src/DistrhoUIQt4.cpp
diff --git a/c++/distrho-plugin-toolkit/src/dssi b/c++/distrho-plugin-toolkit/src/dssi
new file mode 120000
index 0000000..d24f92d
--- /dev/null
+++ b/c++/distrho-plugin-toolkit/src/dssi
@@ -0,0 +1 @@
+../../carla-includes/dssi
\ No newline at end of file
diff --git a/c++/distrho-plugin-toolkit/src/ladspa b/c++/distrho-plugin-toolkit/src/ladspa
new file mode 120000
index 0000000..82ac1d3
--- /dev/null
+++ b/c++/distrho-plugin-toolkit/src/ladspa
@@ -0,0 +1 @@
+../../carla-includes/ladspa
\ No newline at end of file
diff --git a/c++/distrho-plugin-toolkit/src/lv2-sdk b/c++/distrho-plugin-toolkit/src/lv2-sdk
new file mode 120000
index 0000000..d6ae4a4
--- /dev/null
+++ b/c++/distrho-plugin-toolkit/src/lv2-sdk
@@ -0,0 +1 @@
+../../carla-includes/lv2
\ No newline at end of file
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl.h b/c++/distrho-plugin-toolkit/src/pugl/pugl.h
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl.h
rename to c++/distrho-plugin-toolkit/src/pugl/pugl.h
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_internal.h b/c++/distrho-plugin-toolkit/src/pugl/pugl_internal.h
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_internal.h
rename to c++/distrho-plugin-toolkit/src/pugl/pugl_internal.h
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_osx.m b/c++/distrho-plugin-toolkit/src/pugl/pugl_osx.m
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_osx.m
rename to c++/distrho-plugin-toolkit/src/pugl/pugl_osx.m
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_win.cpp b/c++/distrho-plugin-toolkit/src/pugl/pugl_win.cpp
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_win.cpp
rename to c++/distrho-plugin-toolkit/src/pugl/pugl_win.cpp
diff --git a/c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_x11.c b/c++/distrho-plugin-toolkit/src/pugl/pugl_x11.c
similarity index 100%
rename from c++/carla-engine/distrho-plugin-toolkit/src/pugl/pugl_x11.c
rename to c++/distrho-plugin-toolkit/src/pugl/pugl_x11.c