diff --git a/recipes-gtk/nwg-shell/azote-palettes_1.0.2.bb b/recipes-gtk/nwg-shell/azote/azote-palettes_1.0.2.bb
similarity index 100%
rename from recipes-gtk/nwg-shell/azote-palettes_1.0.2.bb
rename to recipes-gtk/nwg-shell/azote/azote-palettes_1.0.2.bb
diff --git a/recipes-gtk/nwg-shell/azote_1.16.0.bb b/recipes-gtk/nwg-shell/azote/azote_1.16.0.bb
similarity index 100%
rename from recipes-gtk/nwg-shell/azote_1.16.0.bb
rename to recipes-gtk/nwg-shell/azote/azote_1.16.0.bb
diff --git a/recipes-gtk/nwg-shell/ddcpopup/ddcpopup-go-mods.inc b/recipes-gtk/nwg-shell/ddcpopup/ddcpopup-go-mods.inc
new file mode 100644
index 0000000..245f258
--- /dev/null
+++ b/recipes-gtk/nwg-shell/ddcpopup/ddcpopup-go-mods.inc
@@ -0,0 +1,16 @@
+
+# This file has been generated by go-mod-update-modules.bbclass
+#
+# Do not modify it by hand, as the contents will be replaced when
+# running the update-modules task.
+
+SRC_URI += "\
+    gomod://github.com/allan-simon/go-singleinstance;version=v0.0.0-20210120080615-d0997106ab37;sha256sum=99115651f7df4f4b9956ca5af927e06d8fe8aac7b13f52f4a130ac4d7e237ad9 \
+    gomod://github.com/davecgh/go-spew;version=v1.1.1;mod=1;sha256sum=bcb29393251237b79a17b6c19bf29134f43e8f438c3198988fcd461a1cdf05cc \
+    gomod://github.com/dlasky/gotk3-layershell;version=v0.0.0-20210827021656-e6ecab2731f7;sha256sum=ded1454081eba18a34a64811c6fb7b44a81875c49945aa7dfb5594889f9c808c \
+    gomod://github.com/gotk3/gotk3;version=v0.6.1;sha256sum=61a2d027cea272dbbcebb5ac6114fd3230cac6e54b16451c3597db3961b64380 \
+    gomod://github.com/pmezard/go-difflib;version=v1.0.0;mod=1;sha256sum=74b2e766eb215377864d587badf57e95521f692d2a7860b3c7759093f9c9bec2 \
+    gomod://github.com/sirupsen/logrus;version=v1.8.1;sha256sum=8caec32e0aba1b95effc69d645b50f937137f78f0d0534b149f017dc0164a354 \
+    gomod://github.com/stretchr/testify;version=v1.2.2;mod=1;sha256sum=4ab463f68c370041f950c10cab5104903d4598c50cf824f9aad1b7b7f69255af \
+    gomod://golang.org/x/sys;version=v0.0.0-20191026070338-33540a1f6037;sha256sum=cd0ef9c0a4e8a9ee9269c4787eeefa4e1225ac4367bb444ffa8d53a3ae98879e \
+"
diff --git a/recipes-gtk/nwg-shell/ddcpopup/ddcpopup-licenses.inc b/recipes-gtk/nwg-shell/ddcpopup/ddcpopup-licenses.inc
new file mode 100644
index 0000000..9a96a35
--- /dev/null
+++ b/recipes-gtk/nwg-shell/ddcpopup/ddcpopup-licenses.inc
@@ -0,0 +1,14 @@
+
+# This file has been generated by go-mod-update-modules.bbclass
+#
+# Do not modify it by hand, as the contents will be replaced when
+# running the update-modules task.
+
+LICENSE += "& BSD-3-Clause & ISC & MIT"
+
+LIC_FILES_CHKSUM += "\
+    file://pkg/mod/github.com/allan-simon/go-singleinstance@v0.0.0-20210120080615-d0997106ab37/LICENSE;md5=64080d7ce40e2ef2eee4754706a437c4;spdx=MIT \
+    file://pkg/mod/github.com/gotk3/gotk3@v0.6.1/LICENSE;md5=82d02ae7d63483ef7474e8f4f95d687e;spdx=ISC \
+    file://pkg/mod/github.com/sirupsen/logrus@v1.8.1/LICENSE;md5=8dadfef729c08ec4e631c4f6fc5d43a0;spdx=MIT \
+    file://pkg/mod/golang.org/x/sys@v0.0.0-20191026070338-33540a1f6037/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707;spdx=BSD-3-Clause \
+"
diff --git a/recipes-gtk/nwg-shell/ddcpopup_0.1.bb b/recipes-gtk/nwg-shell/ddcpopup/ddcpopup_0.1.bb
similarity index 73%
rename from recipes-gtk/nwg-shell/ddcpopup_0.1.bb
rename to recipes-gtk/nwg-shell/ddcpopup/ddcpopup_0.1.bb
index 7549eda..cd4abc0 100644
--- a/recipes-gtk/nwg-shell/ddcpopup_0.1.bb
+++ b/recipes-gtk/nwg-shell/ddcpopup/ddcpopup_0.1.bb
@@ -12,17 +12,16 @@ RDEPENDS:${PN} = "ddcutil"
 
 GO_IMPORT = "github.com/nwg-piotr/ddcpopup.git"
 
-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;protocol=https"
 SRCREV = "8fab5132e49e08a1eeaa7a0dd3350d06f4399200"
-S = "${UNPACKDIR}/${BP}"
 
-inherit go go-mod pkgconfig
+inherit go go-mod pkgconfig go-mod-update-modules
+
+require ${PN}-go-mods.inc ${PN}-licenses.inc
 
 GO_INSTALL = "${GO_IMPORT}"
 GO_LINKSHARED = ""
 
-do_compile[network] = "1"
-
 do_install:append() {
 	mv ${D}${bindir}/main ${D}${bindir}/ddcpopup
 }
diff --git a/recipes-gtk/nwg-shell/gopsuinfo/gopsuinfo-go-mods.inc b/recipes-gtk/nwg-shell/gopsuinfo/gopsuinfo-go-mods.inc
new file mode 100644
index 0000000..de0741c
--- /dev/null
+++ b/recipes-gtk/nwg-shell/gopsuinfo/gopsuinfo-go-mods.inc
@@ -0,0 +1,20 @@
+
+# This file has been generated by go-mod-update-modules.bbclass
+#
+# Do not modify it by hand, as the contents will be replaced when
+# running the update-modules task.
+
+SRC_URI += "\
+    gomod://github.com/StackExchange/wmi;version=v0.0.0-20190523213315-cbe66965904d;mod=1;sha256sum=93030902e16bca6e43080d16640d04a033e2e05e03e5179021a11f941cadc96b \
+    gomod://github.com/davecgh/go-spew;version=v1.1.0;mod=1;sha256sum=bcb29393251237b79a17b6c19bf29134f43e8f438c3198988fcd461a1cdf05cc \
+    gomod://github.com/go-ole/go-ole;version=v1.2.5;mod=1;sha256sum=de7da59858d6121956da002ded711242cc14ecf597e932a8625246418fd3bbaa \
+    gomod://github.com/pmezard/go-difflib;version=v1.0.0;mod=1;sha256sum=74b2e766eb215377864d587badf57e95521f692d2a7860b3c7759093f9c9bec2 \
+    gomod://github.com/shirou/gopsutil;version=v3.21.1+incompatible;sha256sum=4ec3494abf929640f300cf61d9e708238095d7b6c442dd64871f571bd5641ceb \
+    gomod://github.com/stretchr/objx;version=v0.1.0;mod=1;sha256sum=1350354d52d2287a62336ecc0d56232d4c47699af9bba49c67c2b48254da98f1 \
+    gomod://github.com/stretchr/testify;version=v1.7.0;mod=1;sha256sum=fff8168d98e6a07156c454a1b6e925509f3177e96c155516d7f96b4079cca3bf \
+    gomod://golang.org/x/sys;version=v0.0.0-20190916202348-b4ddaad3f8a3;mod=1;sha256sum=181979e8bd57d2d9e064182da86c9a6111aa69755e888f08431ece4742aec343 \
+    gomod://golang.org/x/sys;version=v0.0.0-20220412211240-33da011f77ad;sha256sum=ffb4b3488ab203e6a883355e57fd1c4a84983c41fb0880ef520587863d47219c \
+    gomod://gopkg.in/check.v1;version=v0.0.0-20161208181325-20d25e280405;mod=1;sha256sum=5c306e0d633cd66a11b40e2e5fbbc6da42110db7d72ea3c1524ceb45ee40c33f \
+    gomod://gopkg.in/yaml.v3;version=v3.0.0-20200313102051-9f266ea9e77c;mod=1;sha256sum=21579860a20306fcf43b1bd234d1fba319499c77611b71c05f9bf3ba90dab939 \
+    gomod://gopkg.in/yaml.v3;version=v3.0.1;mod=1;sha256sum=21579860a20306fcf43b1bd234d1fba319499c77611b71c05f9bf3ba90dab939 \
+"
diff --git a/recipes-gtk/nwg-shell/gopsuinfo/gopsuinfo-licenses.inc b/recipes-gtk/nwg-shell/gopsuinfo/gopsuinfo-licenses.inc
new file mode 100644
index 0000000..51bf979
--- /dev/null
+++ b/recipes-gtk/nwg-shell/gopsuinfo/gopsuinfo-licenses.inc
@@ -0,0 +1,12 @@
+
+# This file has been generated by go-mod-update-modules.bbclass
+#
+# Do not modify it by hand, as the contents will be replaced when
+# running the update-modules task.
+
+LICENSE += "& BSD-3-Clause"
+
+LIC_FILES_CHKSUM += "\
+    file://pkg/mod/github.com/shirou/gopsutil@v3.21.1+incompatible/LICENSE;md5=ed7522382cec5b7a6d6ebb8e30eed40e;spdx=BSD-3-Clause \
+    file://pkg/mod/golang.org/x/sys@v0.0.0-20220412211240-33da011f77ad/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707;spdx=BSD-3-Clause \
+"
diff --git a/recipes-gtk/nwg-shell/gopsuinfo_0.1.5.bb b/recipes-gtk/nwg-shell/gopsuinfo/gopsuinfo_0.1.5.bb
similarity index 64%
rename from recipes-gtk/nwg-shell/gopsuinfo_0.1.5.bb
rename to recipes-gtk/nwg-shell/gopsuinfo/gopsuinfo_0.1.5.bb
index 622cb6a..14c78e6 100644
--- a/recipes-gtk/nwg-shell/gopsuinfo_0.1.5.bb
+++ b/recipes-gtk/nwg-shell/gopsuinfo/gopsuinfo_0.1.5.bb
@@ -4,14 +4,13 @@ LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=22ed6cb3c33862e689e075b4
 
 GO_IMPORT = "github.com/nwg-piotr/gopsuinfo.git"
 
-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};branch=main;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};branch=main;protocol=https"
 SRCREV = "60e4f83b6c4d84955e0a07f7bdc63d8089b4ba1e"
-S = "${UNPACKDIR}/${BP}"
 
-inherit go go-mod
+inherit go go-mod go-mod-update-modules
+
+require ${PN}-go-mods.inc ${PN}-licenses.inc
 
 GO_INSTALL = "${GO_IMPORT}"
 GO_LINKSHARED = ""
 
-do_compile[network] = "1"
-
diff --git a/recipes-gtk/nwg-shell/nwg-bar/nwg-bar_0.1.6.bb b/recipes-gtk/nwg-shell/nwg-bar/nwg-bar_0.1.6.bb
index db3d80e..381b092 100644
--- a/recipes-gtk/nwg-shell/nwg-bar/nwg-bar_0.1.6.bb
+++ b/recipes-gtk/nwg-shell/nwg-bar/nwg-bar_0.1.6.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;proto
 
 SRCREV = "c4da7d817747ad2f8cfda332d95bd4fc55eb6b34"
 
-require nwg-bar-go-mods.inc nwg-bar-licenses.inc
+require ${PN}-go-mods.inc ${PN}-licenses.inc
 
 inherit go go-mod pkgconfig go-mod-update-modules
 
diff --git a/recipes-gtk/nwg-shell/nwg-displays_0.3.25.bb b/recipes-gtk/nwg-shell/nwg-displays/nwg-displays_0.3.25.bb
similarity index 100%
rename from recipes-gtk/nwg-shell/nwg-displays_0.3.25.bb
rename to recipes-gtk/nwg-shell/nwg-displays/nwg-displays_0.3.25.bb
diff --git a/recipes-gtk/nwg-shell/nwg-dock-hyprland/nwg-dock-hyprland_0.4.7.bb b/recipes-gtk/nwg-shell/nwg-dock-hyprland/nwg-dock-hyprland_0.4.7.bb
index 4f488a5..1256025 100644
--- a/recipes-gtk/nwg-shell/nwg-dock-hyprland/nwg-dock-hyprland_0.4.7.bb
+++ b/recipes-gtk/nwg-shell/nwg-dock-hyprland/nwg-dock-hyprland_0.4.7.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;proto
 
 SRCREV = "ff1b4794255ed7501065982b067b3dbea0ae46ff"
 
-require nwg-dock-hyprland-go-mods.inc nwg-dock-hyprland-licenses.inc
+require ${PN}-go-mods.inc ${PN}-licenses.inc
 
 inherit go go-mod pkgconfig go-mod-update-modules
 
diff --git a/recipes-gtk/nwg-shell/nwg-dock/nwg-dock_0.4.1.bb b/recipes-gtk/nwg-shell/nwg-dock/nwg-dock_0.4.1.bb
index 66a5e2e..8a7eee4 100644
--- a/recipes-gtk/nwg-shell/nwg-dock/nwg-dock_0.4.1.bb
+++ b/recipes-gtk/nwg-shell/nwg-dock/nwg-dock_0.4.1.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;proto
 
 SRCREV = "3f010171ab8596552efdc2f03d5f09c0042bbb64"
 
-require nwg-dock-go-mods.inc nwg-dock-licenses.inc
+require ${PN}-go-mods.inc ${PN}-licenses.inc
 
 inherit go go-mod pkgconfig go-mod-update-modules
 
diff --git a/recipes-gtk/nwg-shell/nwg-drawer/nwg-drawer_0.7.1.bb b/recipes-gtk/nwg-shell/nwg-drawer/nwg-drawer_0.7.1.bb
index 72e4b38..a262969 100644
--- a/recipes-gtk/nwg-shell/nwg-drawer/nwg-drawer_0.7.1.bb
+++ b/recipes-gtk/nwg-shell/nwg-drawer/nwg-drawer_0.7.1.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;proto
 
 SRCREV = "b6209d5ab30da1c4beadd22fb2a9a63bf1ef607b"
 
-require nwg-drawer-go-mods.inc nwg-drawer-licenses.inc
+require ${PN}-go-mods.inc ${PN}-licenses.inc
 
 inherit go go-mod pkgconfig go-mod-update-modules
 
diff --git a/recipes-gtk/nwg-shell/nwg-hello_0.2.0.bb b/recipes-gtk/nwg-shell/nwg-hello/nwg-hello_0.2.0.bb
similarity index 100%
rename from recipes-gtk/nwg-shell/nwg-hello_0.2.0.bb
rename to recipes-gtk/nwg-shell/nwg-hello/nwg-hello_0.2.0.bb
diff --git a/recipes-gtk/nwg-shell/nwg-icon-picker_0.0.1.bb b/recipes-gtk/nwg-shell/nwg-icon-picker/nwg-icon-picker_0.0.1.bb
similarity index 100%
rename from recipes-gtk/nwg-shell/nwg-icon-picker_0.0.1.bb
rename to recipes-gtk/nwg-shell/nwg-icon-picker/nwg-icon-picker_0.0.1.bb
diff --git a/recipes-gtk/nwg-shell/nwg-launchers_0.7.1.1.bb b/recipes-gtk/nwg-shell/nwg-launchers/nwg-launchers_0.7.1.1.bb
similarity index 100%
rename from recipes-gtk/nwg-shell/nwg-launchers_0.7.1.1.bb
rename to recipes-gtk/nwg-shell/nwg-launchers/nwg-launchers_0.7.1.1.bb
diff --git a/recipes-gtk/nwg-shell/nwg-look/nwg-look_1.0.6.bb b/recipes-gtk/nwg-shell/nwg-look/nwg-look_1.0.6.bb
index 8f2fd85..83001b7 100644
--- a/recipes-gtk/nwg-shell/nwg-look/nwg-look_1.0.6.bb
+++ b/recipes-gtk/nwg-shell/nwg-look/nwg-look_1.0.6.bb
@@ -10,7 +10,7 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-look"
 SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};branch=main;protocol=https"
 SRCREV = "1282e6422491ea912ac22c5f532277eb011cc5bb"
 
-require nwg-look-go-mods.inc nwg-look-licenses.inc
+require ${PN}-go-mods.inc ${PN}-licenses.inc
 
 inherit go go-mod pkgconfig go-mod-update-modules
 
diff --git a/recipes-gtk/nwg-shell/nwg-menu/nwg-menu_0.1.7.bb b/recipes-gtk/nwg-shell/nwg-menu/nwg-menu_0.1.7.bb
index e391611..a2bf6ed 100644
--- a/recipes-gtk/nwg-shell/nwg-menu/nwg-menu_0.1.7.bb
+++ b/recipes-gtk/nwg-shell/nwg-menu/nwg-menu_0.1.7.bb
@@ -19,7 +19,7 @@ SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;proto
 
 SRCREV = "5806a1bb8b916478a5b25aec2a0c3cdcb071de0b"
 
-require nwg-menu-go-mods.inc nwg-menu-licenses.inc
+require ${PN}-go-mods.inc ${PN}-licenses.inc
 
 inherit go go-mod pkgconfig go-mod-update-modules
 
diff --git a/recipes-gtk/nwg-shell/nwg-shell-wallpapers_1.5.bb b/recipes-gtk/nwg-shell/nwg-shell-wallpapers/nwg-shell-wallpapers_1.5.bb
similarity index 100%
rename from recipes-gtk/nwg-shell/nwg-shell-wallpapers_1.5.bb
rename to recipes-gtk/nwg-shell/nwg-shell-wallpapers/nwg-shell-wallpapers_1.5.bb
diff --git a/recipes-gtk/nwg-shell/nwg-wrapper_0.1.2.bb b/recipes-gtk/nwg-shell/nwg-wrappers/nwg-wrapper_0.1.2.bb
similarity index 100%
rename from recipes-gtk/nwg-shell/nwg-wrapper_0.1.2.bb
rename to recipes-gtk/nwg-shell/nwg-wrappers/nwg-wrapper_0.1.2.bb
diff --git a/recipes-gtk/nwg-shell/nwgocc/nwgocc-go-mods.inc b/recipes-gtk/nwg-shell/nwgocc/nwgocc-go-mods.inc
new file mode 100644
index 0000000..2bfa210
--- /dev/null
+++ b/recipes-gtk/nwg-shell/nwgocc/nwgocc-go-mods.inc
@@ -0,0 +1,13 @@
+
+# This file has been generated by go-mod-update-modules.bbclass
+#
+# Do not modify it by hand, as the contents will be replaced when
+# running the update-modules task.
+
+SRC_URI += "\
+    gomod://github.com/allan-simon/go-singleinstance;version=v0.0.0-20210120080615-d0997106ab37;sha256sum=99115651f7df4f4b9956ca5af927e06d8fe8aac7b13f52f4a130ac4d7e237ad9 \
+    gomod://github.com/go-ole/go-ole;version=v1.2.4;mod=1;sha256sum=9eb34b77c569cc51e435357b1c66b5a3baf1018a85160e702925620d048f2881 \
+    gomod://github.com/gotk3/gotk3;version=v0.6.1;sha256sum=61a2d027cea272dbbcebb5ac6114fd3230cac6e54b16451c3597db3961b64380 \
+    gomod://github.com/itchyny/volume-go;version=v0.2.1;sha256sum=70ac8f76e3bdd31d42fb620b80aebc7bf6f3668f78b601ea0f4ec8505a65f1e3 \
+    gomod://github.com/moutend/go-wca;version=v0.2.0;mod=1;sha256sum=47da7e1776c5216469b752a556825b4403b49ce6ffe25fa3f8df45c252cd218a \
+"
diff --git a/recipes-gtk/nwg-shell/nwgocc/nwgocc-licenses.inc b/recipes-gtk/nwg-shell/nwgocc/nwgocc-licenses.inc
new file mode 100644
index 0000000..4938a76
--- /dev/null
+++ b/recipes-gtk/nwg-shell/nwgocc/nwgocc-licenses.inc
@@ -0,0 +1,13 @@
+
+# This file has been generated by go-mod-update-modules.bbclass
+#
+# Do not modify it by hand, as the contents will be replaced when
+# running the update-modules task.
+
+LICENSE += "& ISC & MIT"
+
+LIC_FILES_CHKSUM += "\
+    file://pkg/mod/github.com/allan-simon/go-singleinstance@v0.0.0-20210120080615-d0997106ab37/LICENSE;md5=64080d7ce40e2ef2eee4754706a437c4;spdx=MIT \
+    file://pkg/mod/github.com/gotk3/gotk3@v0.6.1/LICENSE;md5=82d02ae7d63483ef7474e8f4f95d687e;spdx=ISC \
+    file://pkg/mod/github.com/itchyny/volume-go@v0.2.1/LICENSE;md5=111c720f78aae9ca2665c814430c8433;spdx=MIT \
+"
diff --git a/recipes-gtk/nwg-shell/nwgocc_0.0.1.bb b/recipes-gtk/nwg-shell/nwgocc/nwgocc_0.0.1.bb
similarity index 85%
rename from recipes-gtk/nwg-shell/nwgocc_0.0.1.bb
rename to recipes-gtk/nwg-shell/nwgocc/nwgocc_0.0.1.bb
index 79f5822..26bb915 100644
--- a/recipes-gtk/nwg-shell/nwgocc_0.0.1.bb
+++ b/recipes-gtk/nwg-shell/nwgocc/nwgocc_0.0.1.bb
@@ -13,12 +13,13 @@ RRECOMMENDS:${PN} = " \
 
 GO_IMPORT = "github.com/nwg-piotr/nwgocc.git"
 
-SRC_URI = "git://${GO_IMPORT};destsuffix=src/${GO_IMPORT};nobranch=1;protocol=https"
+SRC_URI = "git://${GO_IMPORT};destsuffix=${BP}/src/${GO_IMPORT};nobranch=1;protocol=https"
 
 SRCREV = "782a37014de40f63115825c0b5bd343dee2ba668"
-S = "${UNPACKDIR}/${BP}"
 
-inherit go go-mod pkgconfig gtk-icon-cache
+inherit go go-mod pkgconfig go-mod-update-modules gtk-icon-cache
+
+require ${PN}-go-mods.inc ${PN}-licenses.inc
 
 GO_INSTALL = "${GO_IMPORT}"
 GO_LINKSHARED = ""
@@ -42,5 +43,3 @@ do_install:append() {
 
 FILES:${PN} += "${datadir}"
 
-do_compile[network] = "1"
-