diff --git a/firmware/SOURCES b/firmware/SOURCES
index 1eab0d5de8..a52f01494d 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -480,7 +480,7 @@ target/arm/system-arm.c
 
 #if CONFIG_STORAGE & STORAGE_ATA
 # ifdef CPU_PP502x
-target/arm/ata-pp5020.c
+target/arm/pp/ata-pp5020.c
 # endif
 # if CONFIG_CPU == DM320 || defined(CPU_PP502x)
 target/arm/ata-as-arm.S
@@ -502,7 +502,7 @@ target/arm/ipod/powermgmt-ipod-pcf.c
 #endif /* CPU_PP && IPOD_ARCH */
 
 #if CONFIG_I2C == I2C_PP5024 || CONFIG_I2C == I2C_PP5020 || CONFIG_I2C == I2C_PP5002
-target/arm/i2c-pp.c
+target/arm/pp/i2c-pp.c
 #elif CONFIG_I2C == I2C_PNX0101
 target/arm/pnx0101/i2c-pnx0101.c
 #elif CONFIG_I2C == I2C_TCC780X || CONFIG_I2C == I2C_TCC77X 
@@ -589,36 +589,36 @@ target/arm/as3525/pcm-as3525.c
 #endif /* CONFIG_CPU == AS3525 */
 
 #if defined(CPU_PP)
-target/arm/i2s-pp.c
-target/arm/kernel-pp.c
-target/arm/timer-pp.c
+target/arm/pp/i2s-pp.c
+target/arm/pp/kernel-pp.c
+target/arm/pp/timer-pp.c
 # if CONFIG_STORAGE & STORAGE_SD
-target/arm/ata-sd-pp.c
+target/arm/pp/ata-sd-pp.c
 # endif
 # if !defined(HAVE_AS3514) && !defined(HAVE_AK4537)
-target/arm/wmcodec-pp.c
+target/arm/pp/wmcodec-pp.c
 # endif
 #if CONFIG_CPU == PP5002
-target/arm/system-pp5002.c
-target/arm/usb-fw-pp5002.c
-target/arm/ata-pp5002.c
+target/arm/pp/system-pp5002.c
+target/arm/pp/usb-fw-pp5002.c
+target/arm/pp/ata-pp5002.c
 #elif defined CPU_PP502x
-target/arm/usb-fw-pp502x.c
-target/arm/system-pp502x.c
+target/arm/pp/usb-fw-pp502x.c
+target/arm/pp/system-pp502x.c
 #endif
 #ifdef BOOTLOADER
 #ifdef HAVE_BOOTLOADER_USB_MODE
-target/arm/crt0-pp502x-bl-usb.S
+target/arm/pp/crt0-pp502x-bl-usb.S
 #else
-target/arm/crt0-pp-bl.S
+target/arm/pp/crt0-pp-bl.S
 #endif /* HAVE_BOOTLOADER_USB_MODE */
 #else /* !BOOTLOADER */
-target/arm/pcm-pp.c
-target/arm/debug-pp.c
+target/arm/pp/pcm-pp.c
+target/arm/pp/debug-pp.c
 #if !defined(SANSA_E200) && !defined(SANSA_C200)
-target/arm/audio-pp.c
+target/arm/pp/audio-pp.c
 #endif /* SANSA_E200 */
-target/arm/crt0-pp.S
+target/arm/pp/crt0-pp.S
 #endif
 #elif CONFIG_CPU == PNX0101
 target/arm/pnx0101/crt0-pnx0101.S
@@ -744,7 +744,7 @@ drivers/audio/tsc2100.c
 
 #ifdef HAVE_AS3514
 # ifdef CPU_PP
-target/arm/ascodec-pp.c
+target/arm/pp/ascodec-pp.c
 # endif
 # if !defined(BOOTLOADER) || defined(CPU_PP)
 target/arm/adc-as3514.c
@@ -758,7 +758,7 @@ target/arm/powermgmt-ascodec.c
 # ifdef IPOD_ARCH
 target/arm/ipod/adc-ipod-pcf.c
 # else
-target/arm/adc-pp5020.c
+target/arm/pp/adc-pp5020.c
 # endif /* IPOD_ARCH */
 
 #elif CONFIG_I2C == I2C_PP5002
diff --git a/firmware/target/arm/iriver/boot.lds b/firmware/target/arm/iriver/boot.lds
index ed4fc351fe..6065b50310 100644
--- a/firmware/target/arm/iriver/boot.lds
+++ b/firmware/target/arm/iriver/boot.lds
@@ -1,2 +1,2 @@
 #include "config.h"
-#include "../boot-pp502x-bl-usb.lds"
+#include "../pp/boot-pp502x-bl-usb.lds"
diff --git a/firmware/target/arm/philips/boot.lds b/firmware/target/arm/philips/boot.lds
index 5d63caddb0..46a2bfdfd2 100644
--- a/firmware/target/arm/philips/boot.lds
+++ b/firmware/target/arm/philips/boot.lds
@@ -2,7 +2,7 @@
 
 /* Can't link all Philips ARM devices the same way at this time */
 #ifdef HAVE_BOOTLOADER_USB_MODE
-#include "../boot-pp502x-bl-usb.lds"
+#include "../pp/boot-pp502x-bl-usb.lds"
 #else /* !HAVE_BOOTLOADER_USB_MODE */
 ENTRY(start)
 OUTPUT_FORMAT(elf32-littlearm)
diff --git a/firmware/target/arm/adc-pp5020.c b/firmware/target/arm/pp/adc-pp5020.c
similarity index 100%
rename from firmware/target/arm/adc-pp5020.c
rename to firmware/target/arm/pp/adc-pp5020.c
diff --git a/firmware/target/arm/ascodec-pp.c b/firmware/target/arm/pp/ascodec-pp.c
similarity index 100%
rename from firmware/target/arm/ascodec-pp.c
rename to firmware/target/arm/pp/ascodec-pp.c
diff --git a/firmware/target/arm/ata-pp5002.c b/firmware/target/arm/pp/ata-pp5002.c
similarity index 100%
rename from firmware/target/arm/ata-pp5002.c
rename to firmware/target/arm/pp/ata-pp5002.c
diff --git a/firmware/target/arm/ata-pp5020.c b/firmware/target/arm/pp/ata-pp5020.c
similarity index 100%
rename from firmware/target/arm/ata-pp5020.c
rename to firmware/target/arm/pp/ata-pp5020.c
diff --git a/firmware/target/arm/ata-sd-pp.c b/firmware/target/arm/pp/ata-sd-pp.c
similarity index 100%
rename from firmware/target/arm/ata-sd-pp.c
rename to firmware/target/arm/pp/ata-sd-pp.c
diff --git a/firmware/target/arm/audio-pp.c b/firmware/target/arm/pp/audio-pp.c
similarity index 100%
rename from firmware/target/arm/audio-pp.c
rename to firmware/target/arm/pp/audio-pp.c
diff --git a/firmware/target/arm/boot-pp502x-bl-usb.lds b/firmware/target/arm/pp/boot-pp502x-bl-usb.lds
similarity index 100%
rename from firmware/target/arm/boot-pp502x-bl-usb.lds
rename to firmware/target/arm/pp/boot-pp502x-bl-usb.lds
diff --git a/firmware/target/arm/crt0-pp-bl.S b/firmware/target/arm/pp/crt0-pp-bl.S
similarity index 100%
rename from firmware/target/arm/crt0-pp-bl.S
rename to firmware/target/arm/pp/crt0-pp-bl.S
diff --git a/firmware/target/arm/crt0-pp.S b/firmware/target/arm/pp/crt0-pp.S
similarity index 100%
rename from firmware/target/arm/crt0-pp.S
rename to firmware/target/arm/pp/crt0-pp.S
diff --git a/firmware/target/arm/crt0-pp502x-bl-usb.S b/firmware/target/arm/pp/crt0-pp502x-bl-usb.S
similarity index 100%
rename from firmware/target/arm/crt0-pp502x-bl-usb.S
rename to firmware/target/arm/pp/crt0-pp502x-bl-usb.S
diff --git a/firmware/target/arm/debug-pp.c b/firmware/target/arm/pp/debug-pp.c
similarity index 100%
rename from firmware/target/arm/debug-pp.c
rename to firmware/target/arm/pp/debug-pp.c
diff --git a/firmware/target/arm/i2c-pp.c b/firmware/target/arm/pp/i2c-pp.c
similarity index 100%
rename from firmware/target/arm/i2c-pp.c
rename to firmware/target/arm/pp/i2c-pp.c
diff --git a/firmware/target/arm/i2s-pp.c b/firmware/target/arm/pp/i2s-pp.c
similarity index 100%
rename from firmware/target/arm/i2s-pp.c
rename to firmware/target/arm/pp/i2s-pp.c
diff --git a/firmware/target/arm/kernel-pp.c b/firmware/target/arm/pp/kernel-pp.c
similarity index 100%
rename from firmware/target/arm/kernel-pp.c
rename to firmware/target/arm/pp/kernel-pp.c
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pp/pcm-pp.c
similarity index 100%
rename from firmware/target/arm/pcm-pp.c
rename to firmware/target/arm/pp/pcm-pp.c
diff --git a/firmware/target/arm/system-pp5002.c b/firmware/target/arm/pp/system-pp5002.c
similarity index 100%
rename from firmware/target/arm/system-pp5002.c
rename to firmware/target/arm/pp/system-pp5002.c
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/pp/system-pp502x.c
similarity index 100%
rename from firmware/target/arm/system-pp502x.c
rename to firmware/target/arm/pp/system-pp502x.c
diff --git a/firmware/target/arm/thread-pp.c b/firmware/target/arm/pp/thread-pp.c
similarity index 100%
rename from firmware/target/arm/thread-pp.c
rename to firmware/target/arm/pp/thread-pp.c
diff --git a/firmware/target/arm/timer-pp.c b/firmware/target/arm/pp/timer-pp.c
similarity index 100%
rename from firmware/target/arm/timer-pp.c
rename to firmware/target/arm/pp/timer-pp.c
diff --git a/firmware/target/arm/usb-fw-pp5002.c b/firmware/target/arm/pp/usb-fw-pp5002.c
similarity index 100%
rename from firmware/target/arm/usb-fw-pp5002.c
rename to firmware/target/arm/pp/usb-fw-pp5002.c
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/pp/usb-fw-pp502x.c
similarity index 100%
rename from firmware/target/arm/usb-fw-pp502x.c
rename to firmware/target/arm/pp/usb-fw-pp502x.c
diff --git a/firmware/target/arm/wmcodec-pp.c b/firmware/target/arm/pp/wmcodec-pp.c
similarity index 100%
rename from firmware/target/arm/wmcodec-pp.c
rename to firmware/target/arm/pp/wmcodec-pp.c
diff --git a/firmware/target/arm/sandisk/boot.lds b/firmware/target/arm/sandisk/boot.lds
index e3f952660c..dbdb83435d 100644
--- a/firmware/target/arm/sandisk/boot.lds
+++ b/firmware/target/arm/sandisk/boot.lds
@@ -2,7 +2,7 @@
 
 /* Can't link all Sansa PP devices the same way at this time */
 #ifdef HAVE_BOOTLOADER_USB_MODE
-#include "../boot-pp502x-bl-usb.lds"
+#include "../pp/boot-pp502x-bl-usb.lds"
 #else /* !HAVE_BOOTLOADER_USB_MODE */
 
 ENTRY(start)