diff --git a/device/downstream/device-samsung-ms013g/APKBUILD b/device/archived/device-samsung-ms013g-downstream/APKBUILD
similarity index 56%
rename from device/downstream/device-samsung-ms013g/APKBUILD
rename to device/archived/device-samsung-ms013g-downstream/APKBUILD
index 9691e47f8..9968fad96 100644
--- a/device/downstream/device-samsung-ms013g/APKBUILD
+++ b/device/archived/device-samsung-ms013g-downstream/APKBUILD
@@ -1,6 +1,6 @@
-
-pkgname=device-samsung-ms013g
-pkgdesc="Samsung Galaxy Grand 2"
+# Archived: Downstream port, only for testing. Use mainline port!
+pkgname=device-samsung-ms013g-downstream
+pkgdesc="Samsung Galaxy Grand 2 (Downstream)"
 pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
@@ -21,5 +21,5 @@ package() {
 
 
 sha512sums="
-6184764faff95dc5dd9f451f299c23f02db29f25d8fcebd4574655a2bb9f4a0b407d1f1eab6cff191579af8ad9e6065b566fc8589c2bad6acd02f4b448962fda  deviceinfo
+cde622ff31be26dc2ada9826937f6e1407572adc4ea3a6a5d6ba5025c4ef589e99f39aed244a31b3ac621d96b2ad027ed97232d25501237714027cc2d89b83f4  deviceinfo
 "
diff --git a/device/downstream/device-samsung-ms013g/deviceinfo b/device/archived/device-samsung-ms013g-downstream/deviceinfo
similarity index 96%
rename from device/downstream/device-samsung-ms013g/deviceinfo
rename to device/archived/device-samsung-ms013g-downstream/deviceinfo
index 31c503b57..c103c4163 100644
--- a/device/downstream/device-samsung-ms013g/deviceinfo
+++ b/device/archived/device-samsung-ms013g-downstream/deviceinfo
@@ -4,7 +4,7 @@
 deviceinfo_format_version="0"
 deviceinfo_name="Samsung Galaxy Grand 2"
 deviceinfo_manufacturer="Samsung"
-deviceinfo_codename="samsung-ms013g"
+deviceinfo_codename="samsung-ms013g-downstream"
 deviceinfo_year="2013"
 deviceinfo_arch="armv7"
 
diff --git a/device/downstream/linux-samsung-ms013g/0001-fix-video-argb-setting.patch b/device/archived/linux-samsung-ms013g-downstream/0001-fix-video-argb-setting.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/0001-fix-video-argb-setting.patch
rename to device/archived/linux-samsung-ms013g-downstream/0001-fix-video-argb-setting.patch
diff --git a/device/downstream/linux-samsung-ms013g/0007-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch b/device/archived/linux-samsung-ms013g-downstream/0007-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/0007-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch
rename to device/archived/linux-samsung-ms013g-downstream/0007-usb_gadget-set-random-rndis-host-MAC-address-to-prev.patch
diff --git a/device/downstream/linux-samsung-ms013g/APKBUILD b/device/archived/linux-samsung-ms013g-downstream/APKBUILD
similarity index 97%
rename from device/downstream/linux-samsung-ms013g/APKBUILD
rename to device/archived/linux-samsung-ms013g-downstream/APKBUILD
index ec4afac07..e4a5723f7 100644
--- a/device/downstream/linux-samsung-ms013g/APKBUILD
+++ b/device/archived/linux-samsung-ms013g-downstream/APKBUILD
@@ -1,7 +1,7 @@
-
-pkgname=linux-samsung-ms013g
+# Archived: Downstream port, only for testing. Use mainline port!
+pkgname=linux-samsung-ms013g-downstream
 pkgver=3.4.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Samsung Galaxy Grand 2 kernel fork"
 arch="armv7"
 _carch="arm"
diff --git a/device/downstream/linux-samsung-ms013g/config-samsung-ms013g.armv7 b/device/archived/linux-samsung-ms013g-downstream/config-samsung-ms013g.armv7
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/config-samsung-ms013g.armv7
rename to device/archived/linux-samsung-ms013g-downstream/config-samsung-ms013g.armv7
diff --git a/device/downstream/linux-samsung-ms013g/fix_fb.patch b/device/archived/linux-samsung-ms013g-downstream/fix_fb.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/fix_fb.patch
rename to device/archived/linux-samsung-ms013g-downstream/fix_fb.patch
diff --git a/device/downstream/linux-samsung-ms013g/gcc10-extern_YYLOC_global_declaration.patch b/device/archived/linux-samsung-ms013g-downstream/gcc10-extern_YYLOC_global_declaration.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/gcc10-extern_YYLOC_global_declaration.patch
rename to device/archived/linux-samsung-ms013g-downstream/gcc10-extern_YYLOC_global_declaration.patch
diff --git a/device/downstream/linux-samsung-ms013g/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/archived/linux-samsung-ms013g-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/gcc7-give-up-on-ilog2-const-optimizations.patch
rename to device/archived/linux-samsung-ms013g-downstream/gcc7-give-up-on-ilog2-const-optimizations.patch
diff --git a/device/downstream/linux-samsung-ms013g/gcc8-fix-put-user.patch b/device/archived/linux-samsung-ms013g-downstream/gcc8-fix-put-user.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/gcc8-fix-put-user.patch
rename to device/archived/linux-samsung-ms013g-downstream/gcc8-fix-put-user.patch
diff --git a/device/downstream/linux-samsung-ms013g/kernel-use-the-gnu89-standard-explicitly.patch b/device/archived/linux-samsung-ms013g-downstream/kernel-use-the-gnu89-standard-explicitly.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/kernel-use-the-gnu89-standard-explicitly.patch
rename to device/archived/linux-samsung-ms013g-downstream/kernel-use-the-gnu89-standard-explicitly.patch
diff --git a/device/downstream/linux-samsung-ms013g/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch b/device/archived/linux-samsung-ms013g-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
rename to device/archived/linux-samsung-ms013g-downstream/linux3.4-ARM-8933-1-replace-Sun-Solaris-style-flag-on-section.patch
diff --git a/device/downstream/linux-samsung-ms013g/linux3.4-Fix-signature-mismatch-for-msm_pm_boot_init.patch b/device/archived/linux-samsung-ms013g-downstream/linux3.4-Fix-signature-mismatch-for-msm_pm_boot_init.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/linux3.4-Fix-signature-mismatch-for-msm_pm_boot_init.patch
rename to device/archived/linux-samsung-ms013g-downstream/linux3.4-Fix-signature-mismatch-for-msm_pm_boot_init.patch
diff --git a/device/downstream/linux-samsung-ms013g/linux3.4-fix-piggy.gzip.S.patch b/device/archived/linux-samsung-ms013g-downstream/linux3.4-fix-piggy.gzip.S.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/linux3.4-fix-piggy.gzip.S.patch
rename to device/archived/linux-samsung-ms013g-downstream/linux3.4-fix-piggy.gzip.S.patch
diff --git a/device/downstream/linux-samsung-ms013g/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch b/device/archived/linux-samsung-ms013g-downstream/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
rename to device/archived/linux-samsung-ms013g-downstream/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
diff --git a/device/downstream/linux-samsung-ms013g/timeconst.pl-Eliminate-Perl-warning.patch b/device/archived/linux-samsung-ms013g-downstream/timeconst.pl-Eliminate-Perl-warning.patch
similarity index 100%
rename from device/downstream/linux-samsung-ms013g/timeconst.pl-Eliminate-Perl-warning.patch
rename to device/archived/linux-samsung-ms013g-downstream/timeconst.pl-Eliminate-Perl-warning.patch