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