diff --git a/device/testing/device-raspberry-pi4/95-vchiq-permissions.rules b/device/downstream/device-raspberry-pi4/95-vchiq-permissions.rules
similarity index 100%
rename from device/testing/device-raspberry-pi4/95-vchiq-permissions.rules
rename to device/downstream/device-raspberry-pi4/95-vchiq-permissions.rules
diff --git a/device/testing/device-raspberry-pi4/APKBUILD b/device/downstream/device-raspberry-pi4/APKBUILD
similarity index 100%
rename from device/testing/device-raspberry-pi4/APKBUILD
rename to device/downstream/device-raspberry-pi4/APKBUILD
diff --git a/device/testing/device-raspberry-pi4/device-raspberry-pi4-openrc.post-install b/device/downstream/device-raspberry-pi4/device-raspberry-pi4-openrc.post-install
similarity index 100%
rename from device/testing/device-raspberry-pi4/device-raspberry-pi4-openrc.post-install
rename to device/downstream/device-raspberry-pi4/device-raspberry-pi4-openrc.post-install
diff --git a/device/testing/device-raspberry-pi4/device-raspberry-pi4-openrc.post-upgrade b/device/downstream/device-raspberry-pi4/device-raspberry-pi4-openrc.post-upgrade
similarity index 100%
rename from device/testing/device-raspberry-pi4/device-raspberry-pi4-openrc.post-upgrade
rename to device/downstream/device-raspberry-pi4/device-raspberry-pi4-openrc.post-upgrade
diff --git a/device/testing/device-raspberry-pi4/deviceinfo b/device/downstream/device-raspberry-pi4/deviceinfo
similarity index 100%
rename from device/testing/device-raspberry-pi4/deviceinfo
rename to device/downstream/device-raspberry-pi4/deviceinfo
diff --git a/device/testing/device-raspberry-pi4/enforce-platform.sh b/device/downstream/device-raspberry-pi4/enforce-platform.sh
similarity index 100%
rename from device/testing/device-raspberry-pi4/enforce-platform.sh
rename to device/downstream/device-raspberry-pi4/enforce-platform.sh
diff --git a/device/testing/device-raspberry-pi4/modules-initfs b/device/downstream/device-raspberry-pi4/modules-initfs
similarity index 100%
rename from device/testing/device-raspberry-pi4/modules-initfs
rename to device/downstream/device-raspberry-pi4/modules-initfs
diff --git a/device/testing/device-raspberry-pi4/usercfg.txt b/device/downstream/device-raspberry-pi4/usercfg.txt
similarity index 100%
rename from device/testing/device-raspberry-pi4/usercfg.txt
rename to device/downstream/device-raspberry-pi4/usercfg.txt