diff --git a/recipes-oneapi/onedpl/onedpl_2022.8.0.bb b/dynamic-layers/clang-layer/recipes-oneapi/onedpl/onedpl_2022.8.0.bb
similarity index 100%
rename from recipes-oneapi/onedpl/onedpl_2022.8.0.bb
rename to dynamic-layers/clang-layer/recipes-oneapi/onedpl/onedpl_2022.8.0.bb
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch b/dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch
similarity index 100%
rename from dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch
rename to dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver/0001-Fix-the-compilation-warning-when-using-gcc-13-25.patch
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-linux-npu-driver-fix-multilib-install-issue.patch b/dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver/0001-linux-npu-driver-fix-multilib-install-issue.patch
similarity index 100%
rename from dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0001-linux-npu-driver-fix-multilib-install-issue.patch
rename to dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver/0001-linux-npu-driver-fix-multilib-install-issue.patch
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch b/dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch
similarity index 100%
rename from dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch
rename to dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver/0002-Fix-compilation-failure-with-GCC-14.patch
diff --git a/dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.23.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver_1.23.0.bb
similarity index 100%
rename from dynamic-layers/openembedded-layer/recipes-core/linux-npu-driver/linux-npu-driver_1.23.0.bb
rename to dynamic-layers/openembedded-layer/recipes-bsp/linux-npu-driver/linux-npu-driver_1.23.0.bb
diff --git a/recipes-bsp/formfactor/formfactor/machconfig b/recipes-core/formfactor/formfactor/machconfig
similarity index 100%
rename from recipes-bsp/formfactor/formfactor/machconfig
rename to recipes-core/formfactor/formfactor/machconfig
diff --git a/recipes-bsp/formfactor/formfactor_0.0.bbappend b/recipes-core/formfactor/formfactor_0.0.bbappend
similarity index 100%
rename from recipes-bsp/formfactor/formfactor_0.0.bbappend
rename to recipes-core/formfactor/formfactor_0.0.bbappend
diff --git a/dynamic-layers/clang-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb b/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb
similarity index 100%
rename from dynamic-layers/clang-layer/recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb
rename to recipes-oneapi/ipp/intel-oneapi-ipp_2021.10.0-653.bb
diff --git a/recipes-oneapi/crypto/intel-crypto-mb/0001-CMakeLists.txt-exclude-host-system-headers.patch b/recipes-support/crypto/intel-crypto-mb/0001-CMakeLists.txt-exclude-host-system-headers.patch
similarity index 100%
rename from recipes-oneapi/crypto/intel-crypto-mb/0001-CMakeLists.txt-exclude-host-system-headers.patch
rename to recipes-support/crypto/intel-crypto-mb/0001-CMakeLists.txt-exclude-host-system-headers.patch
diff --git a/recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch b/recipes-support/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch
similarity index 100%
rename from recipes-oneapi/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch
rename to recipes-support/crypto/intel-crypto-mb/0001-crypto-mb-Make-sure-libs-are-installed-correctly.patch
diff --git a/recipes-oneapi/crypto/intel-crypto-mb/0002-cmake-exclude-Yocto-build-flags.patch b/recipes-support/crypto/intel-crypto-mb/0002-cmake-exclude-Yocto-build-flags.patch
similarity index 100%
rename from recipes-oneapi/crypto/intel-crypto-mb/0002-cmake-exclude-Yocto-build-flags.patch
rename to recipes-support/crypto/intel-crypto-mb/0002-cmake-exclude-Yocto-build-flags.patch
diff --git a/recipes-oneapi/crypto/intel-crypto-mb_2021.12.1.bb b/recipes-support/crypto/intel-crypto-mb_2021.12.1.bb
similarity index 100%
rename from recipes-oneapi/crypto/intel-crypto-mb_2021.12.1.bb
rename to recipes-support/crypto/intel-crypto-mb_2021.12.1.bb
diff --git a/recipes-bsp/intel-cmt-cat/intel-cmt-cat_25.04.bb b/recipes-support/intel-cmt-cat/intel-cmt-cat_25.04.bb
similarity index 100%
rename from recipes-bsp/intel-cmt-cat/intel-cmt-cat_25.04.bb
rename to recipes-support/intel-cmt-cat/intel-cmt-cat_25.04.bb
diff --git a/recipes-bsp/metee/metee_3.2.4.bb b/recipes-support/metee/metee_3.2.4.bb
similarity index 100%
rename from recipes-bsp/metee/metee_3.2.4.bb
rename to recipes-support/metee/metee_3.2.4.bb