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