diff --git a/CODEOWNERS b/CODEOWNERS
index c5bdf74d8170d02e3512ce5f5d2c33f892f50f09..2e7bb35c33ff64c20b3a0f8f6b1979f13ffa4b3e 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -31,6 +31,7 @@ device/*/*-pine64-pinephonepro/			@PsychoGame
 device/*/*-pine64-rockpro64/			@PureTryOut
 device/*/*-purism-librem5/			@craftyguy @alistair23 @Newbyte
 device/*/*-qcom-msm8916/			@Minecrell @TravMurav
+device/*/*-qcom-msm8953/			@barni2000
 device/*/*-qcom-sdm670/				@flamingradian
 device/*/*-qcom-sdm845/				@sdm845-mainline
 device/*/*-qcom-sm6350/				@z3ntu
diff --git a/device/community/device-xiaomi-daisy/90-device-xiaomi-daisy.rules b/device/archived/device-xiaomi-daisy/90-device-xiaomi-daisy.rules
similarity index 100%
rename from device/community/device-xiaomi-daisy/90-device-xiaomi-daisy.rules
rename to device/archived/device-xiaomi-daisy/90-device-xiaomi-daisy.rules
diff --git a/device/community/device-xiaomi-daisy/APKBUILD b/device/archived/device-xiaomi-daisy/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-daisy/APKBUILD
rename to device/archived/device-xiaomi-daisy/APKBUILD
diff --git a/device/community/device-xiaomi-daisy/deviceinfo b/device/archived/device-xiaomi-daisy/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-daisy/deviceinfo
rename to device/archived/device-xiaomi-daisy/deviceinfo
diff --git a/device/community/device-xiaomi-daisy/modules-initfs b/device/archived/device-xiaomi-daisy/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-daisy/modules-initfs
rename to device/archived/device-xiaomi-daisy/modules-initfs
diff --git a/device/community/device-xiaomi-markw/APKBUILD b/device/archived/device-xiaomi-markw/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-markw/APKBUILD
rename to device/archived/device-xiaomi-markw/APKBUILD
diff --git a/device/community/device-xiaomi-markw/deviceinfo b/device/archived/device-xiaomi-markw/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-markw/deviceinfo
rename to device/archived/device-xiaomi-markw/deviceinfo
diff --git a/device/community/device-xiaomi-markw/modules-initfs b/device/archived/device-xiaomi-markw/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-markw/modules-initfs
rename to device/archived/device-xiaomi-markw/modules-initfs
diff --git a/device/community/device-xiaomi-mido/APKBUILD b/device/archived/device-xiaomi-mido/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-mido/APKBUILD
rename to device/archived/device-xiaomi-mido/APKBUILD
diff --git a/device/community/device-xiaomi-mido/deviceinfo b/device/archived/device-xiaomi-mido/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-mido/deviceinfo
rename to device/archived/device-xiaomi-mido/deviceinfo
diff --git a/device/community/device-xiaomi-mido/modules-initfs b/device/archived/device-xiaomi-mido/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-mido/modules-initfs
rename to device/archived/device-xiaomi-mido/modules-initfs
diff --git a/device/testing/device-xiaomi-onclite/APKBUILD b/device/archived/device-xiaomi-onclite/APKBUILD
similarity index 100%
rename from device/testing/device-xiaomi-onclite/APKBUILD
rename to device/archived/device-xiaomi-onclite/APKBUILD
diff --git a/device/testing/device-xiaomi-onclite/deviceinfo b/device/archived/device-xiaomi-onclite/deviceinfo
similarity index 100%
rename from device/testing/device-xiaomi-onclite/deviceinfo
rename to device/archived/device-xiaomi-onclite/deviceinfo
diff --git a/device/testing/device-xiaomi-onclite/modules-initfs b/device/archived/device-xiaomi-onclite/modules-initfs
similarity index 100%
rename from device/testing/device-xiaomi-onclite/modules-initfs
rename to device/archived/device-xiaomi-onclite/modules-initfs
diff --git a/device/testing/device-xiaomi-rosy/APKBUILD b/device/archived/device-xiaomi-rosy/APKBUILD
similarity index 100%
rename from device/testing/device-xiaomi-rosy/APKBUILD
rename to device/archived/device-xiaomi-rosy/APKBUILD
diff --git a/device/testing/device-xiaomi-rosy/deviceinfo b/device/archived/device-xiaomi-rosy/deviceinfo
similarity index 100%
rename from device/testing/device-xiaomi-rosy/deviceinfo
rename to device/archived/device-xiaomi-rosy/deviceinfo
diff --git a/device/testing/device-xiaomi-rosy/modules-initfs b/device/archived/device-xiaomi-rosy/modules-initfs
similarity index 100%
rename from device/testing/device-xiaomi-rosy/modules-initfs
rename to device/archived/device-xiaomi-rosy/modules-initfs
diff --git a/device/community/device-xiaomi-tissot/APKBUILD b/device/archived/device-xiaomi-tissot/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-tissot/APKBUILD
rename to device/archived/device-xiaomi-tissot/APKBUILD
diff --git a/device/community/device-xiaomi-tissot/deviceinfo b/device/archived/device-xiaomi-tissot/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-tissot/deviceinfo
rename to device/archived/device-xiaomi-tissot/deviceinfo
diff --git a/device/community/device-xiaomi-tissot/modules-initfs b/device/archived/device-xiaomi-tissot/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-tissot/modules-initfs
rename to device/archived/device-xiaomi-tissot/modules-initfs
diff --git a/device/community/device-xiaomi-vince/APKBUILD b/device/archived/device-xiaomi-vince/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-vince/APKBUILD
rename to device/archived/device-xiaomi-vince/APKBUILD
diff --git a/device/community/device-xiaomi-vince/deviceinfo b/device/archived/device-xiaomi-vince/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-vince/deviceinfo
rename to device/archived/device-xiaomi-vince/deviceinfo
diff --git a/device/community/device-xiaomi-vince/modules-initfs b/device/archived/device-xiaomi-vince/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-vince/modules-initfs
rename to device/archived/device-xiaomi-vince/modules-initfs
diff --git a/device/community/device-xiaomi-ysl/APKBUILD b/device/archived/device-xiaomi-ysl/APKBUILD
similarity index 100%
rename from device/community/device-xiaomi-ysl/APKBUILD
rename to device/archived/device-xiaomi-ysl/APKBUILD
diff --git a/device/community/device-xiaomi-ysl/deviceinfo b/device/archived/device-xiaomi-ysl/deviceinfo
similarity index 100%
rename from device/community/device-xiaomi-ysl/deviceinfo
rename to device/archived/device-xiaomi-ysl/deviceinfo
diff --git a/device/community/device-xiaomi-ysl/modules-initfs b/device/archived/device-xiaomi-ysl/modules-initfs
similarity index 100%
rename from device/community/device-xiaomi-ysl/modules-initfs
rename to device/archived/device-xiaomi-ysl/modules-initfs
diff --git a/device/community/firmware-xiaomi-daisy/APKBUILD b/device/archived/firmware-xiaomi-daisy/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-daisy/APKBUILD
rename to device/archived/firmware-xiaomi-daisy/APKBUILD
diff --git a/device/community/firmware-xiaomi-markw/APKBUILD b/device/archived/firmware-xiaomi-markw/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-markw/APKBUILD
rename to device/archived/firmware-xiaomi-markw/APKBUILD
diff --git a/device/community/firmware-xiaomi-mido/APKBUILD b/device/archived/firmware-xiaomi-mido/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-mido/APKBUILD
rename to device/archived/firmware-xiaomi-mido/APKBUILD
diff --git a/device/testing/firmware-xiaomi-onclite/APKBUILD b/device/archived/firmware-xiaomi-onclite/APKBUILD
similarity index 100%
rename from device/testing/firmware-xiaomi-onclite/APKBUILD
rename to device/archived/firmware-xiaomi-onclite/APKBUILD
diff --git a/device/testing/firmware-xiaomi-rosy/APKBUILD b/device/archived/firmware-xiaomi-rosy/APKBUILD
similarity index 100%
rename from device/testing/firmware-xiaomi-rosy/APKBUILD
rename to device/archived/firmware-xiaomi-rosy/APKBUILD
diff --git a/device/community/firmware-xiaomi-tissot/APKBUILD b/device/archived/firmware-xiaomi-tissot/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-tissot/APKBUILD
rename to device/archived/firmware-xiaomi-tissot/APKBUILD
diff --git a/device/community/firmware-xiaomi-vince/APKBUILD b/device/archived/firmware-xiaomi-vince/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-vince/APKBUILD
rename to device/archived/firmware-xiaomi-vince/APKBUILD
diff --git a/device/community/firmware-xiaomi-ysl/APKBUILD b/device/archived/firmware-xiaomi-ysl/APKBUILD
similarity index 100%
rename from device/community/firmware-xiaomi-ysl/APKBUILD
rename to device/archived/firmware-xiaomi-ysl/APKBUILD
diff --git a/device/testing/device-qcom-msm8953/APKBUILD b/device/community/device-qcom-msm8953/APKBUILD
similarity index 100%
rename from device/testing/device-qcom-msm8953/APKBUILD
rename to device/community/device-qcom-msm8953/APKBUILD
diff --git a/device/testing/device-qcom-msm8953/deviceinfo b/device/community/device-qcom-msm8953/deviceinfo
similarity index 100%
rename from device/testing/device-qcom-msm8953/deviceinfo
rename to device/community/device-qcom-msm8953/deviceinfo
diff --git a/device/testing/device-qcom-msm8953/modules-initfs b/device/community/device-qcom-msm8953/modules-initfs
similarity index 100%
rename from device/testing/device-qcom-msm8953/modules-initfs
rename to device/community/device-qcom-msm8953/modules-initfs
diff --git a/device/testing/firmware-qcom-msm8953/APKBUILD b/device/community/firmware-qcom-msm8953/APKBUILD
similarity index 100%
rename from device/testing/firmware-qcom-msm8953/APKBUILD
rename to device/community/firmware-qcom-msm8953/APKBUILD