diff --git a/meta-citadel-distro/conf/distro/citadel-distro.conf b/meta-citadel-distro/conf/distro/citadel-distro.conf
index fd11400..ea75b45 100644
--- a/meta-citadel-distro/conf/distro/citadel-distro.conf
+++ b/meta-citadel-distro/conf/distro/citadel-distro.conf
@@ -17,7 +17,7 @@ VIRTUAL-RUNTIME_initscripts = ""
 VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
 DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-citadel"
+PREFERRED_PROVIDER_virtual/kernel = "citadel-kernel"
 
 PACKAGE_CLASSES ?= "package_deb"
 
diff --git a/meta-citadel/recipes-kernel/linux/linux-citadel.inc b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel.inc
similarity index 100%
rename from meta-citadel/recipes-kernel/linux/linux-citadel.inc
rename to meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel.inc
diff --git a/meta-citadel/recipes-kernel/linux/linux-citadel_4.9.65.bb b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_4.9.65.bb
similarity index 92%
rename from meta-citadel/recipes-kernel/linux/linux-citadel_4.9.65.bb
rename to meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_4.9.65.bb
index 7a62fba..20c6ac8 100644
--- a/meta-citadel/recipes-kernel/linux/linux-citadel_4.9.65.bb
+++ b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_4.9.65.bb
@@ -1,4 +1,4 @@
-require linux-citadel.inc
+require citadel-kernel.inc
 
 SRC_URI[kernel.md5sum] = "60e1a229fb5ffc2a82462ed9400ce3d0"
 SRC_URI[kernel.sha256sum] = "24ba70877549a3cf25dc5f12efd260d3e957bce64c087de98baf8968ee514895"
diff --git a/meta-citadel/recipes-kernel/linux/files/0114-smpboot-reuse-timer-calibration.patch b/meta-citadel/recipes-kernel/citadel-kernel/files/0114-smpboot-reuse-timer-calibration.patch
similarity index 100%
rename from meta-citadel/recipes-kernel/linux/files/0114-smpboot-reuse-timer-calibration.patch
rename to meta-citadel/recipes-kernel/citadel-kernel/files/0114-smpboot-reuse-timer-calibration.patch
diff --git a/meta-citadel/recipes-kernel/linux/files/0116-Initialize-ata-before-graphics.patch b/meta-citadel/recipes-kernel/citadel-kernel/files/0116-Initialize-ata-before-graphics.patch
similarity index 100%
rename from meta-citadel/recipes-kernel/linux/files/0116-Initialize-ata-before-graphics.patch
rename to meta-citadel/recipes-kernel/citadel-kernel/files/0116-Initialize-ata-before-graphics.patch
diff --git a/meta-citadel/recipes-kernel/linux/files/defconfig b/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig
similarity index 100%
rename from meta-citadel/recipes-kernel/linux/files/defconfig
rename to meta-citadel/recipes-kernel/citadel-kernel/files/defconfig
diff --git a/meta-citadel/recipes-kernel/linux/files/ignore-sysroot-for-plugin-build.patch b/meta-citadel/recipes-kernel/citadel-kernel/files/ignore-sysroot-for-plugin-build.patch
similarity index 100%
rename from meta-citadel/recipes-kernel/linux/files/ignore-sysroot-for-plugin-build.patch
rename to meta-citadel/recipes-kernel/citadel-kernel/files/ignore-sysroot-for-plugin-build.patch