diff --git a/firmware/FILES b/firmware/FILES
index f44d5f28b7..f68e0cbb01 100644
--- a/firmware/FILES
+++ b/firmware/FILES
@@ -19,7 +19,7 @@ target/arm/archos/av300/*.[chS]
 target/arm/s3c2440/gigabeat-fx/*.[chS]
 target/arm/iriver/*.[chS]
 target/arm/iriver/h10/*.[chS]
-target/arm/iriver/ifp7xx/*.[chS]
+target/arm/pnx0101/iriver-ifp7xx/*.[chS]
 target/arm/ipod/*.[chS]
 target/arm/ipod/3g/*.[chS]
 target/arm/ipod/video/*.[chS]
diff --git a/firmware/SOURCES b/firmware/SOURCES
index d8d495c89c..d8e3d7e2ed 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -279,7 +279,7 @@ drivers/i2c-pnx0101.c
 /* no i2c driver yet */
 #endif
 #if CONFIG_CPU == PNX0101
-target/arm/system-pnx0101.c
+target/arm/pnx0101/system-pnx0101.c
 #endif
 #if defined(CPU_PP)
 #ifdef BOOTLOADER
@@ -290,7 +290,7 @@ target/arm/audio-pp.c
 target/arm/crt0-pp.S
 #endif
 #elif CONFIG_CPU == PNX0101
-target/arm/crt0-pnx0101.S
+target/arm/pnx0101/crt0-pnx0101.S
 #elif defined(CPU_ARM)
 target/arm/crt0.S
 #endif /* defined(CPU_*) */
@@ -642,12 +642,12 @@ target/arm/usb-pp.c
 #endif /* IPOD_MINI2G */
 
 #ifdef IRIVER_IFP7XX
-target/arm/iriver/ifp7xx/power-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c
 #ifndef SIMULATOR
-target/arm/iriver/ifp7xx/adc-ifp7xx.c
-target/arm/iriver/ifp7xx/backlight-ifp7xx.c
-target/arm/iriver/ifp7xx/button-ifp7xx.c
-target/arm/iriver/ifp7xx/lcd-ifp7xx.c
-target/arm/iriver/ifp7xx/usb-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c
+target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
 #endif
 #endif
diff --git a/firmware/app.lds b/firmware/app.lds
index f1a02b56d7..8b0bed31d2 100644
--- a/firmware/app.lds
+++ b/firmware/app.lds
@@ -10,7 +10,7 @@ OUTPUT_ARCH(arm)
 #ifdef CPU_PP
 INPUT(target/arm/crt0-pp.o)
 #elif CONFIG_CPU == PNX0101
-INPUT(target/arm/crt0-pnx0101.o)
+INPUT(target/arm/pnx0101/crt0-pnx0101.o)
 #elif defined(CPU_ARM)
 INPUT(target/arm/crt0.o)
 #endif
diff --git a/firmware/target/arm/pnx0101/backlight-target.h b/firmware/target/arm/pnx0101/backlight-target.h
new file mode 100644
index 0000000000..04236880ee
--- /dev/null
+++ b/firmware/target/arm/pnx0101/backlight-target.h
@@ -0,0 +1,26 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id: backlight-target.h 13136 2007-04-12 22:12:13Z amiconn $
+ *
+ * Copyright (C) 2006 by Barry Wardell
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef BACKLIGHT_TARGET_H
+#define BACKLIGHT_TARGET_H
+
+#define __backlight_init() true
+void __backlight_on(void);
+void __backlight_off(void);
+
+#endif
diff --git a/firmware/target/arm/crt0-pnx0101.S b/firmware/target/arm/pnx0101/crt0-pnx0101.S
similarity index 100%
rename from firmware/target/arm/crt0-pnx0101.S
rename to firmware/target/arm/pnx0101/crt0-pnx0101.S
diff --git a/firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c
similarity index 100%
rename from firmware/target/arm/iriver/ifp7xx/adc-ifp7xx.c
rename to firmware/target/arm/pnx0101/iriver-ifp7xx/adc-ifp7xx.c
diff --git a/firmware/target/arm/iriver/ifp7xx/adc-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h
similarity index 100%
rename from firmware/target/arm/iriver/ifp7xx/adc-target.h
rename to firmware/target/arm/pnx0101/iriver-ifp7xx/adc-target.h
diff --git a/firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c
similarity index 100%
rename from firmware/target/arm/iriver/ifp7xx/backlight-ifp7xx.c
rename to firmware/target/arm/pnx0101/iriver-ifp7xx/backlight-ifp7xx.c
diff --git a/firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c
similarity index 100%
rename from firmware/target/arm/iriver/ifp7xx/button-ifp7xx.c
rename to firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c
diff --git a/firmware/target/arm/iriver/ifp7xx/button-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h
similarity index 100%
rename from firmware/target/arm/iriver/ifp7xx/button-target.h
rename to firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h
diff --git a/firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c
similarity index 100%
rename from firmware/target/arm/iriver/ifp7xx/lcd-ifp7xx.c
rename to firmware/target/arm/pnx0101/iriver-ifp7xx/lcd-ifp7xx.c
diff --git a/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c
similarity index 100%
rename from firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c
rename to firmware/target/arm/pnx0101/iriver-ifp7xx/power-ifp7xx.c
diff --git a/firmware/target/arm/iriver/ifp7xx/system-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h
similarity index 100%
rename from firmware/target/arm/iriver/ifp7xx/system-target.h
rename to firmware/target/arm/pnx0101/iriver-ifp7xx/system-target.h
diff --git a/firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
similarity index 100%
rename from firmware/target/arm/iriver/ifp7xx/usb-ifp7xx.c
rename to firmware/target/arm/pnx0101/iriver-ifp7xx/usb-ifp7xx.c
diff --git a/firmware/target/arm/system-pnx0101.c b/firmware/target/arm/pnx0101/system-pnx0101.c
similarity index 100%
rename from firmware/target/arm/system-pnx0101.c
rename to firmware/target/arm/pnx0101/system-pnx0101.c
diff --git a/firmware/target/arm/pnx0101/usb-target.h b/firmware/target/arm/pnx0101/usb-target.h
new file mode 100644
index 0000000000..fb263b2419
--- /dev/null
+++ b/firmware/target/arm/pnx0101/usb-target.h
@@ -0,0 +1,27 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id: usb-target.h 11494 2006-11-10 07:43:36Z tomal $
+ *
+ * Copyright (C) 2006 by Barry Wardelll
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/* Based off x5 version */
+
+#ifndef USB_TARGET_H
+#define USB_TARGET_H
+
+bool usb_init_device(void);
+
+#endif
diff --git a/tools/configure b/tools/configure
index ab7b6e8968..ba464472b5 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1105,8 +1105,8 @@ EOF
     # this particular target.
     toolset=$genericbitmaptools
     t_cpu="arm"
-    t_manufacturer="iriver"
-    t_model="ifp7xx"
+    t_manufacturer="pnx0101"
+    t_model="iriver-ifp7xx"
     ;;
 
    40|gigabeatf)