diff --git a/device/community/device-pine64-pinephone/10-pinephone-proximity.rules b/device/main/device-pine64-pinephone/10-pinephone-proximity.rules
similarity index 100%
rename from device/community/device-pine64-pinephone/10-pinephone-proximity.rules
rename to device/main/device-pine64-pinephone/10-pinephone-proximity.rules
diff --git a/device/community/device-pine64-pinephone/90-modem-eg25.rules b/device/main/device-pine64-pinephone/90-modem-eg25.rules
similarity index 100%
rename from device/community/device-pine64-pinephone/90-modem-eg25.rules
rename to device/main/device-pine64-pinephone/90-modem-eg25.rules
diff --git a/device/community/device-pine64-pinephone/APKBUILD b/device/main/device-pine64-pinephone/APKBUILD
similarity index 100%
rename from device/community/device-pine64-pinephone/APKBUILD
rename to device/main/device-pine64-pinephone/APKBUILD
diff --git a/device/community/device-pine64-pinephone/device-pine64-pinephone.post-install b/device/main/device-pine64-pinephone/device-pine64-pinephone.post-install
similarity index 100%
rename from device/community/device-pine64-pinephone/device-pine64-pinephone.post-install
rename to device/main/device-pine64-pinephone/device-pine64-pinephone.post-install
diff --git a/device/community/device-pine64-pinephone/deviceinfo b/device/main/device-pine64-pinephone/deviceinfo
similarity index 100%
rename from device/community/device-pine64-pinephone/deviceinfo
rename to device/main/device-pine64-pinephone/deviceinfo
diff --git a/device/community/device-pine64-pinephone/eg25.initd b/device/main/device-pine64-pinephone/eg25.initd
similarity index 100%
rename from device/community/device-pine64-pinephone/eg25.initd
rename to device/main/device-pine64-pinephone/eg25.initd
diff --git a/device/community/device-pine64-pinephone/gpsd_device-hook.sh b/device/main/device-pine64-pinephone/gpsd_device-hook.sh
similarity index 100%
rename from device/community/device-pine64-pinephone/gpsd_device-hook.sh
rename to device/main/device-pine64-pinephone/gpsd_device-hook.sh
diff --git a/device/community/device-pine64-pinephone/gpsd_pinephone.initd b/device/main/device-pine64-pinephone/gpsd_pinephone.initd
similarity index 100%
rename from device/community/device-pine64-pinephone/gpsd_pinephone.initd
rename to device/main/device-pine64-pinephone/gpsd_pinephone.initd
diff --git a/device/community/device-pine64-pinephone/hwtest.ini b/device/main/device-pine64-pinephone/hwtest.ini
similarity index 100%
rename from device/community/device-pine64-pinephone/hwtest.ini
rename to device/main/device-pine64-pinephone/hwtest.ini
diff --git a/device/community/device-pine64-pinephone/setup-modem.sh b/device/main/device-pine64-pinephone/setup-modem.sh
similarity index 100%
rename from device/community/device-pine64-pinephone/setup-modem.sh
rename to device/main/device-pine64-pinephone/setup-modem.sh
diff --git a/device/community/device-pine64-pinephone/sysrq.conf b/device/main/device-pine64-pinephone/sysrq.conf
similarity index 100%
rename from device/community/device-pine64-pinephone/sysrq.conf
rename to device/main/device-pine64-pinephone/sysrq.conf
diff --git a/device/community/device-pine64-pinephone/uboot-script.cmd b/device/main/device-pine64-pinephone/uboot-script.cmd
similarity index 100%
rename from device/community/device-pine64-pinephone/uboot-script.cmd
rename to device/main/device-pine64-pinephone/uboot-script.cmd
diff --git a/device/community/device-pine64-pinephone/ucm/HiFi.conf b/device/main/device-pine64-pinephone/ucm/HiFi.conf
similarity index 100%
rename from device/community/device-pine64-pinephone/ucm/HiFi.conf
rename to device/main/device-pine64-pinephone/ucm/HiFi.conf
diff --git a/device/community/device-pine64-pinephone/ucm/PinePhone.conf b/device/main/device-pine64-pinephone/ucm/PinePhone.conf
similarity index 100%
rename from device/community/device-pine64-pinephone/ucm/PinePhone.conf
rename to device/main/device-pine64-pinephone/ucm/PinePhone.conf
diff --git a/device/community/device-pine64-pinephone/ucm/VoiceCall.conf b/device/main/device-pine64-pinephone/ucm/VoiceCall.conf
similarity index 100%
rename from device/community/device-pine64-pinephone/ucm/VoiceCall.conf
rename to device/main/device-pine64-pinephone/ucm/VoiceCall.conf
diff --git a/device/community/firmware-pine64-ov5640/APKBUILD b/device/main/firmware-pine64-ov5640/APKBUILD
similarity index 100%
rename from device/community/firmware-pine64-ov5640/APKBUILD
rename to device/main/firmware-pine64-ov5640/APKBUILD
diff --git a/device/community/firmware-pine64-rtl8723bt/APKBUILD b/device/main/firmware-pine64-rtl8723bt/APKBUILD
similarity index 100%
rename from device/community/firmware-pine64-rtl8723bt/APKBUILD
rename to device/main/firmware-pine64-rtl8723bt/APKBUILD