diff --git a/recipes-application/edu/libkeduvocdocument_21.04.2.bb b/recipes-application/edu/libkeduvocdocument_21.04.2.bb
deleted file mode 100644
index 6082bec..0000000
--- a/recipes-application/edu/libkeduvocdocument_21.04.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: CC0-1.0
-
-require ${PN}.inc
-SRCREV = "v${PV}"
diff --git a/recipes-application/edu/blinken.inc b/recipes-application/education/blinken.inc
similarity index 83%
rename from recipes-application/edu/blinken.inc
rename to recipes-application/education/blinken.inc
index 903bfff..c0910f6 100644
--- a/recipes-application/edu/blinken.inc
+++ b/recipes-application/education/blinken.inc
@@ -16,9 +16,6 @@ DEPENDS += " \
     phonon \
 "
 
-SRC_URI = "git://invent.kde.org/education/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
 inherit kcoreaddons
 inherit kconfig
diff --git a/recipes-application/edu/blinken_21.04.2.bb b/recipes-application/education/blinken_21.04.2.bb
similarity index 51%
rename from recipes-application/edu/blinken_21.04.2.bb
rename to recipes-application/education/blinken_21.04.2.bb
index 6082bec..6693b4b 100644
--- a/recipes-application/edu/blinken_21.04.2.bb
+++ b/recipes-application/education/blinken_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/education/blinken;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/edu/kanagram.inc b/recipes-application/education/kanagram.inc
similarity index 87%
rename from recipes-application/edu/kanagram.inc
rename to recipes-application/education/kanagram.inc
index 7c97521..3594b72 100644
--- a/recipes-application/edu/kanagram.inc
+++ b/recipes-application/education/kanagram.inc
@@ -20,9 +20,6 @@ DEPENDS += " \
     libkeduvocdocument \
 "
 
-SRC_URI = "git://invent.kde.org/education/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
 inherit kcoreaddons
 inherit kconfig
diff --git a/recipes-application/edu/kanagram_21.04.2.bb b/recipes-application/education/kanagram_21.04.2.bb
similarity index 50%
rename from recipes-application/edu/kanagram_21.04.2.bb
rename to recipes-application/education/kanagram_21.04.2.bb
index 6082bec..d726d05 100644
--- a/recipes-application/edu/kanagram_21.04.2.bb
+++ b/recipes-application/education/kanagram_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/education/kanagram;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/edu/kdeedu-data.inc b/recipes-application/education/kdeedu-data.inc
similarity index 82%
rename from recipes-application/edu/kdeedu-data.inc
rename to recipes-application/education/kdeedu-data.inc
index 42217bb..920d405 100644
--- a/recipes-application/edu/kdeedu-data.inc
+++ b/recipes-application/education/kdeedu-data.inc
@@ -9,9 +9,6 @@ LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 PR = "r0"
 
-SRC_URI = "git://invent.kde.org/education/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
 
 FILES_${PN} += " \
diff --git a/recipes-application/edu/kdeedu-data_21.04.2.bb b/recipes-application/education/kdeedu-data_21.04.2.bb
similarity index 50%
rename from recipes-application/edu/kdeedu-data_21.04.2.bb
rename to recipes-application/education/kdeedu-data_21.04.2.bb
index 6082bec..df15e74 100644
--- a/recipes-application/edu/kdeedu-data_21.04.2.bb
+++ b/recipes-application/education/kdeedu-data_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/education/kdeedu-data;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/edu/khangman.inc b/recipes-application/education/khangman.inc
similarity index 87%
rename from recipes-application/edu/khangman.inc
rename to recipes-application/education/khangman.inc
index 267ac64..c6f338f 100644
--- a/recipes-application/edu/khangman.inc
+++ b/recipes-application/education/khangman.inc
@@ -22,9 +22,6 @@ DEPENDS += " \
     libkeduvocdocument \
 "
 
-SRC_URI = "git://invent.kde.org/education/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
 inherit kcoreaddons
 inherit kconfig
diff --git a/recipes-application/edu/khangman_21.04.2.bb b/recipes-application/education/khangman_21.04.2.bb
similarity index 50%
rename from recipes-application/edu/khangman_21.04.2.bb
rename to recipes-application/education/khangman_21.04.2.bb
index 6082bec..29f8530 100644
--- a/recipes-application/edu/khangman_21.04.2.bb
+++ b/recipes-application/education/khangman_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/education/khangman;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/edu/libkeduvocdocument.inc b/recipes-application/education/libkeduvocdocument.inc
similarity index 82%
rename from recipes-application/edu/libkeduvocdocument.inc
rename to recipes-application/education/libkeduvocdocument.inc
index 2ef3727..f82efb8 100644
--- a/recipes-application/edu/libkeduvocdocument.inc
+++ b/recipes-application/education/libkeduvocdocument.inc
@@ -15,9 +15,6 @@ DEPENDS += " \
     kio \
 "
 
-SRC_URI = "git://invent.kde.org/education/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
 inherit kconfig
 inherit kauth
diff --git a/recipes-application/education/libkeduvocdocument_21.04.2.bb b/recipes-application/education/libkeduvocdocument_21.04.2.bb
new file mode 100644
index 0000000..041db78
--- /dev/null
+++ b/recipes-application/education/libkeduvocdocument_21.04.2.bb
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: none
+# SPDX-License-Identifier: CC0-1.0
+
+require ${PN}.inc
+SRC_URI = "git://invent.kde.org/education/libkeduvocdocument;nobranch=1;protocol=https"
+SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/edu/marble.inc b/recipes-application/education/marble.inc
similarity index 93%
rename from recipes-application/edu/marble.inc
rename to recipes-application/education/marble.inc
index 497c773..3e719fd 100644
--- a/recipes-application/edu/marble.inc
+++ b/recipes-application/education/marble.inc
@@ -23,11 +23,6 @@ DEPENDS += " \
     qtserialport \
 "
 
-SRC_URI = " \
-    git://invent.kde.org/education/${BPN};nobranch=1;protocol=https \
-"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
 inherit kcoreaddons
 inherit kconfig
diff --git a/recipes-application/edu/marble_21.04.2.bb b/recipes-application/education/marble_21.04.2.bb
similarity index 51%
rename from recipes-application/edu/marble_21.04.2.bb
rename to recipes-application/education/marble_21.04.2.bb
index 6082bec..64854c2 100644
--- a/recipes-application/edu/marble_21.04.2.bb
+++ b/recipes-application/education/marble_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/education/marble;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/graphics/gwenview.inc b/recipes-application/graphics/gwenview.inc
index 2d845f6..932e23b 100644
--- a/recipes-application/graphics/gwenview.inc
+++ b/recipes-application/graphics/gwenview.inc
@@ -26,9 +26,6 @@ DEPENDS += " \
     purpose \
 "
 
-SRC_URI = "git://invent.kde.org/graphics/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
 inherit kcoreaddons
 inherit kconfig
diff --git a/recipes-application/graphics/gwenview_21.04.2.bb b/recipes-application/graphics/gwenview_21.04.2.bb
index 6082bec..749bc78 100644
--- a/recipes-application/graphics/gwenview_21.04.2.bb
+++ b/recipes-application/graphics/gwenview_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/graphics/gwenview;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/graphics/okular.inc b/recipes-application/graphics/okular.inc
index 584d7aa..3496b06 100644
--- a/recipes-application/graphics/okular.inc
+++ b/recipes-application/graphics/okular.inc
@@ -22,9 +22,6 @@ DEPENDS += " \
     qca \
 "
 
-SRC_URI = "git://invent.kde.org/graphics/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 # dirty hack to force the mobile version and hide the desktop one
 do_install_append() {
     sed -i 's/Exec=okular %U$/Exec=okularkirigami %U/g' ${D}${datadir}/applications/org.kde.okular.desktop
diff --git a/recipes-application/graphics/okular_21.04.2.bb b/recipes-application/graphics/okular_21.04.2.bb
index 6082bec..3cbd423 100644
--- a/recipes-application/graphics/okular_21.04.2.bb
+++ b/recipes-application/graphics/okular_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/graphics/okular;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/libraries/kpublictransport.inc b/recipes-application/libraries/kpublictransport.inc
index 77723c8..69a9185 100644
--- a/recipes-application/libraries/kpublictransport.inc
+++ b/recipes-application/libraries/kpublictransport.inc
@@ -15,8 +15,5 @@ DEPENDS = " \
     qtdeclarative \
 "
 
-SRC_URI = "git://invent.kde.org/libraries/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
 inherit mime-xdg
diff --git a/recipes-application/libraries/kpublictransport_21.04.2.bb b/recipes-application/libraries/kpublictransport_21.04.2.bb
index 6082bec..5b23c8d 100644
--- a/recipes-application/libraries/kpublictransport_21.04.2.bb
+++ b/recipes-application/libraries/kpublictransport_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/libraries/kpublictransport;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/multimedia/elisa.inc b/recipes-application/multimedia/elisa.inc
index 7c2d668..593f887 100644
--- a/recipes-application/multimedia/elisa.inc
+++ b/recipes-application/multimedia/elisa.inc
@@ -24,10 +24,6 @@ DEPENDS += " \
     kdbusaddons \
 "
 
-RDEPENDS_${PN} += " \
-    kirigami \
-"
-
 SRC_URI = "git://invent.kde.org/multimedia/${BPN};nobranch=1;protocol=https"
 S = "${WORKDIR}/git"
 
diff --git a/recipes-application/multimedia/elisa_21.04.2.bb b/recipes-application/multimedia/elisa_21.04.2.bb
index 6082bec..1c316f1 100644
--- a/recipes-application/multimedia/elisa_21.04.2.bb
+++ b/recipes-application/multimedia/elisa_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/multimedia/elisa;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/network/kdeconnect-kde.inc b/recipes-application/network/kdeconnect-kde.inc
index 185e831..b6386ad 100644
--- a/recipes-application/network/kdeconnect-kde.inc
+++ b/recipes-application/network/kdeconnect-kde.inc
@@ -24,9 +24,6 @@ DEPENDS += " \
     kwayland \
 "
 
-SRC_URI = "git://invent.kde.org/network/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
 inherit kcoreaddons
 inherit kconfig
diff --git a/recipes-application/network/kdeconnect-kde_21.04.2.bb b/recipes-application/network/kdeconnect-kde_21.04.2.bb
index 6082bec..1840065 100644
--- a/recipes-application/network/kdeconnect-kde_21.04.2.bb
+++ b/recipes-application/network/kdeconnect-kde_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/network/kdeconnect-kde;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/sdk/kirigami-gallery.inc b/recipes-application/sdk/kirigami-gallery.inc
index 239f73f..1d703e9 100644
--- a/recipes-application/sdk/kirigami-gallery.inc
+++ b/recipes-application/sdk/kirigami-gallery.inc
@@ -12,7 +12,4 @@ DEPENDS += " \
     kirigami \
 "
 
-SRC_URI = "git://invent.kde.org/sdk/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
diff --git a/recipes-application/sdk/kirigami-gallery_21.04.2.bb b/recipes-application/sdk/kirigami-gallery_21.04.2.bb
index 6082bec..be47b37 100644
--- a/recipes-application/sdk/kirigami-gallery_21.04.2.bb
+++ b/recipes-application/sdk/kirigami-gallery_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/sdk/kirigami-gallery;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/base/kdialog.inc b/recipes-application/utilities/kdialog.inc
similarity index 81%
rename from recipes-application/base/kdialog.inc
rename to recipes-application/utilities/kdialog.inc
index a2f7f7d..394764b 100644
--- a/recipes-application/base/kdialog.inc
+++ b/recipes-application/utilities/kdialog.inc
@@ -17,9 +17,6 @@ DEPENDS += " \
     kdbusaddons\
 "
 
-SRC_URI = "git://invent.kde.org/utilities/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
 inherit kcoreaddons
 inherit kconfig
diff --git a/recipes-application/base/kdialog_21.04.2.bb b/recipes-application/utilities/kdialog_21.04.2.bb
similarity index 51%
rename from recipes-application/base/kdialog_21.04.2.bb
rename to recipes-application/utilities/kdialog_21.04.2.bb
index 6082bec..b5b7365 100644
--- a/recipes-application/base/kdialog_21.04.2.bb
+++ b/recipes-application/utilities/kdialog_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/utilities/kdialog;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"
diff --git a/recipes-application/base/konsole.inc b/recipes-application/utilities/konsole.inc
similarity index 84%
rename from recipes-application/base/konsole.inc
rename to recipes-application/utilities/konsole.inc
index 8334ac2..b6119ab 100644
--- a/recipes-application/base/konsole.inc
+++ b/recipes-application/utilities/konsole.inc
@@ -19,9 +19,6 @@ DEPENDS += " \
     kxmlgui \
 "
 
-SRC_URI = "git://invent.kde.org/utilities/${BPN};nobranch=1;protocol=https"
-S = "${WORKDIR}/git"
-
 inherit cmake_kdeapp
 inherit kcoreaddons
 inherit kconfig
diff --git a/recipes-application/base/konsole_21.04.2.bb b/recipes-application/utilities/konsole_21.04.2.bb
similarity index 51%
rename from recipes-application/base/konsole_21.04.2.bb
rename to recipes-application/utilities/konsole_21.04.2.bb
index 6082bec..b2423f5 100644
--- a/recipes-application/base/konsole_21.04.2.bb
+++ b/recipes-application/utilities/konsole_21.04.2.bb
@@ -2,4 +2,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${PN}.inc
+SRC_URI = "git://invent.kde.org/utilities/konsole;nobranch=1;protocol=https"
 SRCREV = "v${PV}"
+S = "${WORKDIR}/git"