diff --git a/recipes-musicians/lv2/files/0001-Fix-build-for-python3-only-environments.patch b/recipes-musicians/lv2/files/0001-Fix-build-for-python3-only-environments.patch
new file mode 100644
index 0000000..dba8df3
--- /dev/null
+++ b/recipes-musicians/lv2/files/0001-Fix-build-for-python3-only-environments.patch
@@ -0,0 +1,25 @@
+From 1c871f1154cd67b00f1fc41d49fb94bddbf4b714 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Fri, 6 Dec 2019 18:11:09 +0100
+Subject: [PATCH] Fix build for python3-only environments
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Thanks for upgrading waflib
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ waf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/waf b/waf
+index 887215c..2538272 100755
+--- a/waf
++++ b/waf
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ # Minimal waf script for projects that include waflib directly
+ 
diff --git a/recipes-musicians/drobilla/lilv.bb b/recipes-musicians/lv2/lilv.bb
similarity index 100%
rename from recipes-musicians/drobilla/lilv.bb
rename to recipes-musicians/lv2/lilv.bb
diff --git a/recipes-musicians/drobilla/lv2-native.bb b/recipes-musicians/lv2/lv2-native.bb
similarity index 100%
rename from recipes-musicians/drobilla/lv2-native.bb
rename to recipes-musicians/lv2/lv2-native.bb
diff --git a/recipes-musicians/drobilla/lv2.bb b/recipes-musicians/lv2/lv2.bb
similarity index 100%
rename from recipes-musicians/drobilla/lv2.bb
rename to recipes-musicians/lv2/lv2.bb
diff --git a/recipes-musicians/drobilla/lv2.inc b/recipes-musicians/lv2/lv2.inc
similarity index 100%
rename from recipes-musicians/drobilla/lv2.inc
rename to recipes-musicians/lv2/lv2.inc
diff --git a/recipes-musicians/drobilla/lv2/0001-Output-more-details-on-import-error-to-catch-missing.patch b/recipes-musicians/lv2/lv2/0001-Output-more-details-on-import-error-to-catch-missing.patch
similarity index 100%
rename from recipes-musicians/drobilla/lv2/0001-Output-more-details-on-import-error-to-catch-missing.patch
rename to recipes-musicians/lv2/lv2/0001-Output-more-details-on-import-error-to-catch-missing.patch
diff --git a/recipes-musicians/drobilla/sratom_git.bb b/recipes-musicians/lv2/sratom.bb
similarity index 90%
rename from recipes-musicians/drobilla/sratom_git.bb
rename to recipes-musicians/lv2/sratom.bb
index 134ecb3..5aeb651 100644
--- a/recipes-musicians/drobilla/sratom_git.bb
+++ b/recipes-musicians/lv2/sratom.bb
@@ -8,7 +8,7 @@ inherit waf pkgconfig
 DEPENDS += "lv2 serd sord"
 
 SRC_URI = " \
-    gitsm://github.com/drobilla/sratom.git \
+    gitsm://github.com/lv2/sratom.git \
     file://0001-Fix-build-for-python3-only-environments.patch \
 "
 SRCREV = "2a585c391df6d8d9b0c92e850eab891b6a8f74f3"
diff --git a/recipes-musicians/drobilla/suil_git.bb b/recipes-musicians/lv2/suil.bb
similarity index 92%
rename from recipes-musicians/drobilla/suil_git.bb
rename to recipes-musicians/lv2/suil.bb
index 44ebd38..bd7ec5e 100644
--- a/recipes-musicians/drobilla/suil_git.bb
+++ b/recipes-musicians/lv2/suil.bb
@@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 DEPENDS = "gtk+ gtk+3 qtbase lv2"
 
 SRC_URI = " \
-    gitsm://github.com/drobilla/suil.git \
+    gitsm://github.com/lv2/suil.git \
     file://0001-Fix-build-for-python3-only-environments.patch \
 "
 SRCREV = "5d45fda230192d47a4afadecdf3dce038b8d6fe9"
diff --git a/recipes-support/packagegroups/musicians-world.bb b/recipes-support/packagegroups/musicians-world.bb
index 0f43f9e..6a03edc 100644
--- a/recipes-support/packagegroups/musicians-world.bb
+++ b/recipes-support/packagegroups/musicians-world.bb
@@ -37,14 +37,10 @@ RDEPENDS_${PN} += " \
     ganv \
     ingen-lv2 ingen-standalone \
     jalv \
-    lilv \
-    lv2 \
     mda-lv2 \
     patchage \
     serd \
     sord \
-    sratom \
-    suil \
     \
     \
     drumgizmo \
@@ -86,6 +82,14 @@ RDEPENDS_${PN} += " \
     lmms \
     lrdf \
     lsp-plugins-standalone lsp-plugins-ladspa lsp-plugins-lv2 lsp-plugins-vst \
+    \
+    \
+    lilv \
+    lv2 \
+    sratom \
+    suil \
+    \
+    \
     mixxx \
     muse \
     nekobee \