diff --git a/conf/layer.conf b/conf/layer.conf
index 56e1381..ee72806 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-snapshot.inc b/recipes-devtools/cargo/cargo-snapshot.inc
similarity index 100%
rename from recipes/cargo/cargo-snapshot.inc
rename to recipes-devtools/cargo/cargo-snapshot.inc
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_0.7.0.bb b/recipes-devtools/cargo/cargo_0.7.0.bb
similarity index 100%
rename from recipes/cargo/cargo_0.7.0.bb
rename to recipes-devtools/cargo/cargo_0.7.0.bb
diff --git a/recipes/cargo/files/0001-disable-cargo-snapshot-fetch.patch b/recipes-devtools/cargo/files/0001-disable-cargo-snapshot-fetch.patch
similarity index 100%
rename from recipes/cargo/files/0001-disable-cargo-snapshot-fetch.patch
rename to recipes-devtools/cargo/files/0001-disable-cargo-snapshot-fetch.patch
diff --git a/recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.patch b/recipes-devtools/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.patch
similarity index 100%
rename from recipes/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.patch
rename to recipes-devtools/cargo/files/curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.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-libgit2-sys-avoid-blessed-triples.patch b/recipes-devtools/cargo/files/git2-rs/0001-libgit2-sys-avoid-blessed-triples.patch
similarity index 100%
rename from recipes/cargo/files/git2-rs/0001-libgit2-sys-avoid-blessed-triples.patch
rename to recipes-devtools/cargo/files/git2-rs/0001-libgit2-sys-avoid-blessed-triples.patch
diff --git a/recipes/cargo/files/ssh2-rs/0001-libssh2-sys-avoid-explicitly-linking-in-openssl.patch b/recipes-devtools/cargo/files/ssh2-rs/0001-libssh2-sys-avoid-explicitly-linking-in-openssl.patch
similarity index 100%
rename from recipes/cargo/files/ssh2-rs/0001-libssh2-sys-avoid-explicitly-linking-in-openssl.patch
rename to recipes-devtools/cargo/files/ssh2-rs/0001-libssh2-sys-avoid-explicitly-linking-in-openssl.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-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/files/rust-llvm/0000-rust-llvm-remove-extra-slash.patch b/recipes-devtools/rust/files/rust-llvm/0000-rust-llvm-remove-extra-slash.patch
similarity index 100%
rename from recipes/rust/files/rust-llvm/0000-rust-llvm-remove-extra-slash.patch
rename to recipes-devtools/rust/files/rust-llvm/0000-rust-llvm-remove-extra-slash.patch
diff --git a/recipes/rust/files/rust/0001-platform.mk-avoid-choking-on-i586.patch b/recipes-devtools/rust/files/rust/0001-platform.mk-avoid-choking-on-i586.patch
similarity index 100%
rename from recipes/rust/files/rust/0001-platform.mk-avoid-choking-on-i586.patch
rename to recipes-devtools/rust/files/rust/0001-platform.mk-avoid-choking-on-i586.patch
diff --git a/recipes/rust/files/rust/0002-Target-add-default-target.json-path-libdir-rust-targ.patch b/recipes-devtools/rust/files/rust/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
similarity index 100%
rename from recipes/rust/files/rust/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
rename to recipes-devtools/rust/files/rust/0002-Target-add-default-target.json-path-libdir-rust-targ.patch
diff --git a/recipes/rust/files/rust/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch b/recipes-devtools/rust/files/rust/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
similarity index 100%
rename from recipes/rust/files/rust/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
rename to recipes-devtools/rust/files/rust/0003-mk-for-stage0-use-RUSTFLAGS-to-override-target-libs-.patch
diff --git a/recipes/rust/files/rust/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch b/recipes-devtools/rust/files/rust/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
similarity index 100%
rename from recipes/rust/files/rust/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
rename to recipes-devtools/rust/files/rust/0004-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
diff --git a/recipes/rust/files/rust/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch b/recipes-devtools/rust/files/rust/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
similarity index 100%
rename from recipes/rust/files/rust/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
rename to recipes-devtools/rust/files/rust/0005-configure-support-bindir-and-extend-libdir-to-non-bl.patch
diff --git a/recipes/rust/files/rust/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch b/recipes-devtools/rust/files/rust/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
similarity index 100%
rename from recipes/rust/files/rust/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
rename to recipes-devtools/rust/files/rust/0006-std-thread_local-workaround-for-NULL-__dso_handle.patch
diff --git a/recipes/rust/files/rust/0007-mk-install-use-disable-rewrite-paths.patch b/recipes-devtools/rust/files/rust/0007-mk-install-use-disable-rewrite-paths.patch
similarity index 100%
rename from recipes/rust/files/rust/0007-mk-install-use-disable-rewrite-paths.patch
rename to recipes-devtools/rust/files/rust/0007-mk-install-use-disable-rewrite-paths.patch
diff --git a/recipes/rust/files/rust/0008-install-disable-ldconfig.patch b/recipes-devtools/rust/files/rust/0008-install-disable-ldconfig.patch
similarity index 100%
rename from recipes/rust/files/rust/0008-install-disable-ldconfig.patch
rename to recipes-devtools/rust/files/rust/0008-install-disable-ldconfig.patch
diff --git a/recipes/rust/files/rust/0009-Remove-crate-metadata-from-symbol-hashing.patch b/recipes-devtools/rust/files/rust/0009-Remove-crate-metadata-from-symbol-hashing.patch
similarity index 100%
rename from recipes/rust/files/rust/0009-Remove-crate-metadata-from-symbol-hashing.patch
rename to recipes-devtools/rust/files/rust/0009-Remove-crate-metadata-from-symbol-hashing.patch
diff --git a/recipes/rust/files/rust/0010-rustc_trans-make-.note.rustc-look-more-like-debug-in.patch b/recipes-devtools/rust/files/rust/0010-rustc_trans-make-.note.rustc-look-more-like-debug-in.patch
similarity index 100%
rename from recipes/rust/files/rust/0010-rustc_trans-make-.note.rustc-look-more-like-debug-in.patch
rename to recipes-devtools/rust/files/rust/0010-rustc_trans-make-.note.rustc-look-more-like-debug-in.patch
diff --git a/recipes/rust/files/rust/0011-Allow-overriding-crate_hash-with-C-crate_hash.patch b/recipes-devtools/rust/files/rust/0011-Allow-overriding-crate_hash-with-C-crate_hash.patch
similarity index 100%
rename from recipes/rust/files/rust/0011-Allow-overriding-crate_hash-with-C-crate_hash.patch
rename to recipes-devtools/rust/files/rust/0011-Allow-overriding-crate_hash-with-C-crate_hash.patch
diff --git a/recipes/rust/files/rust/0012-mk-platform.mk-pass-C-crate_hash-to-builds.patch b/recipes-devtools/rust/files/rust/0012-mk-platform.mk-pass-C-crate_hash-to-builds.patch
similarity index 100%
rename from recipes/rust/files/rust/0012-mk-platform.mk-pass-C-crate_hash-to-builds.patch
rename to recipes-devtools/rust/files/rust/0012-mk-platform.mk-pass-C-crate_hash-to-builds.patch
diff --git a/recipes/rust/files/rust/0013-mk-allow-changing-the-platform-configuration-source-.patch b/recipes-devtools/rust/files/rust/0013-mk-allow-changing-the-platform-configuration-source-.patch
similarity index 100%
rename from recipes/rust/files/rust/0013-mk-allow-changing-the-platform-configuration-source-.patch
rename to recipes-devtools/rust/files/rust/0013-mk-allow-changing-the-platform-configuration-source-.patch
diff --git a/recipes/rust/rust-cross.bb b/recipes-devtools/rust/rust-cross.bb
similarity index 100%
rename from recipes/rust/rust-cross.bb
rename to recipes-devtools/rust/rust-cross.bb
diff --git a/recipes/rust/rust-llvm.bb b/recipes-devtools/rust/rust-llvm.bb
similarity index 100%
rename from recipes/rust/rust-llvm.bb
rename to recipes-devtools/rust/rust-llvm.bb
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-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-shared-source.inc b/recipes-devtools/rust/rust-shared-source.inc
similarity index 100%
rename from recipes/rust/rust-shared-source.inc
rename to recipes-devtools/rust/rust-shared-source.inc
diff --git a/recipes/rust/rust-snapshot-2015-08-11.inc b/recipes-devtools/rust/rust-snapshot-2015-08-11.inc
similarity index 100%
rename from recipes/rust/rust-snapshot-2015-08-11.inc
rename to recipes-devtools/rust/rust-snapshot-2015-08-11.inc
diff --git a/recipes/rust/rust-source.bb b/recipes-devtools/rust/rust-source.bb
similarity index 100%
rename from recipes/rust/rust-source.bb
rename to recipes-devtools/rust/rust-source.bb
diff --git a/recipes/rust/rust-version.inc b/recipes-devtools/rust/rust-version.inc
similarity index 100%
rename from recipes/rust/rust-version.inc
rename to recipes-devtools/rust/rust-version.inc
diff --git a/recipes/rust/rust.bb b/recipes-devtools/rust/rust.bb
similarity index 100%
rename from recipes/rust/rust.bb
rename to recipes-devtools/rust/rust.bb
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/rustlib.bb b/recipes-devtools/rust/rustlib.bb
similarity index 100%
rename from recipes/rust/rustlib.bb
rename to recipes-devtools/rust/rustlib.bb