diff --git a/recipes-core/battery-test/battery-test_git.bb b/recipes-tools/battery-test/battery-test_git.bb
similarity index 100%
rename from recipes-core/battery-test/battery-test_git.bb
rename to recipes-tools/battery-test/battery-test_git.bb
diff --git a/recipes-support/nmhw-auto-part/nmhw-auto-part/COPYING b/recipes-tools/nmhw-auto-part/nmhw-auto-part/COPYING
similarity index 100%
rename from recipes-support/nmhw-auto-part/nmhw-auto-part/COPYING
rename to recipes-tools/nmhw-auto-part/nmhw-auto-part/COPYING
diff --git a/recipes-support/nmhw-auto-part/nmhw-auto-part/nmhw-auto-part b/recipes-tools/nmhw-auto-part/nmhw-auto-part/nmhw-auto-part
similarity index 100%
rename from recipes-support/nmhw-auto-part/nmhw-auto-part/nmhw-auto-part
rename to recipes-tools/nmhw-auto-part/nmhw-auto-part/nmhw-auto-part
diff --git a/recipes-support/nmhw-auto-part/nmhw-auto-part_1.1.0.bb b/recipes-tools/nmhw-auto-part/nmhw-auto-part_1.1.0.bb
similarity index 100%
rename from recipes-support/nmhw-auto-part/nmhw-auto-part_1.1.0.bb
rename to recipes-tools/nmhw-auto-part/nmhw-auto-part_1.1.0.bb
diff --git a/recipes-core/nmhw-fwupdate/nmhw-fwupdate.bb b/recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb
similarity index 100%
rename from recipes-core/nmhw-fwupdate/nmhw-fwupdate.bb
rename to recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb