diff --git a/Makefile b/Makefile
index c202829..ff56a65 100644
--- a/Makefile
+++ b/Makefile
@@ -16,15 +16,15 @@ BOARDS := arrow,apq8096-db820c \
 	  qcom,apq8016-sbc
 
 define add-scripts
-$(DESTDIR)$(prefix)/bin/$1: $1
+$(DESTDIR)$(prefix)/bin/$2: $1/$2
 	@echo "INSTALL $$<"
 	@install -D -m 755 $$< $$@
 
-all-install += $(DESTDIR)$(prefix)/bin/$1
+all-install += $(DESTDIR)$(prefix)/bin/$2
 endef
 
-$(foreach v,${BOARDS},$(eval $(call add-scripts,$v)))
-$(foreach v,${HELPERS},$(eval $(call add-scripts,$v)))
+$(foreach v,${BOARDS},$(eval $(call add-scripts,boards,$v)))
+$(foreach v,${HELPERS},$(eval $(call add-scripts,helpers,$v)))
 
 install: $(all-install)
 
diff --git a/arrow,apq8096-db820c b/boards/arrow,apq8096-db820c
similarity index 100%
rename from arrow,apq8096-db820c
rename to boards/arrow,apq8096-db820c
diff --git a/qcom,apq8016-sbc b/boards/qcom,apq8016-sbc
similarity index 100%
rename from qcom,apq8016-sbc
rename to boards/qcom,apq8016-sbc
diff --git a/assert_device_present b/helpers/assert_device_present
similarity index 100%
rename from assert_device_present
rename to helpers/assert_device_present
diff --git a/assert_driver_present b/helpers/assert_driver_present
similarity index 100%
rename from assert_driver_present
rename to helpers/assert_driver_present
diff --git a/assert_mmc_present b/helpers/assert_mmc_present
similarity index 100%
rename from assert_mmc_present
rename to helpers/assert_mmc_present
diff --git a/assert_partition_found b/helpers/assert_partition_found
similarity index 100%
rename from assert_partition_found
rename to helpers/assert_partition_found
diff --git a/ensure_lib_firmware b/helpers/ensure_lib_firmware
similarity index 100%
rename from ensure_lib_firmware
rename to helpers/ensure_lib_firmware
diff --git a/rproc-start b/helpers/rproc-start
similarity index 100%
rename from rproc-start
rename to helpers/rproc-start
diff --git a/rproc-stop b/helpers/rproc-stop
similarity index 100%
rename from rproc-stop
rename to helpers/rproc-stop