diff --git a/temp/u-boot-pinephone/0001-sunxi-DT-H6-update-device-tree-files.patch b/device/main/u-boot-pinephone/0001-sunxi-DT-H6-update-device-tree-files.patch
similarity index 100%
rename from temp/u-boot-pinephone/0001-sunxi-DT-H6-update-device-tree-files.patch
rename to device/main/u-boot-pinephone/0001-sunxi-DT-H6-update-device-tree-files.patch
diff --git a/temp/u-boot-pinephone/0002-tools-mkimage-Add-Allwinner-TOC0-support.patch b/device/main/u-boot-pinephone/0002-tools-mkimage-Add-Allwinner-TOC0-support.patch
similarity index 100%
rename from temp/u-boot-pinephone/0002-tools-mkimage-Add-Allwinner-TOC0-support.patch
rename to device/main/u-boot-pinephone/0002-tools-mkimage-Add-Allwinner-TOC0-support.patch
diff --git a/temp/u-boot-pinephone/0003-sunxi-Support-both-SPL-image-types.patch b/device/main/u-boot-pinephone/0003-sunxi-Support-both-SPL-image-types.patch
similarity index 100%
rename from temp/u-boot-pinephone/0003-sunxi-Support-both-SPL-image-types.patch
rename to device/main/u-boot-pinephone/0003-sunxi-Support-both-SPL-image-types.patch
diff --git a/temp/u-boot-pinephone/0004-sunxi-Support-building-a-SPL-as-a-TOC0-image.patch b/device/main/u-boot-pinephone/0004-sunxi-Support-building-a-SPL-as-a-TOC0-image.patch
similarity index 100%
rename from temp/u-boot-pinephone/0004-sunxi-Support-building-a-SPL-as-a-TOC0-image.patch
rename to device/main/u-boot-pinephone/0004-sunxi-Support-building-a-SPL-as-a-TOC0-image.patch
diff --git a/temp/u-boot-pinephone/0005-sunxi-DT-H6-Add-USB3-to-Pine-H64-DTS.patch b/device/main/u-boot-pinephone/0005-sunxi-DT-H6-Add-USB3-to-Pine-H64-DTS.patch
similarity index 100%
rename from temp/u-boot-pinephone/0005-sunxi-DT-H6-Add-USB3-to-Pine-H64-DTS.patch
rename to device/main/u-boot-pinephone/0005-sunxi-DT-H6-Add-USB3-to-Pine-H64-DTS.patch
diff --git a/temp/u-boot-pinephone/0006-sunxi-Load-sun8i-secure-monitor-to-SRAM-A2.patch b/device/main/u-boot-pinephone/0006-sunxi-Load-sun8i-secure-monitor-to-SRAM-A2.patch
similarity index 100%
rename from temp/u-boot-pinephone/0006-sunxi-Load-sun8i-secure-monitor-to-SRAM-A2.patch
rename to device/main/u-boot-pinephone/0006-sunxi-Load-sun8i-secure-monitor-to-SRAM-A2.patch
diff --git a/temp/u-boot-pinephone/0007-pinephone-Add-volume_key-environment-variable.patch b/device/main/u-boot-pinephone/0007-pinephone-Add-volume_key-environment-variable.patch
similarity index 100%
rename from temp/u-boot-pinephone/0007-pinephone-Add-volume_key-environment-variable.patch
rename to device/main/u-boot-pinephone/0007-pinephone-Add-volume_key-environment-variable.patch
diff --git a/temp/u-boot-pinephone/0008-Enable-led-on-boot-to-notify-user-of-boot-status.patch b/device/main/u-boot-pinephone/0008-Enable-led-on-boot-to-notify-user-of-boot-status.patch
similarity index 100%
rename from temp/u-boot-pinephone/0008-Enable-led-on-boot-to-notify-user-of-boot-status.patch
rename to device/main/u-boot-pinephone/0008-Enable-led-on-boot-to-notify-user-of-boot-status.patch
diff --git a/temp/u-boot-pinephone/0009-disable-bootdelay.patch b/device/main/u-boot-pinephone/0009-disable-bootdelay.patch
similarity index 100%
rename from temp/u-boot-pinephone/0009-disable-bootdelay.patch
rename to device/main/u-boot-pinephone/0009-disable-bootdelay.patch
diff --git a/temp/u-boot-pinephone/0010-Reduce-DRAM-speed-to-528-for-better-compatibility-wi.patch b/device/main/u-boot-pinephone/0010-Reduce-DRAM-speed-to-528-for-better-compatibility-wi.patch
similarity index 100%
rename from temp/u-boot-pinephone/0010-Reduce-DRAM-speed-to-528-for-better-compatibility-wi.patch
rename to device/main/u-boot-pinephone/0010-Reduce-DRAM-speed-to-528-for-better-compatibility-wi.patch
diff --git a/temp/u-boot-pinephone/0011-mmc-sunxi-Add-support-for-DMA-transfers.patch b/device/main/u-boot-pinephone/0011-mmc-sunxi-Add-support-for-DMA-transfers.patch
similarity index 100%
rename from temp/u-boot-pinephone/0011-mmc-sunxi-Add-support-for-DMA-transfers.patch
rename to device/main/u-boot-pinephone/0011-mmc-sunxi-Add-support-for-DMA-transfers.patch
diff --git a/temp/u-boot-pinephone/0012-mmc-sunxi-DDR-DMA-support-for-SPL.patch b/device/main/u-boot-pinephone/0012-mmc-sunxi-DDR-DMA-support-for-SPL.patch
similarity index 100%
rename from temp/u-boot-pinephone/0012-mmc-sunxi-DDR-DMA-support-for-SPL.patch
rename to device/main/u-boot-pinephone/0012-mmc-sunxi-DDR-DMA-support-for-SPL.patch
diff --git a/temp/u-boot-pinephone/0013-spl-ARM-Enable-CPU-caches.patch b/device/main/u-boot-pinephone/0013-spl-ARM-Enable-CPU-caches.patch
similarity index 100%
rename from temp/u-boot-pinephone/0013-spl-ARM-Enable-CPU-caches.patch
rename to device/main/u-boot-pinephone/0013-spl-ARM-Enable-CPU-caches.patch
diff --git a/temp/u-boot-pinephone/0014-common-expose-DRAM-clock-speed.patch b/device/main/u-boot-pinephone/0014-common-expose-DRAM-clock-speed.patch
similarity index 100%
rename from temp/u-boot-pinephone/0014-common-expose-DRAM-clock-speed.patch
rename to device/main/u-boot-pinephone/0014-common-expose-DRAM-clock-speed.patch
diff --git a/temp/u-boot-pinephone/APKBUILD b/device/main/u-boot-pinephone/APKBUILD
similarity index 100%
rename from temp/u-boot-pinephone/APKBUILD
rename to device/main/u-boot-pinephone/APKBUILD
diff --git a/temp/u-boot-pinephone/u-boot-pinephone.post-upgrade b/device/main/u-boot-pinephone/u-boot-pinephone.post-upgrade
similarity index 100%
rename from temp/u-boot-pinephone/u-boot-pinephone.post-upgrade
rename to device/main/u-boot-pinephone/u-boot-pinephone.post-upgrade
diff --git a/temp/u-boot-pinephone/update-u-boot b/device/main/u-boot-pinephone/update-u-boot
similarity index 100%
rename from temp/u-boot-pinephone/update-u-boot
rename to device/main/u-boot-pinephone/update-u-boot