diff --git a/device/testing/device-samsung-gt58/APKBUILD b/device/archived/device-samsung-gt58/APKBUILD
similarity index 95%
rename from device/testing/device-samsung-gt58/APKBUILD
rename to device/archived/device-samsung-gt58/APKBUILD
index a20b2db0e..2c90ca23c 100644
--- a/device/testing/device-samsung-gt58/APKBUILD
+++ b/device/archived/device-samsung-gt58/APKBUILD
@@ -1,5 +1,6 @@
+# Archived: Superseded by generic "device-qcom-msm8916" port
 # Reference: <https://postmarketos.org/devicepkg>
-maintainer="Nikita Travkin <nikita@trvn.ru>"
+maintainer=""
 pkgname=device-samsung-gt58
 pkgdesc="Samsung Galaxy Tab A 8.0 (2015)"
 pkgver=12
diff --git a/device/testing/device-samsung-gt58/deviceinfo b/device/archived/device-samsung-gt58/deviceinfo
similarity index 100%
rename from device/testing/device-samsung-gt58/deviceinfo
rename to device/archived/device-samsung-gt58/deviceinfo
diff --git a/device/testing/device-samsung-gt58/kernel-cmdline.conf b/device/archived/device-samsung-gt58/kernel-cmdline.conf
similarity index 100%
rename from device/testing/device-samsung-gt58/kernel-cmdline.conf
rename to device/archived/device-samsung-gt58/kernel-cmdline.conf
diff --git a/device/testing/device-samsung-gt58/modules-initfs b/device/archived/device-samsung-gt58/modules-initfs
similarity index 100%
rename from device/testing/device-samsung-gt58/modules-initfs
rename to device/archived/device-samsung-gt58/modules-initfs
diff --git a/device/testing/device-samsung-gt58/phoc.ini b/device/archived/device-samsung-gt58/phoc.ini
similarity index 100%
rename from device/testing/device-samsung-gt58/phoc.ini
rename to device/archived/device-samsung-gt58/phoc.ini
diff --git a/device/testing/firmware-samsung-gt58/APKBUILD b/device/archived/firmware-samsung-gt58/APKBUILD
similarity index 92%
rename from device/testing/firmware-samsung-gt58/APKBUILD
rename to device/archived/firmware-samsung-gt58/APKBUILD
index 0d757f98f..db4374682 100644
--- a/device/testing/firmware-samsung-gt58/APKBUILD
+++ b/device/archived/firmware-samsung-gt58/APKBUILD
@@ -1,4 +1,5 @@
-maintainer="Nikita Travkin <nikita@trvn.ru>"
+# Archived: Superseded by generic "device-qcom-msm8916" port
+maintainer=""
 pkgname=firmware-samsung-gt58
 pkgver=1
 pkgrel=3