diff --git a/device/testing/device-clockworkpi-uconsole-rpi/95-vchiq-permissions.rules b/device/downstream/device-clockworkpi-uconsole-rpi/95-vchiq-permissions.rules
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-rpi/95-vchiq-permissions.rules
rename to device/downstream/device-clockworkpi-uconsole-rpi/95-vchiq-permissions.rules
diff --git a/device/testing/device-clockworkpi-uconsole-rpi/APKBUILD b/device/downstream/device-clockworkpi-uconsole-rpi/APKBUILD
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-rpi/APKBUILD
rename to device/downstream/device-clockworkpi-uconsole-rpi/APKBUILD
diff --git a/device/testing/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-install b/device/downstream/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-install
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-install
rename to device/downstream/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-install
diff --git a/device/testing/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-upgrade b/device/downstream/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-upgrade
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-upgrade
rename to device/downstream/device-clockworkpi-uconsole-rpi/device-clockworkpi-uconsole-rpi-openrc.post-upgrade
diff --git a/device/testing/device-clockworkpi-uconsole-rpi/deviceinfo b/device/downstream/device-clockworkpi-uconsole-rpi/deviceinfo
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-rpi/deviceinfo
rename to device/downstream/device-clockworkpi-uconsole-rpi/deviceinfo
diff --git a/device/testing/device-clockworkpi-uconsole-rpi/driver-akmbuild.in b/device/downstream/device-clockworkpi-uconsole-rpi/driver-akmbuild.in
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-rpi/driver-akmbuild.in
rename to device/downstream/device-clockworkpi-uconsole-rpi/driver-akmbuild.in
diff --git a/device/testing/device-clockworkpi-uconsole-rpi/driver-makefile.in b/device/downstream/device-clockworkpi-uconsole-rpi/driver-makefile.in
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-rpi/driver-makefile.in
rename to device/downstream/device-clockworkpi-uconsole-rpi/driver-makefile.in
diff --git a/device/testing/device-clockworkpi-uconsole-rpi/modules-initfs b/device/downstream/device-clockworkpi-uconsole-rpi/modules-initfs
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-rpi/modules-initfs
rename to device/downstream/device-clockworkpi-uconsole-rpi/modules-initfs
diff --git a/device/testing/device-clockworkpi-uconsole-rpi/usercfg.txt b/device/downstream/device-clockworkpi-uconsole-rpi/usercfg.txt
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-rpi/usercfg.txt
rename to device/downstream/device-clockworkpi-uconsole-rpi/usercfg.txt
diff --git a/device/testing/device-clockworkpi-uconsole-rpi/xorg.conf b/device/downstream/device-clockworkpi-uconsole-rpi/xorg.conf
similarity index 100%
rename from device/testing/device-clockworkpi-uconsole-rpi/xorg.conf
rename to device/downstream/device-clockworkpi-uconsole-rpi/xorg.conf