diff --git a/classes/kde-kf5-porting-aids.bbclass b/classes/kde-kf5-porting-aids.bbclass
index 64c3bc4b..34c5630a 100644
--- a/classes/kde-kf5-porting-aids.bbclass
+++ b/classes/kde-kf5-porting-aids.bbclass
@@ -1,3 +1,3 @@
 inherit kde-kf5
 
-SRC_URI = "http://download.kde.org/stable/frameworks/5.12/portingAids/${BPN}-${PV}.tar.xz"
+SRC_URI = "http://download.kde.org/stable/frameworks/5.13/portingAids/${BPN}-${PV}.tar.xz"
diff --git a/classes/kde-kf5.bbclass b/classes/kde-kf5.bbclass
index b902ffa4..1ab5f11f 100644
--- a/classes/kde-kf5.bbclass
+++ b/classes/kde-kf5.bbclass
@@ -1,5 +1,5 @@
 inherit kde-base
 
-KF5_VERSION = "5.12.0"
+KF5_VERSION = "5.13.0"
 
-SRC_URI = "http://download.kde.org/stable/frameworks/5.12/${BPN}-${PV}.tar.xz"
+SRC_URI = "http://download.kde.org/stable/frameworks/5.13/${BPN}-${PV}.tar.xz"
diff --git a/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb b/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb
similarity index 94%
rename from recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
rename to recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb
index ce0802ee..9f74b3b0 100644
--- a/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
+++ b/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = " \
 "
 
 
-inherit kde-plasma cmake-lib pkgconfig
+inherit kde-kf5 cmake-lib pkgconfig
 
-PV = "5.9.2"
+PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "74d278d9c6dab71d3126ba51858a5d02"
 SRC_URI[sha256sum] = "0959a19591180216472c9c7845d180d2b16501b266c6ca10e438c745ca2e151c"
 
diff --git a/recipes-kde/plasma/tier3/baloo/baloo.bb b/recipes-kde/kf5/tier3/baloo/baloo.bb
similarity index 95%
rename from recipes-kde/plasma/tier3/baloo/baloo.bb
rename to recipes-kde/kf5/tier3/baloo/baloo.bb
index 6b640bea..8c0e50a0 100644
--- a/recipes-kde/plasma/tier3/baloo/baloo.bb
+++ b/recipes-kde/kf5/tier3/baloo/baloo.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit kde-plasma cmake-lib
+inherit kde-kf5 cmake-lib
 
 DEPENDS += "ki18n kconfig kidletime kitemmodels kinit kauth kcrash solid kio kdelibs4support kfilemetadata ktexteditor xapian-core"
 
-PV = "5.9.2"
+PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "2fb26fe7937565d3c8d54a11ee8b21a5"
 SRC_URI[sha256sum] = "1ca97763c136d3b7762cdc04f6e76fb9d314ba38db8ad48778647590626e19e6"
 
diff --git a/recipes-kde/plasma/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch b/recipes-kde/kf5/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch
similarity index 100%
rename from recipes-kde/plasma/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch
rename to recipes-kde/kf5/tier3/baloo/files/0001-fix-build-for-QT_NO_SESSIONMANAGER.patch
diff --git a/recipes-kde/packagegroups/kf5-world.bb b/recipes-kde/packagegroups/kf5-world.bb
index 837e5464..85549f81 100644
--- a/recipes-kde/packagegroups/kf5-world.bb
+++ b/recipes-kde/packagegroups/kf5-world.bb
@@ -34,6 +34,7 @@ TIER_2 = " \
     kcompletion \
     kcrash \
     kdoctools \
+    kfilemetadata \
     kjobwidgets \
     kpackage \
     kpty \
@@ -41,6 +42,7 @@ TIER_2 = " \
 "
 
 TIER_3 = " \
+    baloo \
     kactivities \
     kbookmarks \
     kcmutils \
diff --git a/recipes-kde/packagegroups/plasma-world.bb b/recipes-kde/packagegroups/plasma-world.bb
index e4e55cf5..66809533 100644
--- a/recipes-kde/packagegroups/plasma-world.bb
+++ b/recipes-kde/packagegroups/plasma-world.bb
@@ -9,11 +9,9 @@ TIER_1 = " \
 "
 
 TIER_2 = " \
-    kfilemetadata \
 "
 
 TIER_3 = " \
-    baloo \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "plasma-workspace", "",d)} \
 "