diff --git a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.10.52.ebuild b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.10.52.ebuild
deleted file mode 100644
index 1fdc0f5..0000000
--- a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.10.52.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_SECURITY_UNSUPPORTED="1"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="9"
-
-inherit kernel-2
-inherit eutils
-detect_version
-detect_arch
-
-KEYWORDS="~amd64"
-HOMEPAGE="https://github.com/linux-surface/linux-surface"
-IUSE="experimental"
-DESCRIPTION="Full sources including the Gentoo and Surface patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree."
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0001-surface3-oemb.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0002-wifi.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0003-ipts.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0004-surface-gpe.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0005-surface-sam-over-hid.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0006-surface-sam.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0007-surface-hotplug.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0008-surface-typecover.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0009-surface-go-touchscreen.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0010-surface-sensors.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0011-cameras.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0012-ath10k-firmware-override.patch"
-
-src_prepare() {
-	eapply "${DISTDIR}/0001-surface3-oemb.patch"
-	eapply "${DISTDIR}/0002-wifi.patch"
-	eapply "${DISTDIR}/0003-ipts.patch"
-	eapply "${DISTDIR}/0004-surface-gpe.patch"
-	eapply "${DISTDIR}/0005-surface-sam-over-hid.patch"
-	eapply "${DISTDIR}/0006-surface-sam.patch"
-	eapply "${DISTDIR}/0007-surface-hotplug.patch"
-	eapply "${DISTDIR}/0008-surface-typecover.patch"
-	eapply "${DISTDIR}/0009-surface-go-touchscreen.patch"
-	eapply "${DISTDIR}/0010-surface-sensors.patch"
-	eapply "${DISTDIR}/0011-cameras.patch"
-	eapply "${DISTDIR}/0012-ath10k-firmware-override.patch"
-	eapply_user
-#	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
-#	S="${WORKDIR}/linux-${KV_FULL}-surface"
-}
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the overlay developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
index 3c759a3..7dbf3f2 100644
--- a/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
+++ b/sys-kernel/gentoo-surface-sources/gentoo-surface-sources-5.13.7.ebuild
@@ -46,8 +46,8 @@ src_prepare() {
 	#eapply "${DISTDIR}/0010-amd-gpio.patch"
 	#eapply "${DISTDIR}/0011-amd-s0ix.patch"
 	#eapply_user
-	#mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
-	#S="${WORKDIR}/linux-${KV_FULL}-surface"
+	mv "${WORKDIR}/linux-${KV_FULL}" "${WORKDIR}/linux-${KV_FULL}-surface"
+	S="${WORKDIR}/linux-${KV_FULL}-surface"
 }
 
 pkg_setup() {
diff --git a/sys-kernel/surface-sources/surface-sources-5.10.52.ebuild b/sys-kernel/surface-sources/surface-sources-5.10.52.ebuild
deleted file mode 100644
index b8767c4..0000000
--- a/sys-kernel/surface-sources/surface-sources-5.10.52.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_SECURITY_UNSUPPORTED="1"
-
-inherit kernel-2
-inherit eutils
-detect_version
-detect_arch
-
-KEYWORDS="~amd64"
-HOMEPAGE="https://github.com/linux-surface/linux-surface"
-IUSE="experimental"
-DESCRIPTION="Full sources and Surface patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree."
-SRC_URI="${KERNEL_URI} ${ARCH_URI}
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0001-surface3-oemb.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0002-wifi.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0003-ipts.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0004-surface-gpe.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0005-surface-sam-over-hid.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0006-surface-sam.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0007-surface-hotplug.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0008-surface-typecover.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0009-surface-go-touchscreen.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0010-surface-sensors.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0011-cameras.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.10/0012-ath10k-firmware-override.patch"
-
-src_prepare() {
-	eapply "${DISTDIR}/0001-surface3-oemb.patch"
-	eapply "${DISTDIR}/0002-wifi.patch"
-	eapply "${DISTDIR}/0003-ipts.patch"
-	eapply "${DISTDIR}/0004-surface-gpe.patch"
-	eapply "${DISTDIR}/0005-surface-sam-over-hid.patch"
-	eapply "${DISTDIR}/0006-surface-sam.patch"
-	eapply "${DISTDIR}/0007-surface-hotplug.patch"
-	eapply "${DISTDIR}/0008-surface-typecover.patch"
-	eapply "${DISTDIR}/0009-surface-go-touchscreen.patch"
-	eapply "${DISTDIR}/0010-surface-sensors.patch"
-	eapply "${DISTDIR}/0011-cameras.patch"
-	eapply "${DISTDIR}/0012-ath10k-firmware-override.patch"
-	eapply_user
-}
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the overlay developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/surface-sources/surface-sources-5.13.7.ebuild b/sys-kernel/surface-sources/surface-sources-5.13.7.ebuild
deleted file mode 100644
index d848056..0000000
--- a/sys-kernel/surface-sources/surface-sources-5.13.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-ETYPE="sources"
-K_SECURITY_UNSUPPORTED="1"
-
-inherit kernel-2
-inherit eutils
-detect_version
-detect_arch
-
-KEYWORDS="~amd64"
-HOMEPAGE="https://github.com/linux-surface/linux-surface"
-IUSE="experimental"
-DESCRIPTION="Full sources and Surface patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree."
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0001-surface3-oemb.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0002-mwifiex.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0003-ath10k.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0004-ipts.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0005-surface-sam-over-hid.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0006-surface-sam.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0007-surface-hotplug.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0008-surface-typecover.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0009-cameras.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0010-amd-gpio.patch
-		https://raw.githubusercontent.com/linux-surface/linux-surface/master/patches/5.13/0011-amd-s0ix.patch"
-
-src_prepare() {
-	eapply "${DISTDIR}/0001-surface3-oemb.patch"
-	eapply "${DISTDIR}/0002-mwifiex.patch"
-	eapply "${DISTDIR}/0003-ath10k.patch"
-	eapply "${DISTDIR}/0004-ipts.patch"
-	eapply "${DISTDIR}/0005-surface-sam-over-hid.patch"
-	eapply "${DISTDIR}/0006-surface-sam.patch"
-	eapply "${DISTDIR}/0007-surface-hotplug.patch"
-	eapply "${DISTDIR}/0008-surface-typecover.patch"
-	eapply "${DISTDIR}/0009-cameras.patch"
-	eapply "${DISTDIR}/0010-amd-gpio.patch"
-	eapply "${DISTDIR}/0011-amd-s0ix.patch"
-	eapply_user
-}
-
-pkg_setup() {
-	ewarn ""
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the overlay developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn ""
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}