diff --git a/Config.in b/Config.in
index bdc6f06c..49f37390 100644
--- a/Config.in
+++ b/Config.in
@@ -1,3 +1,5 @@
+source "$BR2_EXTERNAL_INFIX_PATH/board/Config.in"
+
 menu "Branding"
 
 config INFIX_VENDOR
diff --git a/board/Config.in b/board/Config.in
new file mode 100644
index 00000000..2fd7fadb
--- /dev/null
+++ b/board/Config.in
@@ -0,0 +1,7 @@
+menu "Board Support"
+
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/riscv64/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/x86_64/Config.in"
+
+endmenu
diff --git a/board/aarch64/Config.in b/board/aarch64/Config.in
new file mode 100644
index 00000000..4808b6d7
--- /dev/null
+++ b/board/aarch64/Config.in
@@ -0,0 +1,12 @@
+if BR2_aarch64
+
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/alder-alder/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/bananapi-bpi-r3/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/freescale-imx8mp-evk/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/marvell-cn9130-crb/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/marvell-espressobin/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/microchip-sparx5-pcb135/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/raspberrypi-rpi64/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/aarch64/styx-dcp-sc-28p/Config.in"
+
+endif
diff --git a/package/board/alder-alder/Config.in b/board/aarch64/alder-alder/Config.in
similarity index 100%
rename from package/board/alder-alder/Config.in
rename to board/aarch64/alder-alder/Config.in
diff --git a/src/board/alder-alder/LICENSE b/board/aarch64/alder-alder/LICENSE
similarity index 100%
rename from src/board/alder-alder/LICENSE
rename to board/aarch64/alder-alder/LICENSE
diff --git a/package/board/alder-alder/alder-alder.mk b/board/aarch64/alder-alder/alder-alder.mk
similarity index 100%
rename from package/board/alder-alder/alder-alder.mk
rename to board/aarch64/alder-alder/alder-alder.mk
diff --git a/src/board/alder-alder/dts/Makefile b/board/aarch64/alder-alder/dts/Makefile
similarity index 100%
rename from src/board/alder-alder/dts/Makefile
rename to board/aarch64/alder-alder/dts/Makefile
diff --git a/src/board/alder-alder/dts/alder/alder-mpp.h b/board/aarch64/alder-alder/dts/alder/alder-mpp.h
similarity index 100%
rename from src/board/alder-alder/dts/alder/alder-mpp.h
rename to board/aarch64/alder-alder/dts/alder/alder-mpp.h
diff --git a/src/board/alder-alder/dts/alder/alder.dts b/board/aarch64/alder-alder/dts/alder/alder.dts
similarity index 100%
rename from src/board/alder-alder/dts/alder/alder.dts
rename to board/aarch64/alder-alder/dts/alder/alder.dts
diff --git a/src/board/alder-alder/dts/alder/alder.dtsi b/board/aarch64/alder-alder/dts/alder/alder.dtsi
similarity index 100%
rename from src/board/alder-alder/dts/alder/alder.dtsi
rename to board/aarch64/alder-alder/dts/alder/alder.dtsi
diff --git a/src/board/alder-alder/dts/marvell/cn9130-patched.dtsi b/board/aarch64/alder-alder/dts/marvell/cn9130-patched.dtsi
similarity index 100%
rename from src/board/alder-alder/dts/marvell/cn9130-patched.dtsi
rename to board/aarch64/alder-alder/dts/marvell/cn9130-patched.dtsi
diff --git a/package/board/banana-pi-r3/Config.in b/board/aarch64/bananapi-bpi-r3/Config.in
similarity index 88%
rename from package/board/banana-pi-r3/Config.in
rename to board/aarch64/bananapi-bpi-r3/Config.in
index 6c7578cc..c7cccf3f 100644
--- a/package/board/banana-pi-r3/Config.in
+++ b/board/aarch64/bananapi-bpi-r3/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_BANANA_PI_R3
+config BR2_PACKAGE_BANANAPI_BPI_R3
 	bool "Banana Pi R3"
 	depends on BR2_aarch64
 	select BR2_PACKAGE_FEATURE_WIFI
diff --git a/src/board/banana-pi-r3/LICENSE b/board/aarch64/bananapi-bpi-r3/LICENSE
similarity index 100%
rename from src/board/banana-pi-r3/LICENSE
rename to board/aarch64/bananapi-bpi-r3/LICENSE
diff --git a/board/aarch64/banana-pi-r3/README.md b/board/aarch64/bananapi-bpi-r3/README.md
similarity index 100%
rename from board/aarch64/banana-pi-r3/README.md
rename to board/aarch64/bananapi-bpi-r3/README.md
diff --git a/package/board/banana-pi-r3/banana-pi-r3.mk b/board/aarch64/bananapi-bpi-r3/bananapi-bpi-r3.mk
similarity index 89%
rename from package/board/banana-pi-r3/banana-pi-r3.mk
rename to board/aarch64/bananapi-bpi-r3/bananapi-bpi-r3.mk
index a000411c..506114f4 100644
--- a/package/board/banana-pi-r3/banana-pi-r3.mk
+++ b/board/aarch64/bananapi-bpi-r3/bananapi-bpi-r3.mk
@@ -1,8 +1,4 @@
-GENIMAGE_CFG="$(BUILD_DIR)/genimage.cfg"
-GENIMAGE_TMP="$(BUILD_DIR)/genimage.tmp"
-BOARD_DIR="$(BR2_EXTERNAL_INFIX_PATH)/src/board/banana-pi-r3"
-
-define BANANA_PI_R3_LINUX_CONFIG_FIXUPS
+define BANANAPI_BPI_R3_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_ENABLE_OPT,CONFIG_ARCH_MEDIATEK)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_MACH_MT7986)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_PINCTRL_MT7986)
diff --git a/src/board/banana-pi-r3/dts/Makefile b/board/aarch64/bananapi-bpi-r3/dts/Makefile
similarity index 100%
rename from src/board/banana-pi-r3/dts/Makefile
rename to board/aarch64/bananapi-bpi-r3/dts/Makefile
diff --git a/src/board/banana-pi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dts b/board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dts
similarity index 100%
rename from src/board/banana-pi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dts
rename to board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dts
diff --git a/src/board/banana-pi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtsi b/board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtsi
similarity index 100%
rename from src/board/banana-pi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtsi
rename to board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtsi
diff --git a/src/board/banana-pi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi b/board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi
similarity index 100%
rename from src/board/banana-pi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi
rename to board/aarch64/bananapi-bpi-r3/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi
diff --git a/src/board/banana-pi-r3/genimage.cfg.in b/board/aarch64/bananapi-bpi-r3/genimage.cfg.in
similarity index 100%
rename from src/board/banana-pi-r3/genimage.cfg.in
rename to board/aarch64/bananapi-bpi-r3/genimage.cfg.in
diff --git a/src/board/banana-pi-r3/mkimage.sh b/board/aarch64/bananapi-bpi-r3/mkimage.sh
similarity index 100%
rename from src/board/banana-pi-r3/mkimage.sh
rename to board/aarch64/bananapi-bpi-r3/mkimage.sh
diff --git a/src/board/banana-pi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg b/board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg
similarity index 100%
rename from src/board/banana-pi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg
rename to board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg
diff --git a/src/board/banana-pi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/product/init.d/S01-trigger-udev.sh b/board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/product/init.d/S01-trigger-udev.sh
similarity index 100%
rename from src/board/banana-pi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/product/init.d/S01-trigger-udev.sh
rename to board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/product/init.d/S01-trigger-udev.sh
diff --git a/src/board/banana-pi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/udev/rules.d/90-bpi-r3-rename-eth1.rules b/board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/udev/rules.d/90-bpi-r3-rename-eth1.rules
similarity index 100%
rename from src/board/banana-pi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/udev/rules.d/90-bpi-r3-rename-eth1.rules
rename to board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/udev/rules.d/90-bpi-r3-rename-eth1.rules
diff --git a/src/board/banana-pi-r3/uboot/extras.config b/board/aarch64/bananapi-bpi-r3/uboot/extras.config
similarity index 100%
rename from src/board/banana-pi-r3/uboot/extras.config
rename to board/aarch64/bananapi-bpi-r3/uboot/extras.config
diff --git a/src/board/banana-pi-r3/uboot/mt7986-env.dtsi b/board/aarch64/bananapi-bpi-r3/uboot/mt7986-env.dtsi
similarity index 100%
rename from src/board/banana-pi-r3/uboot/mt7986-env.dtsi
rename to board/aarch64/bananapi-bpi-r3/uboot/mt7986-env.dtsi
diff --git a/src/board/banana-pi-r3/uboot/mt7986-sd-env.dtsi b/board/aarch64/bananapi-bpi-r3/uboot/mt7986-sd-env.dtsi
similarity index 100%
rename from src/board/banana-pi-r3/uboot/mt7986-sd-env.dtsi
rename to board/aarch64/bananapi-bpi-r3/uboot/mt7986-sd-env.dtsi
diff --git a/src/board/banana-pi-r3/uboot/sd-extras.config b/board/aarch64/bananapi-bpi-r3/uboot/sd-extras.config
similarity index 100%
rename from src/board/banana-pi-r3/uboot/sd-extras.config
rename to board/aarch64/bananapi-bpi-r3/uboot/sd-extras.config
diff --git a/package/board/freescale-imx8mp-evk/Config.in b/board/aarch64/freescale-imx8mp-evk/Config.in
similarity index 100%
rename from package/board/freescale-imx8mp-evk/Config.in
rename to board/aarch64/freescale-imx8mp-evk/Config.in
diff --git a/src/board/freescale-imx8mp-evk/LICENSE b/board/aarch64/freescale-imx8mp-evk/LICENSE
similarity index 100%
rename from src/board/freescale-imx8mp-evk/LICENSE
rename to board/aarch64/freescale-imx8mp-evk/LICENSE
diff --git a/src/board/freescale-imx8mp-evk/dts/Makefile b/board/aarch64/freescale-imx8mp-evk/dts/Makefile
similarity index 100%
rename from src/board/freescale-imx8mp-evk/dts/Makefile
rename to board/aarch64/freescale-imx8mp-evk/dts/Makefile
diff --git a/src/board/freescale-imx8mp-evk/dts/freescale/imx8mp-evk.dts b/board/aarch64/freescale-imx8mp-evk/dts/freescale/imx8mp-evk.dts
similarity index 100%
rename from src/board/freescale-imx8mp-evk/dts/freescale/imx8mp-evk.dts
rename to board/aarch64/freescale-imx8mp-evk/dts/freescale/imx8mp-evk.dts
diff --git a/package/board/freescale-imx8mp-evk/imx8mp-evk.mk b/board/aarch64/freescale-imx8mp-evk/freescale-imx8mp-evk.mk
similarity index 100%
rename from package/board/freescale-imx8mp-evk/imx8mp-evk.mk
rename to board/aarch64/freescale-imx8mp-evk/freescale-imx8mp-evk.mk
diff --git a/src/board/freescale-imx8mp-evk/rootfs/usr/share/product/fsl,imx8mp-evk/etc/product/interface-quirks.json b/board/aarch64/freescale-imx8mp-evk/rootfs/usr/share/product/fsl,imx8mp-evk/etc/product/interface-quirks.json
similarity index 100%
rename from src/board/freescale-imx8mp-evk/rootfs/usr/share/product/fsl,imx8mp-evk/etc/product/interface-quirks.json
rename to board/aarch64/freescale-imx8mp-evk/rootfs/usr/share/product/fsl,imx8mp-evk/etc/product/interface-quirks.json
diff --git a/board/aarch64/r2s/README.md b/board/aarch64/friendlyelec/nanopi-r2s/README.md
similarity index 100%
rename from board/aarch64/r2s/README.md
rename to board/aarch64/friendlyelec/nanopi-r2s/README.md
diff --git a/board/aarch64/r2s/genimage.cfg b/board/aarch64/friendlyelec/nanopi-r2s/genimage.cfg
similarity index 100%
rename from board/aarch64/r2s/genimage.cfg
rename to board/aarch64/friendlyelec/nanopi-r2s/genimage.cfg
diff --git a/board/aarch64/r2s/linux_defconfig b/board/aarch64/friendlyelec/nanopi-r2s/linux_defconfig
similarity index 100%
rename from board/aarch64/r2s/linux_defconfig
rename to board/aarch64/friendlyelec/nanopi-r2s/linux_defconfig
diff --git a/board/aarch64/r2s/post-build.sh b/board/aarch64/friendlyelec/nanopi-r2s/post-build.sh
similarity index 100%
rename from board/aarch64/r2s/post-build.sh
rename to board/aarch64/friendlyelec/nanopi-r2s/post-build.sh
diff --git a/board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch b/board/aarch64/friendlyelec/nanopi-r2s/rk3328-nanopi-r2s-dts.patch
similarity index 100%
rename from board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch
rename to board/aarch64/friendlyelec/nanopi-r2s/rk3328-nanopi-r2s-dts.patch
diff --git a/board/aarch64/r2s/rootfs/etc/factory-config.cfg b/board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/factory-config.cfg
similarity index 100%
rename from board/aarch64/r2s/rootfs/etc/factory-config.cfg
rename to board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/factory-config.cfg
diff --git a/board/aarch64/r2s/rootfs/etc/finit.d/enabled/input-event-daemon.conf b/board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/finit.d/enabled/input-event-daemon.conf
similarity index 100%
rename from board/aarch64/r2s/rootfs/etc/finit.d/enabled/input-event-daemon.conf
rename to board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/finit.d/enabled/input-event-daemon.conf
diff --git a/board/aarch64/r2s/rootfs/etc/finit.d/wan-monitor.conf b/board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/finit.d/wan-monitor.conf
similarity index 100%
rename from board/aarch64/r2s/rootfs/etc/finit.d/wan-monitor.conf
rename to board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/finit.d/wan-monitor.conf
diff --git a/board/aarch64/r2s/rootfs/etc/iitod.json b/board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/iitod.json
similarity index 100%
rename from board/aarch64/r2s/rootfs/etc/iitod.json
rename to board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/iitod.json
diff --git a/board/aarch64/r2s/rootfs/etc/input-event-daemon.conf b/board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/input-event-daemon.conf
similarity index 100%
rename from board/aarch64/r2s/rootfs/etc/input-event-daemon.conf
rename to board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/input-event-daemon.conf
diff --git a/board/aarch64/r2s/rootfs/etc/udev/rules.d/90-persistent-net.rules b/board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/udev/rules.d/90-persistent-net.rules
similarity index 100%
rename from board/aarch64/r2s/rootfs/etc/udev/rules.d/90-persistent-net.rules
rename to board/aarch64/friendlyelec/nanopi-r2s/rootfs/etc/udev/rules.d/90-persistent-net.rules
diff --git a/board/aarch64/r2s/rootfs/usr/sbin/wan-monitor.sh b/board/aarch64/friendlyelec/nanopi-r2s/rootfs/usr/sbin/wan-monitor.sh
similarity index 100%
rename from board/aarch64/r2s/rootfs/usr/sbin/wan-monitor.sh
rename to board/aarch64/friendlyelec/nanopi-r2s/rootfs/usr/sbin/wan-monitor.sh
diff --git a/board/aarch64/r2s/uboot/extras.config b/board/aarch64/friendlyelec/nanopi-r2s/uboot/extras.config
similarity index 100%
rename from board/aarch64/r2s/uboot/extras.config
rename to board/aarch64/friendlyelec/nanopi-r2s/uboot/extras.config
diff --git a/board/aarch64/r2s/uboot/r2s-env.dtsi b/board/aarch64/friendlyelec/nanopi-r2s/uboot/r2s-env.dtsi
similarity index 100%
rename from board/aarch64/r2s/uboot/r2s-env.dtsi
rename to board/aarch64/friendlyelec/nanopi-r2s/uboot/r2s-env.dtsi
diff --git a/package/board/marvell-cn9130-crb/Config.in b/board/aarch64/marvell-cn9130-crb/Config.in
similarity index 100%
rename from package/board/marvell-cn9130-crb/Config.in
rename to board/aarch64/marvell-cn9130-crb/Config.in
diff --git a/src/board/marvell-cn9130-crb/LICENSE b/board/aarch64/marvell-cn9130-crb/LICENSE
similarity index 100%
rename from src/board/marvell-cn9130-crb/LICENSE
rename to board/aarch64/marvell-cn9130-crb/LICENSE
diff --git a/board/aarch64/cn9130-crb/README.md b/board/aarch64/marvell-cn9130-crb/README.md
similarity index 100%
rename from board/aarch64/cn9130-crb/README.md
rename to board/aarch64/marvell-cn9130-crb/README.md
diff --git a/src/board/marvell-cn9130-crb/dts/Makefile b/board/aarch64/marvell-cn9130-crb/dts/Makefile
similarity index 100%
rename from src/board/marvell-cn9130-crb/dts/Makefile
rename to board/aarch64/marvell-cn9130-crb/dts/Makefile
diff --git a/src/board/marvell-cn9130-crb/dts/marvell/cn9130-crb-A.dts b/board/aarch64/marvell-cn9130-crb/dts/marvell/cn9130-crb-A.dts
similarity index 100%
rename from src/board/marvell-cn9130-crb/dts/marvell/cn9130-crb-A.dts
rename to board/aarch64/marvell-cn9130-crb/dts/marvell/cn9130-crb-A.dts
diff --git a/package/board/marvell-cn9130-crb/marvell-cn9130-crb.mk b/board/aarch64/marvell-cn9130-crb/marvell-cn9130-crb.mk
similarity index 100%
rename from package/board/marvell-cn9130-crb/marvell-cn9130-crb.mk
rename to board/aarch64/marvell-cn9130-crb/marvell-cn9130-crb.mk
diff --git a/board/aarch64/cn9130-crb/uboot/cn9130-crb-env.dtsi b/board/aarch64/marvell-cn9130-crb/uboot/cn9130-crb-env.dtsi
similarity index 100%
rename from board/aarch64/cn9130-crb/uboot/cn9130-crb-env.dtsi
rename to board/aarch64/marvell-cn9130-crb/uboot/cn9130-crb-env.dtsi
diff --git a/board/aarch64/cn9130-crb/uboot/extras.config b/board/aarch64/marvell-cn9130-crb/uboot/extras.config
similarity index 100%
rename from board/aarch64/cn9130-crb/uboot/extras.config
rename to board/aarch64/marvell-cn9130-crb/uboot/extras.config
diff --git a/package/board/marvell-espressobin/Config.in b/board/aarch64/marvell-espressobin/Config.in
similarity index 100%
rename from package/board/marvell-espressobin/Config.in
rename to board/aarch64/marvell-espressobin/Config.in
diff --git a/src/board/marvell-espressobin/LICENSE b/board/aarch64/marvell-espressobin/LICENSE
similarity index 100%
rename from src/board/marvell-espressobin/LICENSE
rename to board/aarch64/marvell-espressobin/LICENSE
diff --git a/src/board/marvell-espressobin/dts/Makefile b/board/aarch64/marvell-espressobin/dts/Makefile
similarity index 100%
rename from src/board/marvell-espressobin/dts/Makefile
rename to board/aarch64/marvell-espressobin/dts/Makefile
diff --git a/src/board/marvell-espressobin/dts/marvell/armada-3720-espressobin-emmc.dts b/board/aarch64/marvell-espressobin/dts/marvell/armada-3720-espressobin-emmc.dts
similarity index 100%
rename from src/board/marvell-espressobin/dts/marvell/armada-3720-espressobin-emmc.dts
rename to board/aarch64/marvell-espressobin/dts/marvell/armada-3720-espressobin-emmc.dts
diff --git a/src/board/marvell-espressobin/dts/marvell/armada-3720-espressobin-ultra.dts b/board/aarch64/marvell-espressobin/dts/marvell/armada-3720-espressobin-ultra.dts
similarity index 100%
rename from src/board/marvell-espressobin/dts/marvell/armada-3720-espressobin-ultra.dts
rename to board/aarch64/marvell-espressobin/dts/marvell/armada-3720-espressobin-ultra.dts
diff --git a/src/board/marvell-espressobin/dts/marvell/armada-3720-espressobin-v7-emmc.dts b/board/aarch64/marvell-espressobin/dts/marvell/armada-3720-espressobin-v7-emmc.dts
similarity index 100%
rename from src/board/marvell-espressobin/dts/marvell/armada-3720-espressobin-v7-emmc.dts
rename to board/aarch64/marvell-espressobin/dts/marvell/armada-3720-espressobin-v7-emmc.dts
diff --git a/src/board/marvell-espressobin/dts/marvell/armada-3720-espressobin-v7.dts b/board/aarch64/marvell-espressobin/dts/marvell/armada-3720-espressobin-v7.dts
similarity index 100%
rename from src/board/marvell-espressobin/dts/marvell/armada-3720-espressobin-v7.dts
rename to board/aarch64/marvell-espressobin/dts/marvell/armada-3720-espressobin-v7.dts
diff --git a/src/board/marvell-espressobin/dts/marvell/armada-3720-espressobin.dts b/board/aarch64/marvell-espressobin/dts/marvell/armada-3720-espressobin.dts
similarity index 100%
rename from src/board/marvell-espressobin/dts/marvell/armada-3720-espressobin.dts
rename to board/aarch64/marvell-espressobin/dts/marvell/armada-3720-espressobin.dts
diff --git a/board/aarch64/espressobin/genimage.cfg b/board/aarch64/marvell-espressobin/genimage.cfg
similarity index 100%
rename from board/aarch64/espressobin/genimage.cfg
rename to board/aarch64/marvell-espressobin/genimage.cfg
diff --git a/package/board/marvell-espressobin/marvell-espressobin.mk b/board/aarch64/marvell-espressobin/marvell-espressobin.mk
similarity index 100%
rename from package/board/marvell-espressobin/marvell-espressobin.mk
rename to board/aarch64/marvell-espressobin/marvell-espressobin.mk
diff --git a/package/board/microchip-sparx5-pcb135/Config.in b/board/aarch64/microchip-sparx5-pcb135/Config.in
similarity index 100%
rename from package/board/microchip-sparx5-pcb135/Config.in
rename to board/aarch64/microchip-sparx5-pcb135/Config.in
diff --git a/src/board/microchip-sparx5-pcb135/LICENSE b/board/aarch64/microchip-sparx5-pcb135/LICENSE
similarity index 100%
rename from src/board/microchip-sparx5-pcb135/LICENSE
rename to board/aarch64/microchip-sparx5-pcb135/LICENSE
diff --git a/board/aarch64/sparx5-pcb135/README.md b/board/aarch64/microchip-sparx5-pcb135/README.md
similarity index 100%
rename from board/aarch64/sparx5-pcb135/README.md
rename to board/aarch64/microchip-sparx5-pcb135/README.md
diff --git a/src/board/microchip-sparx5-pcb135/dts/Makefile b/board/aarch64/microchip-sparx5-pcb135/dts/Makefile
similarity index 100%
rename from src/board/microchip-sparx5-pcb135/dts/Makefile
rename to board/aarch64/microchip-sparx5-pcb135/dts/Makefile
diff --git a/src/board/microchip-sparx5-pcb135/dts/microchip/sparx5_pcb135_emmc_no_psci.dts b/board/aarch64/microchip-sparx5-pcb135/dts/microchip/sparx5_pcb135_emmc_no_psci.dts
similarity index 100%
rename from src/board/microchip-sparx5-pcb135/dts/microchip/sparx5_pcb135_emmc_no_psci.dts
rename to board/aarch64/microchip-sparx5-pcb135/dts/microchip/sparx5_pcb135_emmc_no_psci.dts
diff --git a/package/board/microchip-sparx5-pcb135/microchip-sparx5-pcb135.mk b/board/aarch64/microchip-sparx5-pcb135/microchip-sparx5-pcb135.mk
similarity index 100%
rename from package/board/microchip-sparx5-pcb135/microchip-sparx5-pcb135.mk
rename to board/aarch64/microchip-sparx5-pcb135/microchip-sparx5-pcb135.mk
diff --git a/board/aarch64/qemu/uboot/extras.config b/board/aarch64/qemu-uboot/extras.config
similarity index 100%
rename from board/aarch64/qemu/uboot/extras.config
rename to board/aarch64/qemu-uboot/extras.config
diff --git a/package/board/raspberry-pi64/Config.in b/board/aarch64/raspberrypi-rpi64/Config.in
similarity index 91%
rename from package/board/raspberry-pi64/Config.in
rename to board/aarch64/raspberrypi-rpi64/Config.in
index 3fe7d1d2..3596de7c 100644
--- a/package/board/raspberry-pi64/Config.in
+++ b/board/aarch64/raspberrypi-rpi64/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_RASPBERRY_PI64
+config BR2_PACKAGE_RASPBERRYPI_RPI64
 	bool "Raspberry Pi 64-bit (RPi3 and later)"
 	depends on BR2_aarch64
 	select SDCARD_AUX
@@ -10,4 +10,3 @@ config BR2_PACKAGE_RASPBERRY_PI64
 	  Raspberry Pi 64-bit adds support for the Raspberry Pi family of
 	  of single-board computers (SBC), RPi 3B and later, including the
 	  Raspberry Pi 2W, which shares the same CPU core as RPi 3B.
-
diff --git a/src/board/raspberry-pi64/LICENSE b/board/aarch64/raspberrypi-rpi64/LICENSE
similarity index 100%
rename from src/board/raspberry-pi64/LICENSE
rename to board/aarch64/raspberrypi-rpi64/LICENSE
diff --git a/board/aarch64/raspberry-pi64/README.md b/board/aarch64/raspberrypi-rpi64/README.md
similarity index 100%
rename from board/aarch64/raspberry-pi64/README.md
rename to board/aarch64/raspberrypi-rpi64/README.md
diff --git a/src/board/raspberry-pi64/cmdline.txt b/board/aarch64/raspberrypi-rpi64/cmdline.txt
similarity index 100%
rename from src/board/raspberry-pi64/cmdline.txt
rename to board/aarch64/raspberrypi-rpi64/cmdline.txt
diff --git a/src/board/raspberry-pi64/config.txt b/board/aarch64/raspberrypi-rpi64/config.txt
similarity index 100%
rename from src/board/raspberry-pi64/config.txt
rename to board/aarch64/raspberrypi-rpi64/config.txt
diff --git a/src/board/raspberry-pi64/dts/Makefile b/board/aarch64/raspberrypi-rpi64/dts/Makefile
similarity index 100%
rename from src/board/raspberry-pi64/dts/Makefile
rename to board/aarch64/raspberrypi-rpi64/dts/Makefile
diff --git a/src/board/raspberry-pi64/dts/broadcom/bcm2711-rpi-4-b-dsi.dts b/board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2711-rpi-4-b-dsi.dts
similarity index 100%
rename from src/board/raspberry-pi64/dts/broadcom/bcm2711-rpi-4-b-dsi.dts
rename to board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2711-rpi-4-b-dsi.dts
diff --git a/src/board/raspberry-pi64/dts/broadcom/bcm2711-rpi-4-b.dts b/board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2711-rpi-4-b.dts
similarity index 100%
rename from src/board/raspberry-pi64/dts/broadcom/bcm2711-rpi-4-b.dts
rename to board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2711-rpi-4-b.dts
diff --git a/src/board/raspberry-pi64/dts/broadcom/bcm2711-rpi-400.dts b/board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2711-rpi-400.dts
similarity index 100%
rename from src/board/raspberry-pi64/dts/broadcom/bcm2711-rpi-400.dts
rename to board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2711-rpi-400.dts
diff --git a/src/board/raspberry-pi64/dts/broadcom/bcm2711-rpi-cm4-io.dts b/board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2711-rpi-cm4-io.dts
similarity index 100%
rename from src/board/raspberry-pi64/dts/broadcom/bcm2711-rpi-cm4-io.dts
rename to board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2711-rpi-cm4-io.dts
diff --git a/src/board/raspberry-pi64/dts/broadcom/bcm2711-rpi-cm4.dts b/board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2711-rpi-cm4.dts
similarity index 100%
rename from src/board/raspberry-pi64/dts/broadcom/bcm2711-rpi-cm4.dts
rename to board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2711-rpi-cm4.dts
diff --git a/src/board/raspberry-pi64/dts/broadcom/bcm2837-rpi-3-b.dts b/board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2837-rpi-3-b.dts
similarity index 100%
rename from src/board/raspberry-pi64/dts/broadcom/bcm2837-rpi-3-b.dts
rename to board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2837-rpi-3-b.dts
diff --git a/src/board/raspberry-pi64/dts/broadcom/bcm2837-rpi-zero-2-w.dts b/board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2837-rpi-zero-2-w.dts
similarity index 100%
rename from src/board/raspberry-pi64/dts/broadcom/bcm2837-rpi-zero-2-w.dts
rename to board/aarch64/raspberrypi-rpi64/dts/broadcom/bcm2837-rpi-zero-2-w.dts
diff --git a/src/board/raspberry-pi64/dts/broadcom/infix.dtsi b/board/aarch64/raspberrypi-rpi64/dts/broadcom/infix.dtsi
similarity index 100%
rename from src/board/raspberry-pi64/dts/broadcom/infix.dtsi
rename to board/aarch64/raspberrypi-rpi64/dts/broadcom/infix.dtsi
diff --git a/src/board/raspberry-pi64/genimage.cfg.in b/board/aarch64/raspberrypi-rpi64/genimage.cfg.in
similarity index 100%
rename from src/board/raspberry-pi64/genimage.cfg.in
rename to board/aarch64/raspberrypi-rpi64/genimage.cfg.in
diff --git a/src/board/raspberry-pi64/mkimage.sh b/board/aarch64/raspberrypi-rpi64/mkimage.sh
similarity index 100%
rename from src/board/raspberry-pi64/mkimage.sh
rename to board/aarch64/raspberrypi-rpi64/mkimage.sh
diff --git a/package/board/raspberry-pi64/raspberry-pi64.mk b/board/aarch64/raspberrypi-rpi64/raspberrypi-rpi64.mk
similarity index 98%
rename from package/board/raspberry-pi64/raspberry-pi64.mk
rename to board/aarch64/raspberrypi-rpi64/raspberrypi-rpi64.mk
index 43ddd8a1..341407ad 100644
--- a/package/board/raspberry-pi64/raspberry-pi64.mk
+++ b/board/aarch64/raspberrypi-rpi64/raspberrypi-rpi64.mk
@@ -1,6 +1,6 @@
 # The CONFIG_REGULATOR_GPIO=y is load bearing for booting the RPi4 from
 # SD card, see regulator-sd-io-1v8 in bcm2711-rpi-4-b.dts for details.
-define RASPBERRY_PI_4_LINUX_CONFIG_FIXUPS
+define RASPBERRYPI_RPI64_LINUX_CONFIG_FIXUPS
 	$(call KCONFIG_ENABLE_OPT,CONFIG_SOUND)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_SND)
 	$(call KCONFIG_ENABLE_OPT,CONFIG_SND_SOC)
@@ -62,5 +62,6 @@ define RASPBERRY_PI_4_LINUX_CONFIG_FIXUPS
 
 	$(call KCONFIG_ENABLE_OPT,CONFIG_BACKLIGHT_CLASS_DEVICE)
 endef
+
 $(eval $(ix-board))
 $(eval $(generic-package))
diff --git a/src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,3-model-b b/board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,3-model-b
similarity index 100%
rename from src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,3-model-b
rename to board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,3-model-b
diff --git a/src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,4-compute-module/etc/product/interface-quirks.json b/board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-compute-module/etc/product/interface-quirks.json
similarity index 100%
rename from src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,4-compute-module/etc/product/interface-quirks.json
rename to board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-compute-module/etc/product/interface-quirks.json
diff --git a/src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,4-compute-module/interface-quirks.json b/board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-compute-module/interface-quirks.json
similarity index 100%
rename from src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,4-compute-module/interface-quirks.json
rename to board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-compute-module/interface-quirks.json
diff --git a/src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/factory-config.cfg b/board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/factory-config.cfg
similarity index 100%
rename from src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/factory-config.cfg
rename to board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/factory-config.cfg
diff --git a/src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/product/interface-quirks.json b/board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/product/interface-quirks.json
similarity index 100%
rename from src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/product/interface-quirks.json
rename to board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/etc/product/interface-quirks.json
diff --git a/src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,4-model-b/usr/libexec/confd/product/gen-interfaces b/board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/usr/libexec/confd/product/gen-interfaces
similarity index 100%
rename from src/board/raspberry-pi64/rootfs/usr/share/product/raspberrypi,4-model-b/usr/libexec/confd/product/gen-interfaces
rename to board/aarch64/raspberrypi-rpi64/rootfs/usr/share/product/raspberrypi,4-model-b/usr/libexec/confd/product/gen-interfaces
diff --git a/src/board/raspberry-pi64/uboot/extras.config b/board/aarch64/raspberrypi-rpi64/uboot/extras.config
similarity index 100%
rename from src/board/raspberry-pi64/uboot/extras.config
rename to board/aarch64/raspberrypi-rpi64/uboot/extras.config
diff --git a/src/board/raspberry-pi64/uboot/rpi-env.dtso b/board/aarch64/raspberrypi-rpi64/uboot/rpi-env.dtso
similarity index 100%
rename from src/board/raspberry-pi64/uboot/rpi-env.dtso
rename to board/aarch64/raspberrypi-rpi64/uboot/rpi-env.dtso
diff --git a/package/board/styx-dcp-sc-28p/Config.in b/board/aarch64/styx-dcp-sc-28p/Config.in
similarity index 100%
rename from package/board/styx-dcp-sc-28p/Config.in
rename to board/aarch64/styx-dcp-sc-28p/Config.in
diff --git a/src/board/styx-dcp-sc-28p/LICENSE b/board/aarch64/styx-dcp-sc-28p/LICENSE
similarity index 100%
rename from src/board/styx-dcp-sc-28p/LICENSE
rename to board/aarch64/styx-dcp-sc-28p/LICENSE
diff --git a/src/board/styx-dcp-sc-28p/dts/Makefile b/board/aarch64/styx-dcp-sc-28p/dts/Makefile
similarity index 100%
rename from src/board/styx-dcp-sc-28p/dts/Makefile
rename to board/aarch64/styx-dcp-sc-28p/dts/Makefile
diff --git a/src/board/styx-dcp-sc-28p/dts/marvell/cn9130-patched.dtsi b/board/aarch64/styx-dcp-sc-28p/dts/marvell/cn9130-patched.dtsi
similarity index 100%
rename from src/board/styx-dcp-sc-28p/dts/marvell/cn9130-patched.dtsi
rename to board/aarch64/styx-dcp-sc-28p/dts/marvell/cn9130-patched.dtsi
diff --git a/src/board/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-a.dts b/board/aarch64/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-a.dts
similarity index 100%
rename from src/board/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-a.dts
rename to board/aarch64/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-a.dts
diff --git a/src/board/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-b.dts b/board/aarch64/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-b.dts
similarity index 100%
rename from src/board/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-b.dts
rename to board/aarch64/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-b.dts
diff --git a/src/board/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-mpp.h b/board/aarch64/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-mpp.h
similarity index 100%
rename from src/board/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-mpp.h
rename to board/aarch64/styx-dcp-sc-28p/dts/styx/dcp-sc-28p-mpp.h
diff --git a/src/board/styx-dcp-sc-28p/dts/styx/dcp-sc-28p.dtsi b/board/aarch64/styx-dcp-sc-28p/dts/styx/dcp-sc-28p.dtsi
similarity index 100%
rename from src/board/styx-dcp-sc-28p/dts/styx/dcp-sc-28p.dtsi
rename to board/aarch64/styx-dcp-sc-28p/dts/styx/dcp-sc-28p.dtsi
diff --git a/src/board/styx-dcp-sc-28p/rootfs/boot/styx/styx-b.dtb b/board/aarch64/styx-dcp-sc-28p/rootfs/boot/styx/styx-b.dtb
similarity index 100%
rename from src/board/styx-dcp-sc-28p/rootfs/boot/styx/styx-b.dtb
rename to board/aarch64/styx-dcp-sc-28p/rootfs/boot/styx/styx-b.dtb
diff --git a/src/board/styx-dcp-sc-28p/rootfs/boot/styx/styx.dtb b/board/aarch64/styx-dcp-sc-28p/rootfs/boot/styx/styx.dtb
similarity index 100%
rename from src/board/styx-dcp-sc-28p/rootfs/boot/styx/styx.dtb
rename to board/aarch64/styx-dcp-sc-28p/rootfs/boot/styx/styx.dtb
diff --git a/src/board/styx-dcp-sc-28p/rootfs/usr/libexec/styx/led.sh b/board/aarch64/styx-dcp-sc-28p/rootfs/usr/libexec/styx/led.sh
similarity index 100%
rename from src/board/styx-dcp-sc-28p/rootfs/usr/libexec/styx/led.sh
rename to board/aarch64/styx-dcp-sc-28p/rootfs/usr/libexec/styx/led.sh
diff --git a/src/board/styx-dcp-sc-28p/rootfs/usr/share/product/dcp-sc-28p/etc/finit.d/available/iitod.conf b/board/aarch64/styx-dcp-sc-28p/rootfs/usr/share/product/dcp-sc-28p/etc/finit.d/available/iitod.conf
similarity index 100%
rename from src/board/styx-dcp-sc-28p/rootfs/usr/share/product/dcp-sc-28p/etc/finit.d/available/iitod.conf
rename to board/aarch64/styx-dcp-sc-28p/rootfs/usr/share/product/dcp-sc-28p/etc/finit.d/available/iitod.conf
diff --git a/src/board/styx-dcp-sc-28p/rootfs/usr/share/product/styx,dcp-sc-28p/etc/product/init.d/S10-led b/board/aarch64/styx-dcp-sc-28p/rootfs/usr/share/product/styx,dcp-sc-28p/etc/product/init.d/S10-led
similarity index 100%
rename from src/board/styx-dcp-sc-28p/rootfs/usr/share/product/styx,dcp-sc-28p/etc/product/init.d/S10-led
rename to board/aarch64/styx-dcp-sc-28p/rootfs/usr/share/product/styx,dcp-sc-28p/etc/product/init.d/S10-led
diff --git a/package/board/styx-dcp-sc-28p/styx-dcp-sc-28p.mk b/board/aarch64/styx-dcp-sc-28p/styx-dcp-sc-28p.mk
similarity index 100%
rename from package/board/styx-dcp-sc-28p/styx-dcp-sc-28p.mk
rename to board/aarch64/styx-dcp-sc-28p/styx-dcp-sc-28p.mk
diff --git a/board/board.mk b/board/board.mk
new file mode 100644
index 00000000..a87a8715
--- /dev/null
+++ b/board/board.mk
@@ -0,0 +1,2 @@
+include $(BR2_EXTERNAL_INFIX_PATH)/board/ix-board.mk
+include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/board/*/*/*.mk))
diff --git a/board/common/README.txt b/board/common/README.txt
index 2ab5592d..b11a3b77 100644
--- a/board/common/README.txt
+++ b/board/common/README.txt
@@ -94,10 +94,9 @@ If you see the following line printed one or more times, don't panic.
 
     LABEL=var: Can't lookup blockdev
 
-See the Customizing section above.  To silence the error you need to
-create another writable partition for Infix to store logs, container
-images, etc.  Look for the 'var' keyword, you can adjust the size of
-the partition.
+See the Customizing section above.  Silence the error by selecting one
+more writable partition (/var) in menuconfig for log files, container
+images, etc.  The size can also be adjusted there.
 
 
 Graphical Network Simulator 3 (GNS3)
@@ -105,12 +104,11 @@ Graphical Network Simulator 3 (GNS3)
 
 GNS3 is a very powerful front-end to Qemu which takes care of creating
 virtual links between network devices running in Qemu.  This README is
-only link to the material you need.  This directory holds the appliance
-file, .gns3a, that references image files also in this directory, that
-you need to load into GNS3.
+all you need to get going, alongisde it is the appliance file (.gns3a)
+that reference image files in this directory needed to load into GNS3.
 
-The necessary extra packages are available through the offical PPA.  If
-you don't know what a PPA is, read up on that first:
+Necessary Ubuntu packages are available through the offical GNS3 PPA.
+If you don't know what a PPA is, read up on that first:
 
  - https://launchpad.net/~gns3/+archive/ubuntu/ppa
 
@@ -122,9 +120,8 @@ There's a lot of tutorials and guides online, start here:
 About
 -----
 
-Infix is a free, Linux-based, immutable operating system built around
+Infix is a free, Linux-based, immutable operating system, built around
 Buildroot, and sysrepo.  A powerful mix that ease porting to different
 platforms, simplify long-term maintenance, and provide easy management
-using NETCONF, RESTCONF, or the built-in command line interface (CLI)
+using NETCONF, RESTCONF, or the built-in, command line interface (CLI)
 from a console or SSH login.
-
diff --git a/board/common/post-build.sh b/board/common/post-build.sh
index 7f8be343..d707991f 100755
--- a/board/common/post-build.sh
+++ b/board/common/post-build.sh
@@ -1,6 +1,8 @@
-#!/bin/sh
-# shellcheck disable=SC1090,SC1091
+#!/usr/bin/env bash
+# shellcheck disable=SC1090,SC1091,SC3053
+
 common=$(dirname "$(readlink -f "$0")")
+. "$common/lib.sh"
 . "$BR2_CONFIG" 2>/dev/null
 . "$TARGET_DIR/usr/lib/os-release"
 
@@ -30,27 +32,21 @@ EOF
     # Ignore a few top-level oddballs not used by core Infix
     cmd="$cmd -x supported-algorithms"
 
-    # Execute the command
-    echo "Calling: $cmd"
+    ixmsg "Calling $cmd"
     $cmd
 }
 
-if [ -n "${ID_LIKE}" ]; then
-    ID="${ID} ${ID_LIKE}"
-fi
-
-if [ -n "$INFIX_IMAGE_ID" ]; then
-    NAME="$INFIX_IMAGE_ID"
-else
-    NAME="$INFIX_ID"-$(echo "$BR2_ARCH" | tr _ - | sed 's/x86-64/x86_64/')
-fi
-
 if [ -f "$TARGET_DIR/etc/rauc/system.conf" ]; then
     sed -i "s/compatible=.*/compatible=$INFIX_COMPATIBLE/" "$TARGET_DIR/etc/rauc/system.conf"
 fi
 
+if [ -n "${ID_LIKE}" ]; then
+    ID="${ID} ${ID_LIKE}"
+fi
+
 # This is a symlink to /usr/lib/os-release, so we remove this to keep
 # original Buildroot information.
+ixmsg "Creating /etc/os-release"
 rm -f "$TARGET_DIR/etc/os-release"
 {
     echo "NAME=\"$INFIX_NAME\""
@@ -87,6 +83,7 @@ rm -f "$TARGET_DIR/etc/os-release"
 } > "$TARGET_DIR/etc/os-release"
 
 echo "$INFIX_TAGLINE $INFIX_VERSION -- $(date +"%b %e %H:%M %Z %Y")" > "$TARGET_DIR/etc/version"
+ixmsg "Creating /etc/version: $(cat "$TARGET_DIR/etc/version")"
 
 # In case of ambguities, this is what the image was built from
 cp "$BR2_CONFIG" "$TARGET_DIR/usr/share/infix/config"
@@ -101,12 +98,9 @@ fi
 # Drop Buildroot default pam_lastlog.so from login chain
 sed -i '/^[^#]*pam_lastlog.so/s/^/# /' "$TARGET_DIR/etc/pam.d/login"
 
-# Allow pdmenu (setup) and bash to be login shells, bash is added
-# automatically when selected in menuyconfig, but not when BusyBox
-# provides a symlink (for ash).  The /bin/{true,false} are old UNIX
-# beart means of disabling a user.
-grep -qsE '^/usr/bin/pdmenu$$' "$TARGET_DIR/etc/shells" \
-        || echo "/usr/bin/pdmenu" >> "$TARGET_DIR/etc/shells"
+# Allow bash to be login shells, it is added automatically when selected
+# in menuyconfig, but not when BusyBox provides a symlink (for ash).
+# The /bin/{true,false} are old UNIX beart means of disabling a user.
 grep -qsE '^/bin/bash$$' "$TARGET_DIR/etc/shells" \
         || echo "/bin/bash" >> "$TARGET_DIR/etc/shells"
 grep -qsE '^/bin/true$$' "$TARGET_DIR/etc/shells" \
@@ -114,12 +108,6 @@ grep -qsE '^/bin/true$$' "$TARGET_DIR/etc/shells" \
 grep -qsE '^/bin/false$$' "$TARGET_DIR/etc/shells" \
         || echo "/bin/false" >> "$TARGET_DIR/etc/shells"
 
-boards=$(${BR2_EXTERNAL_INFIX_PATH}/board/common/selected-boards.sh ${BR2_EXTERNAL_INFIX_PATH} ${O})
-
-for board in $boards; do
-	[ ! -f "${BR2_EXTERNAL_INFIX_PATH}/src/board/${board}/post-build.sh" ] && continue
-	${BR2_EXTERNAL_INFIX_PATH}/src/board/${board}/post-build.sh
-done
 # Allow clish (symlink to /usr/bin/klish) to be a login shell
 grep -qsE '^/bin/clish$$' "$TARGET_DIR/etc/shells" \
         || echo "/bin/clish" >> "$TARGET_DIR/etc/shells"
diff --git a/package/board/dtb-inst.makefile b/board/dtb-inst.makefile
similarity index 100%
rename from package/board/dtb-inst.makefile
rename to board/dtb-inst.makefile
diff --git a/package/board/ix-board.mk b/board/ix-board.mk
similarity index 87%
rename from package/board/ix-board.mk
rename to board/ix-board.mk
index 391cb8be..1f6509ff 100644
--- a/package/board/ix-board.mk
+++ b/board/ix-board.mk
@@ -4,7 +4,7 @@ $(2)_VERSION = ix-board
 $(2)_LICENSE = BSD-3-Clause
 $(2)_LICENSE_FILES = LICENSE
 $(2)_SITE_METHOD = local
-$(2)_SITE = $$(BR2_EXTERNAL_INFIX_PATH)/src/board/$(1)
+$(2)_SITE ?= $$(BR2_EXTERNAL_INFIX_PATH)/board/$(3)
 $(2)_REDISTRIBUTE = NO
 
 # The kernel must be built first.
@@ -31,7 +31,7 @@ $(2)_POST_BUILD_HOOKS += $(2)_DTBS_BUILD
 define $(2)_DTBS_INSTALL_TARGET
 	@$$(call MESSAGE,"Installing device tree blob(s)")
 	$$(TARGET_MAKE_ENV) $$(TARGET_CONFIGURE_OPTS) $$($$(PKG)_MAKE) \
-		-f $$(BR2_EXTERNAL_INFIX_PATH)/package/board/dtb-inst.makefile \
+		-f $$(BR2_EXTERNAL_INFIX_PATH)/board/dtb-inst.makefile \
 		-C $$(@D)/dts \
 		DESTDIR="$$(TARGET_DIR)" \
 		install
@@ -48,4 +48,4 @@ $(2)_POST_INSTALL_TARGET_HOOKS += $(2)_OVERLAY_INSTALL_TARGET
 
 endef
 
-ix-board = $(call inner-ix-board,$(pkgname),$(call UPPERCASE,$(pkgname)))
+ix-board = $(call inner-ix-board,$(pkgname),$(call UPPERCASE,$(pkgname)),$(patsubst $(BR2_EXTERNAL_INFIX_PATH)/board/%,%,$(pkgdir)))
diff --git a/board/riscv64/Config.in b/board/riscv64/Config.in
new file mode 100644
index 00000000..906f84c4
--- /dev/null
+++ b/board/riscv64/Config.in
@@ -0,0 +1,5 @@
+if BR2_riscv
+
+# No boards yet in tree, visionfive2 is not integrated
+
+endif
diff --git a/board/riscv64/visionfive2/README.md b/board/riscv64/starfive-visionfive2/README.md
similarity index 100%
rename from board/riscv64/visionfive2/README.md
rename to board/riscv64/starfive-visionfive2/README.md
diff --git a/board/riscv64/visionfive2/board.mk b/board/riscv64/starfive-visionfive2/board.mk
similarity index 100%
rename from board/riscv64/visionfive2/board.mk
rename to board/riscv64/starfive-visionfive2/board.mk
diff --git a/board/riscv64/visionfive2/genimage.cfg b/board/riscv64/starfive-visionfive2/genimage.cfg
similarity index 100%
rename from board/riscv64/visionfive2/genimage.cfg
rename to board/riscv64/starfive-visionfive2/genimage.cfg
diff --git a/board/riscv64/visionfive2/jh7110-starfive-visionfive-2-dtsi.patch b/board/riscv64/starfive-visionfive2/jh7110-starfive-visionfive-2-dtsi.patch
similarity index 100%
rename from board/riscv64/visionfive2/jh7110-starfive-visionfive-2-dtsi.patch
rename to board/riscv64/starfive-visionfive2/jh7110-starfive-visionfive-2-dtsi.patch
diff --git a/board/riscv64/visionfive2/uboot/extras.config b/board/riscv64/starfive-visionfive2/uboot/extras.config
similarity index 100%
rename from board/riscv64/visionfive2/uboot/extras.config
rename to board/riscv64/starfive-visionfive2/uboot/extras.config
diff --git a/board/riscv64/visionfive2/uboot/visionfive2-env.dtsi b/board/riscv64/starfive-visionfive2/uboot/visionfive2-env.dtsi
similarity index 100%
rename from board/riscv64/visionfive2/uboot/visionfive2-env.dtsi
rename to board/riscv64/starfive-visionfive2/uboot/visionfive2-env.dtsi
diff --git a/board/x86_64/Config.in b/board/x86_64/Config.in
new file mode 100644
index 00000000..144dba73
--- /dev/null
+++ b/board/x86_64/Config.in
@@ -0,0 +1,5 @@
+if BR2_x86_64
+
+# No boards yet in tree
+
+endif
diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig
index 22024f10..d0d837f4 100644
--- a/configs/aarch64_defconfig
+++ b/configs/aarch64_defconfig
@@ -142,8 +142,8 @@ BR2_PACKAGE_ALDER_ALDER=y
 BR2_PACKAGE_MARVELL_CN9130_CRB=y
 BR2_PACKAGE_MARVELL_ESPRESSOBIN=y
 BR2_PACKAGE_STYX_DCP_SC_28P=y
-BR2_PACKAGE_RASPBERRY_PI64=y
-BR2_PACKAGE_BANANA_PI_R3=y
+BR2_PACKAGE_RASPBERRYPI_RPI64=y
+BR2_PACKAGE_BANANAPI_BPI_R3=y
 BR2_PACKAGE_FEATURE_WIFI_DONGLE_REALTEK=y
 BR2_PACKAGE_CONFD=y
 BR2_PACKAGE_CONFD_TEST_MODE=y
diff --git a/external.mk b/external.mk
index 773e586f..2a4a4874 100644
--- a/external.mk
+++ b/external.mk
@@ -1,6 +1,7 @@
 include $(BR2_EXTERNAL_INFIX_PATH)/infix.mk
 include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/package/*/*.mk))
 include $(BR2_EXTERNAL_INFIX_PATH)/board/common/common.mk
+include $(BR2_EXTERNAL_INFIX_PATH)/board/board.mk
 -include $(BR2_EXTERNAL_INFIX_PATH)/board/$(patsubst "%",%,$(BR2_ARCH))/board.mk
 include $(BR2_EXTERNAL_INFIX_PATH)/test/test.mk
 
diff --git a/package/Config.in b/package/Config.in
index 90636287..e9de36d7 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1,7 +1,6 @@
 menu "Packages"
 
 comment "Hardware Support"
-source "$BR2_EXTERNAL_INFIX_PATH/package/board/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/feature-wifi/Config.in"
 
 comment "Software Packages"
diff --git a/package/board/Config.in b/package/board/Config.in
deleted file mode 100644
index f9a16c68..00000000
--- a/package/board/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-menu "Boards"
-
-source "$BR2_EXTERNAL_INFIX_PATH/package/board/alder-alder/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/package/board/freescale-imx8mp-evk/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/package/board/marvell-cn9130-crb/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/package/board/marvell-espressobin/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/package/board/microchip-sparx5-pcb135/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/package/board/styx-dcp-sc-28p/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/package/board/raspberry-pi64/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/package/board/banana-pi-r3/Config.in"
-
-
-endmenu
diff --git a/package/board/board.mk b/package/board/board.mk
deleted file mode 100644
index 22050631..00000000
--- a/package/board/board.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-include $(BR2_EXTERNAL_INFIX_PATH)/package/board/ix-board.mk
-include $(sort $(wildcard $(BR2_EXTERNAL_INFIX_PATH)/package/board/*/*.mk))
diff --git a/src/board/raspberry-pi64/post-build.sh b/src/board/raspberry-pi64/post-build.sh
deleted file mode 100755
index 8e9d6006..00000000
--- a/src/board/raspberry-pi64/post-build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Armbian firmware installs to /lib/firmware but driver wants the
-# file(s) in /lib/firmware/brcm/
-if [ -f "${TARGET_DIR}/lib/firmware/BCM4345C0.hcd" ]; then
-    mv "${TARGET_DIR}/lib/firmware/BCM4345C0.hcd" "${TARGET_DIR}/lib/firmware/brcm/"
-fi