diff --git a/conf/layer.conf b/conf/layer.conf
index f5800a6..074300b 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -2,7 +2,7 @@
 BBPATH .= ":${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "rust-layer"
 BBFILE_PATTERN_rust-layer := "^${LAYERDIR}/"
diff --git a/recipes/cargo/cargo-native_git.bb b/recipes-devtools/cargo/cargo-native_git.bb
similarity index 100%
rename from recipes/cargo/cargo-native_git.bb
rename to recipes-devtools/cargo/cargo-native_git.bb
diff --git a/recipes/cargo/cargo.inc b/recipes-devtools/cargo/cargo.inc
similarity index 100%
rename from recipes/cargo/cargo.inc
rename to recipes-devtools/cargo/cargo.inc
diff --git a/recipes/cargo/cargo_git.bb b/recipes-devtools/cargo/cargo_git.bb
similarity index 100%
rename from recipes/cargo/cargo_git.bb
rename to recipes-devtools/cargo/cargo_git.bb
diff --git a/recipes/cargo/files/0001-update-Rust.patch b/recipes-devtools/cargo/files/0001-update-Rust.patch
similarity index 100%
rename from recipes/cargo/files/0001-update-Rust.patch
rename to recipes-devtools/cargo/files/0001-update-Rust.patch
diff --git a/recipes/cargo/files/0001-update-pkg-versions.patch b/recipes-devtools/cargo/files/0001-update-pkg-versions.patch
similarity index 100%
rename from recipes/cargo/files/0001-update-pkg-versions.patch
rename to recipes-devtools/cargo/files/0001-update-pkg-versions.patch
diff --git a/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch b/recipes-devtools/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch
similarity index 100%
rename from recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch
rename to recipes-devtools/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch
diff --git a/recipes/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch b/recipes-devtools/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch
similarity index 100%
rename from recipes/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch
rename to recipes-devtools/cargo/files/curl-rust/0002-remove-per-triple-deps-on-openssl-sys.patch
diff --git a/recipes/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch b/recipes-devtools/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch
similarity index 100%
rename from recipes/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch
rename to recipes-devtools/cargo/files/git2-rs/0001-Add-generic-openssl-sys-dep.patch
diff --git a/recipes/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch b/recipes-devtools/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch
similarity index 100%
rename from recipes/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch
rename to recipes-devtools/cargo/files/git2-rs/0002-libgit2-sys-avoid-the-build-script-it-is-a-disaster.patch
diff --git a/recipes/cargo/files/git2-rs/0003-bump-libssh2-to-fix-build-with-nightly.patch b/recipes-devtools/cargo/files/git2-rs/0003-bump-libssh2-to-fix-build-with-nightly.patch
similarity index 100%
rename from recipes/cargo/files/git2-rs/0003-bump-libssh2-to-fix-build-with-nightly.patch
rename to recipes-devtools/cargo/files/git2-rs/0003-bump-libssh2-to-fix-build-with-nightly.patch
diff --git a/recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch b/recipes-devtools/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch
similarity index 100%
rename from recipes/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch
rename to recipes-devtools/cargo/files/ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch
diff --git a/recipes/cargo/files/tar-rs/0001-update-to-new-io-FileType-enum.patch b/recipes-devtools/cargo/files/tar-rs/0001-update-to-new-io-FileType-enum.patch
similarity index 100%
rename from recipes/cargo/files/tar-rs/0001-update-to-new-io-FileType-enum.patch
rename to recipes-devtools/cargo/files/tar-rs/0001-update-to-new-io-FileType-enum.patch
diff --git a/recipes/rust/files/rust-1.3.0/0001-platform.mk-avoid-choking-on-i586.patch b/recipes-devtools/rust/files/rust-1.3.0/0001-platform.mk-avoid-choking-on-i586.patch
similarity index 100%
rename from recipes/rust/files/rust-1.3.0/0001-platform.mk-avoid-choking-on-i586.patch
rename to recipes-devtools/rust/files/rust-1.3.0/0001-platform.mk-avoid-choking-on-i586.patch
diff --git a/recipes/rust/files/rust-1.3.0/0002-Target-add-default-target.json-path-libdir-rust-targ.patch b/recipes-devtools/rust/files/rust-1.3.0/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
similarity index 100%
rename from recipes/rust/files/rust-1.3.0/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
rename to recipes-devtools/rust/files/rust-1.3.0/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
diff --git a/recipes/rust/files/rust-1.3.0/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch b/recipes-devtools/rust/files/rust-1.3.0/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
similarity index 100%
rename from recipes/rust/files/rust-1.3.0/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
rename to recipes-devtools/rust/files/rust-1.3.0/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
diff --git a/recipes/rust/files/rust-1.3.0/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch b/recipes-devtools/rust/files/rust-1.3.0/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
similarity index 100%
rename from recipes/rust/files/rust-1.3.0/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
rename to recipes-devtools/rust/files/rust-1.3.0/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
diff --git a/recipes/rust/files/rust-1.3.0/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch b/recipes-devtools/rust/files/rust-1.3.0/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
similarity index 100%
rename from recipes/rust/files/rust-1.3.0/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
rename to recipes-devtools/rust/files/rust-1.3.0/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
diff --git a/recipes/rust/files/rust-1.3.0/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch b/recipes-devtools/rust/files/rust-1.3.0/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
similarity index 100%
rename from recipes/rust/files/rust-1.3.0/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
rename to recipes-devtools/rust/files/rust-1.3.0/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
diff --git a/recipes/rust/files/rust-1.3.0/0007-mk-install-use-disable-rewrite-paths.patch b/recipes-devtools/rust/files/rust-1.3.0/0007-mk-install-use-disable-rewrite-paths.patch
similarity index 100%
rename from recipes/rust/files/rust-1.3.0/0007-mk-install-use-disable-rewrite-paths.patch
rename to recipes-devtools/rust/files/rust-1.3.0/0007-mk-install-use-disable-rewrite-paths.patch
diff --git a/recipes/rust/files/rust-1.3.0/0008-install-disable-ldconfig.patch b/recipes-devtools/rust/files/rust-1.3.0/0008-install-disable-ldconfig.patch
similarity index 100%
rename from recipes/rust/files/rust-1.3.0/0008-install-disable-ldconfig.patch
rename to recipes-devtools/rust/files/rust-1.3.0/0008-install-disable-ldconfig.patch
diff --git a/recipes/rust/files/rust-1.3.0/0009-Remove-crate-metadata-from-symbol-hashing.patch b/recipes-devtools/rust/files/rust-1.3.0/0009-Remove-crate-metadata-from-symbol-hashing.patch
similarity index 100%
rename from recipes/rust/files/rust-1.3.0/0009-Remove-crate-metadata-from-symbol-hashing.patch
rename to recipes-devtools/rust/files/rust-1.3.0/0009-Remove-crate-metadata-from-symbol-hashing.patch
diff --git a/recipes/rust/files/rust-1.3.0/0010-mk-tell-rustc-that-we-re-only-looking-for-native-lib.patch b/recipes-devtools/rust/files/rust-1.3.0/0010-mk-tell-rustc-that-we-re-only-looking-for-native-lib.patch
similarity index 100%
rename from recipes/rust/files/rust-1.3.0/0010-mk-tell-rustc-that-we-re-only-looking-for-native-lib.patch
rename to recipes-devtools/rust/files/rust-1.3.0/0010-mk-tell-rustc-that-we-re-only-looking-for-native-lib.patch
diff --git a/recipes/rust/files/rust-git/0001-platform.mk-avoid-choking-on-i586.patch b/recipes-devtools/rust/files/rust-git/0001-platform.mk-avoid-choking-on-i586.patch
similarity index 100%
rename from recipes/rust/files/rust-git/0001-platform.mk-avoid-choking-on-i586.patch
rename to recipes-devtools/rust/files/rust-git/0001-platform.mk-avoid-choking-on-i586.patch
diff --git a/recipes/rust/files/rust-git/0002-Target-add-default-target.json-path-libdir-rust-targ.patch b/recipes-devtools/rust/files/rust-git/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
similarity index 100%
rename from recipes/rust/files/rust-git/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
rename to recipes-devtools/rust/files/rust-git/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
diff --git a/recipes/rust/files/rust-git/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch b/recipes-devtools/rust/files/rust-git/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
similarity index 100%
rename from recipes/rust/files/rust-git/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
rename to recipes-devtools/rust/files/rust-git/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
diff --git a/recipes/rust/files/rust-git/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch b/recipes-devtools/rust/files/rust-git/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
similarity index 100%
rename from recipes/rust/files/rust-git/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
rename to recipes-devtools/rust/files/rust-git/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
diff --git a/recipes/rust/files/rust-git/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch b/recipes-devtools/rust/files/rust-git/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
similarity index 100%
rename from recipes/rust/files/rust-git/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
rename to recipes-devtools/rust/files/rust-git/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
diff --git a/recipes/rust/files/rust-git/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch b/recipes-devtools/rust/files/rust-git/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
similarity index 100%
rename from recipes/rust/files/rust-git/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
rename to recipes-devtools/rust/files/rust-git/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
diff --git a/recipes/rust/files/rust-git/0007-mk-install-use-disable-rewrite-paths.patch b/recipes-devtools/rust/files/rust-git/0007-mk-install-use-disable-rewrite-paths.patch
similarity index 100%
rename from recipes/rust/files/rust-git/0007-mk-install-use-disable-rewrite-paths.patch
rename to recipes-devtools/rust/files/rust-git/0007-mk-install-use-disable-rewrite-paths.patch
diff --git a/recipes/rust/files/rust-git/0008-install-disable-ldconfig.patch b/recipes-devtools/rust/files/rust-git/0008-install-disable-ldconfig.patch
similarity index 100%
rename from recipes/rust/files/rust-git/0008-install-disable-ldconfig.patch
rename to recipes-devtools/rust/files/rust-git/0008-install-disable-ldconfig.patch
diff --git a/recipes/rust/files/rust-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch b/recipes-devtools/rust/files/rust-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch
similarity index 100%
rename from recipes/rust/files/rust-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch
rename to recipes-devtools/rust/files/rust-installer/0001-add-option-to-disable-rewriting-of-install-paths.patch
diff --git a/recipes/rust/rust-1.3.0.inc b/recipes-devtools/rust/rust-1.3.0.inc
similarity index 100%
rename from recipes/rust/rust-1.3.0.inc
rename to recipes-devtools/rust/rust-1.3.0.inc
diff --git a/recipes/rust/rust-git.inc b/recipes-devtools/rust/rust-git.inc
similarity index 100%
rename from recipes/rust/rust-git.inc
rename to recipes-devtools/rust/rust-git.inc
diff --git a/recipes/rust/rust-llvm.inc b/recipes-devtools/rust/rust-llvm.inc
similarity index 100%
rename from recipes/rust/rust-llvm.inc
rename to recipes-devtools/rust/rust-llvm.inc
diff --git a/recipes/rust/rust-llvm_1.3.0.bb b/recipes-devtools/rust/rust-llvm_1.3.0.bb
similarity index 100%
rename from recipes/rust/rust-llvm_1.3.0.bb
rename to recipes-devtools/rust/rust-llvm_1.3.0.bb
diff --git a/recipes/rust/rust-release.inc b/recipes-devtools/rust/rust-release.inc
similarity index 100%
rename from recipes/rust/rust-release.inc
rename to recipes-devtools/rust/rust-release.inc
diff --git a/recipes/rust/rust.inc b/recipes-devtools/rust/rust.inc
similarity index 100%
rename from recipes/rust/rust.inc
rename to recipes-devtools/rust/rust.inc
diff --git a/recipes/rust/rust_1.3.0.bb b/recipes-devtools/rust/rust_1.3.0.bb
similarity index 100%
rename from recipes/rust/rust_1.3.0.bb
rename to recipes-devtools/rust/rust_1.3.0.bb
diff --git a/recipes/rust/rust_git.bb b/recipes-devtools/rust/rust_git.bb
similarity index 100%
rename from recipes/rust/rust_git.bb
rename to recipes-devtools/rust/rust_git.bb
diff --git a/recipes/rust/rustlib.bb b/recipes-devtools/rust/rustlib.bb
similarity index 100%
rename from recipes/rust/rustlib.bb
rename to recipes-devtools/rust/rustlib.bb