diff --git a/Bootloaders/CDC/BootloaderCDC.aps b/Bootloaders/CDC/BootloaderCDC.aps
deleted file mode 100644
index a0f0e75636..0000000000
--- a/Bootloaders/CDC/BootloaderCDC.aps
+++ /dev/null
@@ -1 +0,0 @@
-BootloaderCDC30-Sep-2008 14:20:0930-Sep-2008 14:20:30241030-Sep-2008 14:20:0944, 14, 0, 589AVR GCCBootloaderCDC.elfC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Bootloaders\CDC\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000BootloaderCDC.cDescriptors.cBootloaderCDC.hDescriptors.hmakefiledefaultYESmakefileatmega12811
BootloaderCDC.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exeC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Bootloaders\CDC\BootloaderCDC.hC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Bootloaders\CDC\Descriptors.hC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Bootloaders\CDC\BootloaderCDC.cC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Bootloaders\CDC\Descriptors.c
diff --git a/Bootloaders/DFU/BootloaderDFU.aps b/Bootloaders/DFU/BootloaderDFU.aps
deleted file mode 100644
index 4d0f40b7bc..0000000000
--- a/Bootloaders/DFU/BootloaderDFU.aps
+++ /dev/null
@@ -1 +0,0 @@
-BootloaderDFU30-Sep-2008 14:20:4730-Sep-2008 14:21:00241030-Sep-2008 14:20:4744, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Bootloaders\DFU\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31000BootloaderDFU.cDescriptors.cBootloaderDFU.hDescriptors.hmakefiledefaultYESmakefileatmega12811
BootloaderDFU.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/AudioInput/AudioInput.aps b/Demos/Device/ClassDriver/AudioInput/AudioInput.aps
deleted file mode 100644
index aed850ae39..0000000000
--- a/Demos/Device/ClassDriver/AudioInput/AudioInput.aps
+++ /dev/null
@@ -1 +0,0 @@
-AudioInput30-Sep-2008 14:03:0030-Sep-2008 14:03:28241030-Sep-2008 14:03:0044, 14, 0, 589AVR GCCAudioInput.elfC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioInput\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31000AudioInput.cDescriptors.cAudioInput.hDescriptors.hmakefiledefaultYESmakefileatmega12811
AudioInput.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exeC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioInput\AudioInput.hC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioInput\Descriptors.hC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioInput\AudioInput.cC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioInput\Descriptors.c
diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile
index 9d3adff69c..b5b27139e2 100644
--- a/Demos/Device/ClassDriver/AudioInput/makefile
+++ b/Demos/Device/ClassDriver/AudioInput/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.aps b/Demos/Device/ClassDriver/AudioOutput/AudioOutput.aps
deleted file mode 100644
index a01ba8f1ab..0000000000
--- a/Demos/Device/ClassDriver/AudioOutput/AudioOutput.aps
+++ /dev/null
@@ -1 +0,0 @@
-AudioOutput30-Sep-2008 14:03:5130-Sep-2008 14:04:06241030-Sep-2008 14:03:5144, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioOutput\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31000AudioOutput.cDescriptors.cAudioOutput.hDescriptors.hmakefiledefaultYESmakefileatmega12811
AudioOutput.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile
index 8ad1def4d0..b6f48d43d9 100644
--- a/Demos/Device/ClassDriver/AudioOutput/makefile
+++ b/Demos/Device/ClassDriver/AudioOutput/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/CDC/CDC.aps b/Demos/Device/ClassDriver/CDC/CDC.aps
deleted file mode 100644
index 83dde595de..0000000000
--- a/Demos/Device/ClassDriver/CDC/CDC.aps
+++ /dev/null
@@ -1 +0,0 @@
-CDC30-Sep-2008 14:04:3430-Sep-2008 14:04:56241030-Sep-2008 14:04:3444, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\CDC\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000CDC.cDescriptors.cCDC.hDescriptors.hmakefiledefaultYESmakefileatmega12811
CDC.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/CDC/makefile b/Demos/Device/ClassDriver/CDC/makefile
index bd4ff36b96..a244f1fa11 100644
--- a/Demos/Device/ClassDriver/CDC/makefile
+++ b/Demos/Device/ClassDriver/CDC/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.aps b/Demos/Device/ClassDriver/DualCDC/DualCDC.aps
deleted file mode 100644
index 276e743564..0000000000
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.aps
+++ /dev/null
@@ -1 +0,0 @@
-DualCDC30-Sep-2008 14:06:0330-Sep-2008 14:06:18241030-Sep-2008 14:06:0344, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\DualCDC\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cDualCDC.cDescriptors.hDualCDC.hmakefiledefaultYESmakefileatmega12811
DualCDC.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/DualCDC/makefile b/Demos/Device/ClassDriver/DualCDC/makefile
index 5fbda61dd1..7a8fba327a 100644
--- a/Demos/Device/ClassDriver/DualCDC/makefile
+++ b/Demos/Device/ClassDriver/DualCDC/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.aps b/Demos/Device/ClassDriver/GenericHID/GenericHID.aps
deleted file mode 100644
index ec824c7c5e..0000000000
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.aps
+++ /dev/null
@@ -1 +0,0 @@
-GenericHID29-Mar-2009 23:19:2429-Mar-2009 23:19:40241029-Mar-2009 23:19:2444, 16, 0, 626AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\GenericHID\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cGenericHID.cDescriptors.hGenericHID.hmakefiledefaultYESmakefileat90usb128711
GenericHID.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20090313\bin\avr-gcc.exeC:\WinAVR-20090313\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/GenericHID/makefile b/Demos/Device/ClassDriver/GenericHID/makefile
index 5cc4b4a43b..292484ae92 100644
--- a/Demos/Device/ClassDriver/GenericHID/makefile
+++ b/Demos/Device/ClassDriver/GenericHID/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.aps b/Demos/Device/ClassDriver/Joystick/Joystick.aps
deleted file mode 100644
index 245245daa8..0000000000
--- a/Demos/Device/ClassDriver/Joystick/Joystick.aps
+++ /dev/null
@@ -1 +0,0 @@
-Joystick30-Sep-2008 14:06:3830-Sep-2008 14:07:27241030-Sep-2008 14:06:3844, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\Joystick\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cJoystick.cDescriptors.hJoystick.hmakefiledefaultYESmakefileat90usb128711
Joystick.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/Joystick/makefile b/Demos/Device/ClassDriver/Joystick/makefile
index 826766c306..0c21bc4937 100644
--- a/Demos/Device/ClassDriver/Joystick/makefile
+++ b/Demos/Device/ClassDriver/Joystick/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.aps b/Demos/Device/ClassDriver/Keyboard/Keyboard.aps
deleted file mode 100644
index 541c175031..0000000000
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.aps
+++ /dev/null
@@ -1 +0,0 @@
-Keyboard30-Sep-2008 13:59:2930-Sep-2008 14:00:25241030-Sep-2008 13:59:2944, 14, 0, 589AVR GCCKeyboard.elfC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\Keyboard\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cKeyboard.cDescriptors.hKeyboard.hmakefiledefaultYESmakefileat90usb128711
Keyboard.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe00000makefile1
diff --git a/Demos/Device/ClassDriver/Keyboard/makefile b/Demos/Device/ClassDriver/Keyboard/makefile
index 98cda2f895..5377e6de19 100644
--- a/Demos/Device/ClassDriver/Keyboard/makefile
+++ b/Demos/Device/ClassDriver/Keyboard/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.aps b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.aps
deleted file mode 100644
index eb54f1d4db..0000000000
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.aps
+++ /dev/null
@@ -1 +0,0 @@
-KeyboardMouse30-Sep-2008 14:11:0030-Sep-2008 14:11:17241030-Sep-2008 14:11:0044, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\KeyboardMouse\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cKeyboardMouse.cDescriptors.hKeyboardMouse.hmakefiledefaultYESmakefileat90usb128711
KeyboardMouse.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/makefile b/Demos/Device/ClassDriver/KeyboardMouse/makefile
index ddad7d24bd..6bfa2a9cf0 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/makefile
+++ b/Demos/Device/ClassDriver/KeyboardMouse/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/MIDI/MIDI.aps b/Demos/Device/ClassDriver/MIDI/MIDI.aps
deleted file mode 100644
index e61e770129..0000000000
--- a/Demos/Device/ClassDriver/MIDI/MIDI.aps
+++ /dev/null
@@ -1 +0,0 @@
-MIDI30-Sep-2008 14:13:1230-Sep-2008 14:13:33241030-Sep-2008 14:13:1244, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\MIDI\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cMIDI.cDescriptors.hMIDI.hmakefiledefaultYESmakefileatmega12811
MIDI.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/MIDI/makefile b/Demos/Device/ClassDriver/MIDI/makefile
index f850421733..c5a13c1a69 100644
--- a/Demos/Device/ClassDriver/MIDI/makefile
+++ b/Demos/Device/ClassDriver/MIDI/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/MassStorage/MassStorage.aps b/Demos/Device/ClassDriver/MassStorage/MassStorage.aps
deleted file mode 100644
index 483bc4caba..0000000000
--- a/Demos/Device/ClassDriver/MassStorage/MassStorage.aps
+++ /dev/null
@@ -1 +0,0 @@
-MassStorage30-Sep-2008 14:12:0930-Sep-2008 14:12:25241030-Sep-2008 14:12:0944, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\MassStorage\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000DataflashManager.cDescriptors.cMassStorage.cSCSI.cDataflashManager.hDescriptors.hMassStorage.hSCSI.hSCSI_Codes.hmakefiledefaultYESmakefileat90usb128711
MassStorage.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/MassStorage/makefile b/Demos/Device/ClassDriver/MassStorage/makefile
index c4adfc9bea..8b7f944dfc 100644
--- a/Demos/Device/ClassDriver/MassStorage/makefile
+++ b/Demos/Device/ClassDriver/MassStorage/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.aps b/Demos/Device/ClassDriver/Mouse/Mouse.aps
deleted file mode 100644
index 3ae163797f..0000000000
--- a/Demos/Device/ClassDriver/Mouse/Mouse.aps
+++ /dev/null
@@ -1 +0,0 @@
-Mouse30-Sep-2008 14:13:5230-Sep-2008 14:14:08241030-Sep-2008 14:13:5244, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\Mouse\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cMouse.cDescriptors.hMouse.hmakefiledefaultYESmakefileat90usb128711
Mouse.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/Mouse/makefile b/Demos/Device/ClassDriver/Mouse/makefile
index 4c18f9d4ac..2ad7d6a8b7 100644
--- a/Demos/Device/ClassDriver/Mouse/makefile
+++ b/Demos/Device/ClassDriver/Mouse/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.aps b/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.aps
deleted file mode 100644
index b5d21c1f95..0000000000
--- a/Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.aps
+++ /dev/null
@@ -1 +0,0 @@
-RNDISEthernet30-Sep-2008 14:17:0522-Jan-2009 17:52:35241030-Sep-2008 14:17:0544, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ARP.cDescriptors.cEthernet.cICMP.cIP.cProtocolDecoders.cRNDIS.cRNDISEthernet.cTCP.cWebserver.cARP.hDescriptors.hEthernet.hEthernetProtocols.hICMP.hIP.hProtocolDecoders.hRNDIS.hRNDISEthernet.hTCP.hWebserver.hmakefiledefaultYESmakefileat90usb128711
RNDISEthernet.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20081205\bin\avr-gcc.exeC:\WinAVR-20081205\utils\bin\make.exeC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ARP.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Descriptors.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Ethernet.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\EthernetProtocols.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ICMP.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\IP.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ProtocolDecoders.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\RNDIS.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\RNDISEthernet.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\TCP.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Telnet.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Webserver.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ARP.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Descriptors.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Ethernet.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ICMP.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\IP.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ProtocolDecoders.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\RNDIS.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\RNDISEthernet.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\TCP.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Telnet.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Webserver.c
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/makefile b/Demos/Device/ClassDriver/RNDISEthernet/makefile
index 3bcc37c8e4..70d05f8a5b 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/makefile
+++ b/Demos/Device/ClassDriver/RNDISEthernet/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.aps b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.aps
deleted file mode 100644
index 2db4f97be6..0000000000
--- a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.aps
+++ /dev/null
@@ -1 +0,0 @@
-USBtoSerial30-Sep-2008 14:18:3930-Sep-2008 14:18:52241030-Sep-2008 14:18:3944, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\USBtoSerial\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cRingBuff.cUSBtoSerial.cDescriptors.hRingBuff.hUSBtoSerial.hmakefiledefaultYESmakefileatmega12811
USBtoSerial.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/ClassDriver/USBtoSerial/makefile b/Demos/Device/ClassDriver/USBtoSerial/makefile
index 5cf9c617eb..9c47e16770 100644
--- a/Demos/Device/ClassDriver/USBtoSerial/makefile
+++ b/Demos/Device/ClassDriver/USBtoSerial/makefile
@@ -119,7 +119,7 @@ OBJDIR = .
# Path to the LUFA library
-LUFA_PATH = ../../..
+LUFA_PATH = ../../../..
# List C source files here. (C dependencies are automatically generated.)
diff --git a/Demos/Device/LowLevel/AudioInput/AudioInput.aps b/Demos/Device/LowLevel/AudioInput/AudioInput.aps
deleted file mode 100644
index aed850ae39..0000000000
--- a/Demos/Device/LowLevel/AudioInput/AudioInput.aps
+++ /dev/null
@@ -1 +0,0 @@
-AudioInput30-Sep-2008 14:03:0030-Sep-2008 14:03:28241030-Sep-2008 14:03:0044, 14, 0, 589AVR GCCAudioInput.elfC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioInput\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31000AudioInput.cDescriptors.cAudioInput.hDescriptors.hmakefiledefaultYESmakefileatmega12811
AudioInput.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exeC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioInput\AudioInput.hC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioInput\Descriptors.hC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioInput\AudioInput.cC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioInput\Descriptors.c
diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.aps b/Demos/Device/LowLevel/AudioOutput/AudioOutput.aps
deleted file mode 100644
index a01ba8f1ab..0000000000
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.aps
+++ /dev/null
@@ -1 +0,0 @@
-AudioOutput30-Sep-2008 14:03:5130-Sep-2008 14:04:06241030-Sep-2008 14:03:5144, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\AudioOutput\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31000AudioOutput.cDescriptors.cAudioOutput.hDescriptors.hmakefiledefaultYESmakefileatmega12811
AudioOutput.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/LowLevel/CDC/CDC.aps b/Demos/Device/LowLevel/CDC/CDC.aps
deleted file mode 100644
index 83dde595de..0000000000
--- a/Demos/Device/LowLevel/CDC/CDC.aps
+++ /dev/null
@@ -1 +0,0 @@
-CDC30-Sep-2008 14:04:3430-Sep-2008 14:04:56241030-Sep-2008 14:04:3444, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\CDC\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000CDC.cDescriptors.cCDC.hDescriptors.hmakefiledefaultYESmakefileatmega12811
CDC.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/LowLevel/DualCDC/DualCDC.aps b/Demos/Device/LowLevel/DualCDC/DualCDC.aps
deleted file mode 100644
index 276e743564..0000000000
--- a/Demos/Device/LowLevel/DualCDC/DualCDC.aps
+++ /dev/null
@@ -1 +0,0 @@
-DualCDC30-Sep-2008 14:06:0330-Sep-2008 14:06:18241030-Sep-2008 14:06:0344, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\DualCDC\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cDualCDC.cDescriptors.hDualCDC.hmakefiledefaultYESmakefileatmega12811
DualCDC.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/LowLevel/GenericHID/GenericHID.aps b/Demos/Device/LowLevel/GenericHID/GenericHID.aps
deleted file mode 100644
index ec824c7c5e..0000000000
--- a/Demos/Device/LowLevel/GenericHID/GenericHID.aps
+++ /dev/null
@@ -1 +0,0 @@
-GenericHID29-Mar-2009 23:19:2429-Mar-2009 23:19:40241029-Mar-2009 23:19:2444, 16, 0, 626AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Device\GenericHID\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cGenericHID.cDescriptors.hGenericHID.hmakefiledefaultYESmakefileat90usb128711
GenericHID.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20090313\bin\avr-gcc.exeC:\WinAVR-20090313\utils\bin\make.exe
diff --git a/Demos/Device/LowLevel/Joystick/Joystick.aps b/Demos/Device/LowLevel/Joystick/Joystick.aps
deleted file mode 100644
index 245245daa8..0000000000
--- a/Demos/Device/LowLevel/Joystick/Joystick.aps
+++ /dev/null
@@ -1 +0,0 @@
-Joystick30-Sep-2008 14:06:3830-Sep-2008 14:07:27241030-Sep-2008 14:06:3844, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\Joystick\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cJoystick.cDescriptors.hJoystick.hmakefiledefaultYESmakefileat90usb128711
Joystick.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.aps b/Demos/Device/LowLevel/Keyboard/Keyboard.aps
deleted file mode 100644
index 541c175031..0000000000
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.aps
+++ /dev/null
@@ -1 +0,0 @@
-Keyboard30-Sep-2008 13:59:2930-Sep-2008 14:00:25241030-Sep-2008 13:59:2944, 14, 0, 589AVR GCCKeyboard.elfC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\Keyboard\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cKeyboard.cDescriptors.hKeyboard.hmakefiledefaultYESmakefileat90usb128711
Keyboard.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe00000makefile1
diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.aps b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.aps
deleted file mode 100644
index eb54f1d4db..0000000000
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.aps
+++ /dev/null
@@ -1 +0,0 @@
-KeyboardMouse30-Sep-2008 14:11:0030-Sep-2008 14:11:17241030-Sep-2008 14:11:0044, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\KeyboardMouse\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cKeyboardMouse.cDescriptors.hKeyboardMouse.hmakefiledefaultYESmakefileat90usb128711
KeyboardMouse.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/LowLevel/MIDI/MIDI.aps b/Demos/Device/LowLevel/MIDI/MIDI.aps
deleted file mode 100644
index e61e770129..0000000000
--- a/Demos/Device/LowLevel/MIDI/MIDI.aps
+++ /dev/null
@@ -1 +0,0 @@
-MIDI30-Sep-2008 14:13:1230-Sep-2008 14:13:33241030-Sep-2008 14:13:1244, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\MIDI\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cMIDI.cDescriptors.hMIDI.hmakefiledefaultYESmakefileatmega12811
MIDI.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.aps b/Demos/Device/LowLevel/MassStorage/MassStorage.aps
deleted file mode 100644
index 483bc4caba..0000000000
--- a/Demos/Device/LowLevel/MassStorage/MassStorage.aps
+++ /dev/null
@@ -1 +0,0 @@
-MassStorage30-Sep-2008 14:12:0930-Sep-2008 14:12:25241030-Sep-2008 14:12:0944, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\MassStorage\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000DataflashManager.cDescriptors.cMassStorage.cSCSI.cDataflashManager.hDescriptors.hMassStorage.hSCSI.hSCSI_Codes.hmakefiledefaultYESmakefileat90usb128711
MassStorage.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/LowLevel/Mouse/Mouse.aps b/Demos/Device/LowLevel/Mouse/Mouse.aps
deleted file mode 100644
index 3ae163797f..0000000000
--- a/Demos/Device/LowLevel/Mouse/Mouse.aps
+++ /dev/null
@@ -1 +0,0 @@
-Mouse30-Sep-2008 14:13:5230-Sep-2008 14:14:08241030-Sep-2008 14:13:5244, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\Mouse\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cMouse.cDescriptors.hMouse.hmakefiledefaultYESmakefileat90usb128711
Mouse.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.aps b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.aps
deleted file mode 100644
index b5d21c1f95..0000000000
--- a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.aps
+++ /dev/null
@@ -1 +0,0 @@
-RNDISEthernet30-Sep-2008 14:17:0522-Jan-2009 17:52:35241030-Sep-2008 14:17:0544, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ARP.cDescriptors.cEthernet.cICMP.cIP.cProtocolDecoders.cRNDIS.cRNDISEthernet.cTCP.cWebserver.cARP.hDescriptors.hEthernet.hEthernetProtocols.hICMP.hIP.hProtocolDecoders.hRNDIS.hRNDISEthernet.hTCP.hWebserver.hmakefiledefaultYESmakefileat90usb128711
RNDISEthernet.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20081205\bin\avr-gcc.exeC:\WinAVR-20081205\utils\bin\make.exeC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ARP.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Descriptors.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Ethernet.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\EthernetProtocols.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ICMP.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\IP.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ProtocolDecoders.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\RNDIS.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\RNDISEthernet.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\TCP.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Telnet.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Webserver.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ARP.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Descriptors.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Ethernet.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ICMP.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\IP.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\ProtocolDecoders.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\RNDIS.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\RNDISEthernet.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\TCP.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Telnet.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\RNDISEthernet\Webserver.c
diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.aps b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.aps
deleted file mode 100644
index 2db4f97be6..0000000000
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.aps
+++ /dev/null
@@ -1 +0,0 @@
-USBtoSerial30-Sep-2008 14:18:3930-Sep-2008 14:18:52241030-Sep-2008 14:18:3944, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\USBtoSerial\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cRingBuff.cUSBtoSerial.cDescriptors.hRingBuff.hUSBtoSerial.hmakefiledefaultYESmakefileatmega12811
USBtoSerial.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Device/makefile b/Demos/Device/makefile
new file mode 100644
index 0000000000..937c8fac85
--- /dev/null
+++ b/Demos/Device/makefile
@@ -0,0 +1,18 @@
+#
+# LUFA Library
+# Copyright (C) Dean Camera, 2009.
+#
+# dean [at] fourwalledcubicle [dot] com
+# www.fourwalledcubicle.com
+#
+
+# Makefile to build all the LUFA Class Driver and Low Level Demos. Call with
+# "make all" to rebuild all demos of both types.
+
+# Projects are pre-cleaned before each one is built, to ensure any
+# custom LUFA library build options are reflected in the compiled
+# code.
+
+%:
+ make -C ClassDriver/ $@
+ make -C LowLevel/ $@
diff --git a/Demos/Host/CDCHost/CDCHost.aps b/Demos/Host/CDCHost/CDCHost.aps
deleted file mode 100644
index b68991caef..0000000000
--- a/Demos/Host/CDCHost/CDCHost.aps
+++ /dev/null
@@ -1 +0,0 @@
-CDCHost30-Sep-2008 14:05:2030-Sep-2008 14:05:44241030-Sep-2008 14:05:2044, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\CDCHost\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31000CDCHost.cConfigDescriptor.cCDCHost.hConfigDescriptor.hmakefiledefaultYESmakefileatmega12811
CDCHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.aps b/Demos/Host/GenericHIDHost/GenericHIDHost.aps
deleted file mode 100644
index 9eadddc0b1..0000000000
--- a/Demos/Host/GenericHIDHost/GenericHIDHost.aps
+++ /dev/null
@@ -1 +0,0 @@
-GenericHIDHost01-Apr-2009 18:20:5801-Apr-2009 18:21:21241001-Apr-2009 18:20:5844, 16, 0, 626AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\Host\GenericHIDHost\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cGenericHIDHost.cConfigDescriptor.hGenericHIDHost.hmakefiledefaultYESmakefileat90usb128711
GenericHIDHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20090313\bin\avr-gcc.exeC:\WinAVR-20090313\utils\bin\make.exe
diff --git a/Demos/Host/KeyboardHost/KeyboardHost.aps b/Demos/Host/KeyboardHost/KeyboardHost.aps
deleted file mode 100644
index f80c86dc0e..0000000000
--- a/Demos/Host/KeyboardHost/KeyboardHost.aps
+++ /dev/null
@@ -1 +0,0 @@
-KeyboardHost30-Sep-2008 14:08:4830-Sep-2008 14:09:04241030-Sep-2008 14:08:4844, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\KeyboardHost\JTAGICE mkIIAT90USB1287.xmlfalseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cKeyboardHost.cConfigDescriptor.hKeyboardHost.hmakefiledefaultYESmakefileat90usb128711
KeyboardHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.aps b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.aps
deleted file mode 100644
index 3a51668be9..0000000000
--- a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.aps
+++ /dev/null
@@ -1 +0,0 @@
-KeyboardHostWithParser30-Sep-2008 14:10:1030-Sep-2008 14:10:39241030-Sep-2008 14:10:1044, 14, 0, 589AVR GCCKeyboardHostWithParser.elfC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\KeyboardHostWithParser\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cHIDReport.cKeyboardHostWithParser.cConfigDescriptor.hHIDReport.hKeyboardHostWithParser.hmakefiledefaultYESmakefileatmega12811
KeyboardHostWithParser.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exeC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\KeyboardHostWithParser\ConfigDescriptor.hC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\KeyboardHostWithParser\HIDReport.hC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\KeyboardHostWithParser\KeyboardHostWithParser.hC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\KeyboardHostWithParser\ConfigDescriptor.cC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\KeyboardHostWithParser\HIDReport.cC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\KeyboardHostWithParser\KeyboardHostWithParser.c
diff --git a/Demos/Host/MassStorageHost/MassStorageHost.aps b/Demos/Host/MassStorageHost/MassStorageHost.aps
deleted file mode 100644
index 9481b3443b..0000000000
--- a/Demos/Host/MassStorageHost/MassStorageHost.aps
+++ /dev/null
@@ -1 +0,0 @@
-MassStorageHost30-Sep-2008 14:12:4326-Jan-2009 16:08:24241030-Sep-2008 14:12:4344, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\MassStorageHost\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cMassStorageHost.cMassStoreCommands.cConfigDescriptor.hMassStorageHost.hMassStoreCommands.hSCSI_Codes.hmakefiledefaultYESmakefileatmega12811
MassStorageHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20081205\bin\avr-gcc.exeC:\WinAVR-20081205\utils\bin\make.exeC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\MassStorageHost\ConfigDescriptor.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\MassStorageHost\MassStorageHost.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\MassStorageHost\MassStoreCommands.hC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\MassStorageHost\ConfigDescriptor.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\MassStorageHost\MassStorageHost.cC:\Users\Dean\Documents\Electronics\Projects\WORK\LUFAWORK\Demos\MassStorageHost\MassStoreCommands.c
diff --git a/Demos/Host/MouseHost/MouseHost.aps b/Demos/Host/MouseHost/MouseHost.aps
deleted file mode 100644
index 1e40b0c6ea..0000000000
--- a/Demos/Host/MouseHost/MouseHost.aps
+++ /dev/null
@@ -1 +0,0 @@
-MouseHost30-Sep-2008 14:14:5630-Sep-2008 14:15:10241030-Sep-2008 14:14:5644, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\MouseHost\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cMouseHost.cConfigDescriptor.hMouseHost.hmakefiledefaultYESmakefileatmega12811
MouseHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Host/MouseHostWithParser/MouseHostWithParser.aps b/Demos/Host/MouseHostWithParser/MouseHostWithParser.aps
deleted file mode 100644
index 81d82eba8b..0000000000
--- a/Demos/Host/MouseHostWithParser/MouseHostWithParser.aps
+++ /dev/null
@@ -1 +0,0 @@
-MouseHostWithParser30-Sep-2008 14:15:5730-Sep-2008 14:16:12241030-Sep-2008 14:15:5744, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\MouseHostWithParser\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cHIDReport.cMouseHostWithParser.cConfigDescriptor.hHIDReport.hMouseHostWithParser.hmakefiledefaultYESmakefileatmega12811
MouseHostWithParser.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/Host/StillImageHost/StillImageHost.aps b/Demos/Host/StillImageHost/StillImageHost.aps
deleted file mode 100644
index cf2f1d8ea4..0000000000
--- a/Demos/Host/StillImageHost/StillImageHost.aps
+++ /dev/null
@@ -1 +0,0 @@
-StillImageHost30-Sep-2008 14:17:4130-Sep-2008 14:17:55241030-Sep-2008 14:17:4144, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\StillImageHost\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000ConfigDescriptor.cStillImageCommands.cStillImageHost.cConfigDescriptor.hPIMACodes.hStillImageCommands.hStillImageHost.hmakefiledefaultYESmakefileatmega12811
StillImageHost.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/Demos/OTG/TestApp/TestApp.aps b/Demos/OTG/TestApp/TestApp.aps
deleted file mode 100644
index 6939268c95..0000000000
--- a/Demos/OTG/TestApp/TestApp.aps
+++ /dev/null
@@ -1 +0,0 @@
-TestApp30-Sep-2008 14:18:1130-Sep-2008 14:18:23241030-Sep-2008 14:18:1144, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Demos\TestApp\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cTestApp.cTestEvents.cDescriptors.hTestApp.hTestEvents.hmakefiledefaultYESmakefileatmega12811
TestApp.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe
diff --git a/LUFA.pnproj b/LUFA.pnproj
index 7bca259d8c..68aebfbe81 100644
--- a/LUFA.pnproj
+++ b/LUFA.pnproj
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Projects/Magstripe/Magstripe.aps b/Projects/Magstripe/Magstripe.aps
deleted file mode 100644
index 86d011abb0..0000000000
--- a/Projects/Magstripe/Magstripe.aps
+++ /dev/null
@@ -1 +0,0 @@
-Magstripe30-Sep-2008 14:19:1430-Sep-2008 14:19:28241030-Sep-2008 14:19:1444, 14, 0, 589AVR GCCC:\Users\Dean\Documents\Electronics\Projects\WORK\MyUSBWORK\Projects\Magstripe\falseR00R01R02R03R04R05R06R07R08R09R10R11R12R13R14R15R16R17R18R19R20R21R22R23R24R25R26R27R28R29R30R31Auto000Descriptors.cMagstripe.cDescriptors.hMagstripe.hMagstripeHW.hmakefiledefaultYESmakefileatmega12811
Magstripe.elfdefault\1-Wall -gdwarf-2 -std=gnu99 -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enumsdefault1C:\WinAVR-20080512\bin\avr-gcc.exeC:\WinAVR-20080512\utils\bin\make.exe