diff --git a/libraries/EEPROM/EEPROM.cpp b/hardware/avr/libraries/EEPROM/EEPROM.cpp
similarity index 100%
rename from libraries/EEPROM/EEPROM.cpp
rename to hardware/avr/libraries/EEPROM/EEPROM.cpp
diff --git a/libraries/EEPROM/EEPROM.h b/hardware/avr/libraries/EEPROM/EEPROM.h
similarity index 100%
rename from libraries/EEPROM/EEPROM.h
rename to hardware/avr/libraries/EEPROM/EEPROM.h
diff --git a/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde b/hardware/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
similarity index 100%
rename from libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
rename to hardware/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
diff --git a/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde b/hardware/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
similarity index 100%
rename from libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
rename to hardware/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
diff --git a/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde b/hardware/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
similarity index 100%
rename from libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
rename to hardware/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
diff --git a/libraries/EEPROM/keywords.txt b/hardware/avr/libraries/EEPROM/keywords.txt
similarity index 100%
rename from libraries/EEPROM/keywords.txt
rename to hardware/avr/libraries/EEPROM/keywords.txt
diff --git a/libraries/Ethernet/Client.cpp b/hardware/avr/libraries/Ethernet/Client.cpp
similarity index 100%
rename from libraries/Ethernet/Client.cpp
rename to hardware/avr/libraries/Ethernet/Client.cpp
diff --git a/libraries/Ethernet/Client.h b/hardware/avr/libraries/Ethernet/Client.h
similarity index 100%
rename from libraries/Ethernet/Client.h
rename to hardware/avr/libraries/Ethernet/Client.h
diff --git a/libraries/Ethernet/Dhcp.cpp b/hardware/avr/libraries/Ethernet/Dhcp.cpp
similarity index 100%
rename from libraries/Ethernet/Dhcp.cpp
rename to hardware/avr/libraries/Ethernet/Dhcp.cpp
diff --git a/libraries/Ethernet/Dhcp.h b/hardware/avr/libraries/Ethernet/Dhcp.h
similarity index 100%
rename from libraries/Ethernet/Dhcp.h
rename to hardware/avr/libraries/Ethernet/Dhcp.h
diff --git a/libraries/Ethernet/Dns.cpp b/hardware/avr/libraries/Ethernet/Dns.cpp
similarity index 100%
rename from libraries/Ethernet/Dns.cpp
rename to hardware/avr/libraries/Ethernet/Dns.cpp
diff --git a/libraries/Ethernet/Dns.h b/hardware/avr/libraries/Ethernet/Dns.h
similarity index 100%
rename from libraries/Ethernet/Dns.h
rename to hardware/avr/libraries/Ethernet/Dns.h
diff --git a/libraries/Ethernet/Ethernet.cpp b/hardware/avr/libraries/Ethernet/Ethernet.cpp
similarity index 100%
rename from libraries/Ethernet/Ethernet.cpp
rename to hardware/avr/libraries/Ethernet/Ethernet.cpp
diff --git a/libraries/Ethernet/Ethernet.h b/hardware/avr/libraries/Ethernet/Ethernet.h
similarity index 100%
rename from libraries/Ethernet/Ethernet.h
rename to hardware/avr/libraries/Ethernet/Ethernet.h
diff --git a/libraries/Ethernet/IPAddress.cpp b/hardware/avr/libraries/Ethernet/IPAddress.cpp
similarity index 100%
rename from libraries/Ethernet/IPAddress.cpp
rename to hardware/avr/libraries/Ethernet/IPAddress.cpp
diff --git a/libraries/Ethernet/IPAddress.h b/hardware/avr/libraries/Ethernet/IPAddress.h
similarity index 100%
rename from libraries/Ethernet/IPAddress.h
rename to hardware/avr/libraries/Ethernet/IPAddress.h
diff --git a/libraries/Ethernet/Server.cpp b/hardware/avr/libraries/Ethernet/Server.cpp
similarity index 100%
rename from libraries/Ethernet/Server.cpp
rename to hardware/avr/libraries/Ethernet/Server.cpp
diff --git a/libraries/Ethernet/Server.h b/hardware/avr/libraries/Ethernet/Server.h
similarity index 100%
rename from libraries/Ethernet/Server.h
rename to hardware/avr/libraries/Ethernet/Server.h
diff --git a/libraries/Ethernet/Udp.cpp b/hardware/avr/libraries/Ethernet/Udp.cpp
similarity index 100%
rename from libraries/Ethernet/Udp.cpp
rename to hardware/avr/libraries/Ethernet/Udp.cpp
diff --git a/libraries/Ethernet/Udp.h b/hardware/avr/libraries/Ethernet/Udp.h
similarity index 100%
rename from libraries/Ethernet/Udp.h
rename to hardware/avr/libraries/Ethernet/Udp.h
diff --git a/libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.pde b/hardware/avr/libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.pde
similarity index 100%
rename from libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.pde
rename to hardware/avr/libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.pde
diff --git a/libraries/Ethernet/examples/ChatServer/ChatServer.pde b/hardware/avr/libraries/Ethernet/examples/ChatServer/ChatServer.pde
similarity index 100%
rename from libraries/Ethernet/examples/ChatServer/ChatServer.pde
rename to hardware/avr/libraries/Ethernet/examples/ChatServer/ChatServer.pde
diff --git a/libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.pde b/hardware/avr/libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.pde
similarity index 100%
rename from libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.pde
rename to hardware/avr/libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.pde
diff --git a/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.pde b/hardware/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.pde
similarity index 100%
rename from libraries/Ethernet/examples/DnsWebClient/DnsWebClient.pde
rename to hardware/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.pde
diff --git a/libraries/Ethernet/examples/PachubeClient/PachubeClient.pde b/hardware/avr/libraries/Ethernet/examples/PachubeClient/PachubeClient.pde
similarity index 100%
rename from libraries/Ethernet/examples/PachubeClient/PachubeClient.pde
rename to hardware/avr/libraries/Ethernet/examples/PachubeClient/PachubeClient.pde
diff --git a/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.pde b/hardware/avr/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.pde
similarity index 100%
rename from libraries/Ethernet/examples/PachubeClientString/PachubeClientString.pde
rename to hardware/avr/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.pde
diff --git a/libraries/Ethernet/examples/TelnetClient/TelnetClient.pde b/hardware/avr/libraries/Ethernet/examples/TelnetClient/TelnetClient.pde
similarity index 100%
rename from libraries/Ethernet/examples/TelnetClient/TelnetClient.pde
rename to hardware/avr/libraries/Ethernet/examples/TelnetClient/TelnetClient.pde
diff --git a/libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.pde b/hardware/avr/libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.pde
similarity index 100%
rename from libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.pde
rename to hardware/avr/libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.pde
diff --git a/libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.pde b/hardware/avr/libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.pde
similarity index 100%
rename from libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.pde
rename to hardware/avr/libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.pde
diff --git a/libraries/Ethernet/examples/WebClient/WebClient.pde b/hardware/avr/libraries/Ethernet/examples/WebClient/WebClient.pde
similarity index 100%
rename from libraries/Ethernet/examples/WebClient/WebClient.pde
rename to hardware/avr/libraries/Ethernet/examples/WebClient/WebClient.pde
diff --git a/libraries/Ethernet/examples/WebServer/WebServer.pde b/hardware/avr/libraries/Ethernet/examples/WebServer/WebServer.pde
similarity index 100%
rename from libraries/Ethernet/examples/WebServer/WebServer.pde
rename to hardware/avr/libraries/Ethernet/examples/WebServer/WebServer.pde
diff --git a/libraries/Ethernet/keywords.txt b/hardware/avr/libraries/Ethernet/keywords.txt
similarity index 100%
rename from libraries/Ethernet/keywords.txt
rename to hardware/avr/libraries/Ethernet/keywords.txt
diff --git a/libraries/Ethernet/util.h b/hardware/avr/libraries/Ethernet/util.h
similarity index 100%
rename from libraries/Ethernet/util.h
rename to hardware/avr/libraries/Ethernet/util.h
diff --git a/libraries/Ethernet/utility/socket.cpp b/hardware/avr/libraries/Ethernet/utility/socket.cpp
similarity index 100%
rename from libraries/Ethernet/utility/socket.cpp
rename to hardware/avr/libraries/Ethernet/utility/socket.cpp
diff --git a/libraries/Ethernet/utility/socket.h b/hardware/avr/libraries/Ethernet/utility/socket.h
similarity index 100%
rename from libraries/Ethernet/utility/socket.h
rename to hardware/avr/libraries/Ethernet/utility/socket.h
diff --git a/libraries/Ethernet/utility/w5100.cpp b/hardware/avr/libraries/Ethernet/utility/w5100.cpp
similarity index 100%
rename from libraries/Ethernet/utility/w5100.cpp
rename to hardware/avr/libraries/Ethernet/utility/w5100.cpp
diff --git a/libraries/Ethernet/utility/w5100.h b/hardware/avr/libraries/Ethernet/utility/w5100.h
similarity index 100%
rename from libraries/Ethernet/utility/w5100.h
rename to hardware/avr/libraries/Ethernet/utility/w5100.h
diff --git a/libraries/Firmata/Boards.h b/hardware/avr/libraries/Firmata/Boards.h
similarity index 100%
rename from libraries/Firmata/Boards.h
rename to hardware/avr/libraries/Firmata/Boards.h
diff --git a/libraries/Firmata/Firmata.cpp b/hardware/avr/libraries/Firmata/Firmata.cpp
similarity index 100%
rename from libraries/Firmata/Firmata.cpp
rename to hardware/avr/libraries/Firmata/Firmata.cpp
diff --git a/libraries/Firmata/Firmata.h b/hardware/avr/libraries/Firmata/Firmata.h
similarity index 100%
rename from libraries/Firmata/Firmata.h
rename to hardware/avr/libraries/Firmata/Firmata.h
diff --git a/libraries/Firmata/LICENSE.txt b/hardware/avr/libraries/Firmata/LICENSE.txt
similarity index 100%
rename from libraries/Firmata/LICENSE.txt
rename to hardware/avr/libraries/Firmata/LICENSE.txt
diff --git a/libraries/Firmata/TODO.txt b/hardware/avr/libraries/Firmata/TODO.txt
similarity index 100%
rename from libraries/Firmata/TODO.txt
rename to hardware/avr/libraries/Firmata/TODO.txt
diff --git a/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde b/hardware/avr/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde
similarity index 100%
rename from libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde
rename to hardware/avr/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde
diff --git a/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde b/hardware/avr/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde
similarity index 100%
rename from libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde
rename to hardware/avr/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde
diff --git a/libraries/Firmata/examples/AnalogFirmata/Makefile b/hardware/avr/libraries/Firmata/examples/AnalogFirmata/Makefile
similarity index 100%
rename from libraries/Firmata/examples/AnalogFirmata/Makefile
rename to hardware/avr/libraries/Firmata/examples/AnalogFirmata/Makefile
diff --git a/libraries/Firmata/examples/EchoString/EchoString.pde b/hardware/avr/libraries/Firmata/examples/EchoString/EchoString.pde
similarity index 100%
rename from libraries/Firmata/examples/EchoString/EchoString.pde
rename to hardware/avr/libraries/Firmata/examples/EchoString/EchoString.pde
diff --git a/libraries/Firmata/examples/EchoString/Makefile b/hardware/avr/libraries/Firmata/examples/EchoString/Makefile
similarity index 100%
rename from libraries/Firmata/examples/EchoString/Makefile
rename to hardware/avr/libraries/Firmata/examples/EchoString/Makefile
diff --git a/libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde b/hardware/avr/libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde
similarity index 100%
rename from libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde
rename to hardware/avr/libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde
diff --git a/libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt b/hardware/avr/libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt
similarity index 100%
rename from libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt
rename to hardware/avr/libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt
diff --git a/libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.pde b/hardware/avr/libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.pde
similarity index 100%
rename from libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.pde
rename to hardware/avr/libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.pde
diff --git a/libraries/Firmata/examples/ServoFirmata/Makefile b/hardware/avr/libraries/Firmata/examples/ServoFirmata/Makefile
similarity index 100%
rename from libraries/Firmata/examples/ServoFirmata/Makefile
rename to hardware/avr/libraries/Firmata/examples/ServoFirmata/Makefile
diff --git a/libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde b/hardware/avr/libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde
similarity index 100%
rename from libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde
rename to hardware/avr/libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde
diff --git a/libraries/Firmata/examples/SimpleAnalogFirmata/Makefile b/hardware/avr/libraries/Firmata/examples/SimpleAnalogFirmata/Makefile
similarity index 100%
rename from libraries/Firmata/examples/SimpleAnalogFirmata/Makefile
rename to hardware/avr/libraries/Firmata/examples/SimpleAnalogFirmata/Makefile
diff --git a/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde b/hardware/avr/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde
similarity index 100%
rename from libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde
rename to hardware/avr/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde
diff --git a/libraries/Firmata/examples/SimpleDigitalFirmata/Makefile b/hardware/avr/libraries/Firmata/examples/SimpleDigitalFirmata/Makefile
similarity index 100%
rename from libraries/Firmata/examples/SimpleDigitalFirmata/Makefile
rename to hardware/avr/libraries/Firmata/examples/SimpleDigitalFirmata/Makefile
diff --git a/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde b/hardware/avr/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde
similarity index 100%
rename from libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde
rename to hardware/avr/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde
diff --git a/libraries/Firmata/examples/StandardFirmata/LICENSE.txt b/hardware/avr/libraries/Firmata/examples/StandardFirmata/LICENSE.txt
similarity index 100%
rename from libraries/Firmata/examples/StandardFirmata/LICENSE.txt
rename to hardware/avr/libraries/Firmata/examples/StandardFirmata/LICENSE.txt
diff --git a/libraries/Firmata/examples/StandardFirmata/Makefile b/hardware/avr/libraries/Firmata/examples/StandardFirmata/Makefile
similarity index 100%
rename from libraries/Firmata/examples/StandardFirmata/Makefile
rename to hardware/avr/libraries/Firmata/examples/StandardFirmata/Makefile
diff --git a/libraries/Firmata/examples/StandardFirmata/StandardFirmata.pde b/hardware/avr/libraries/Firmata/examples/StandardFirmata/StandardFirmata.pde
similarity index 100%
rename from libraries/Firmata/examples/StandardFirmata/StandardFirmata.pde
rename to hardware/avr/libraries/Firmata/examples/StandardFirmata/StandardFirmata.pde
diff --git a/libraries/Firmata/examples/StandardFirmata_2_2_forUNO_0_3/StandardFirmata_2_2_forUNO_0_3.pde b/hardware/avr/libraries/Firmata/examples/StandardFirmata_2_2_forUNO_0_3/StandardFirmata_2_2_forUNO_0_3.pde
similarity index 100%
rename from libraries/Firmata/examples/StandardFirmata_2_2_forUNO_0_3/StandardFirmata_2_2_forUNO_0_3.pde
rename to hardware/avr/libraries/Firmata/examples/StandardFirmata_2_2_forUNO_0_3/StandardFirmata_2_2_forUNO_0_3.pde
diff --git a/libraries/Firmata/keywords.txt b/hardware/avr/libraries/Firmata/keywords.txt
similarity index 100%
rename from libraries/Firmata/keywords.txt
rename to hardware/avr/libraries/Firmata/keywords.txt
diff --git a/libraries/SD/File.cpp b/hardware/avr/libraries/SD/File.cpp
similarity index 100%
rename from libraries/SD/File.cpp
rename to hardware/avr/libraries/SD/File.cpp
diff --git a/libraries/SD/README.txt b/hardware/avr/libraries/SD/README.txt
similarity index 100%
rename from libraries/SD/README.txt
rename to hardware/avr/libraries/SD/README.txt
diff --git a/libraries/SD/SD.cpp b/hardware/avr/libraries/SD/SD.cpp
similarity index 100%
rename from libraries/SD/SD.cpp
rename to hardware/avr/libraries/SD/SD.cpp
diff --git a/libraries/SD/SD.h b/hardware/avr/libraries/SD/SD.h
similarity index 100%
rename from libraries/SD/SD.h
rename to hardware/avr/libraries/SD/SD.h
diff --git a/libraries/SD/examples/CardInfo/CardInfo.pde b/hardware/avr/libraries/SD/examples/CardInfo/CardInfo.pde
similarity index 100%
rename from libraries/SD/examples/CardInfo/CardInfo.pde
rename to hardware/avr/libraries/SD/examples/CardInfo/CardInfo.pde
diff --git a/libraries/SD/examples/Datalogger/Datalogger.pde b/hardware/avr/libraries/SD/examples/Datalogger/Datalogger.pde
similarity index 100%
rename from libraries/SD/examples/Datalogger/Datalogger.pde
rename to hardware/avr/libraries/SD/examples/Datalogger/Datalogger.pde
diff --git a/libraries/SD/examples/DumpFile/DumpFile.pde b/hardware/avr/libraries/SD/examples/DumpFile/DumpFile.pde
similarity index 100%
rename from libraries/SD/examples/DumpFile/DumpFile.pde
rename to hardware/avr/libraries/SD/examples/DumpFile/DumpFile.pde
diff --git a/libraries/SD/examples/Files/Files.pde b/hardware/avr/libraries/SD/examples/Files/Files.pde
similarity index 100%
rename from libraries/SD/examples/Files/Files.pde
rename to hardware/avr/libraries/SD/examples/Files/Files.pde
diff --git a/libraries/SD/examples/ReadWrite/ReadWrite.pde b/hardware/avr/libraries/SD/examples/ReadWrite/ReadWrite.pde
similarity index 100%
rename from libraries/SD/examples/ReadWrite/ReadWrite.pde
rename to hardware/avr/libraries/SD/examples/ReadWrite/ReadWrite.pde
diff --git a/libraries/SD/examples/listfiles/listfiles.pde b/hardware/avr/libraries/SD/examples/listfiles/listfiles.pde
similarity index 100%
rename from libraries/SD/examples/listfiles/listfiles.pde
rename to hardware/avr/libraries/SD/examples/listfiles/listfiles.pde
diff --git a/libraries/SD/keywords.txt b/hardware/avr/libraries/SD/keywords.txt
similarity index 100%
rename from libraries/SD/keywords.txt
rename to hardware/avr/libraries/SD/keywords.txt
diff --git a/libraries/SD/utility/FatStructs.h b/hardware/avr/libraries/SD/utility/FatStructs.h
similarity index 100%
rename from libraries/SD/utility/FatStructs.h
rename to hardware/avr/libraries/SD/utility/FatStructs.h
diff --git a/libraries/SD/utility/Sd2Card.cpp b/hardware/avr/libraries/SD/utility/Sd2Card.cpp
similarity index 100%
rename from libraries/SD/utility/Sd2Card.cpp
rename to hardware/avr/libraries/SD/utility/Sd2Card.cpp
diff --git a/libraries/SD/utility/Sd2Card.h b/hardware/avr/libraries/SD/utility/Sd2Card.h
similarity index 100%
rename from libraries/SD/utility/Sd2Card.h
rename to hardware/avr/libraries/SD/utility/Sd2Card.h
diff --git a/libraries/SD/utility/Sd2PinMap.h b/hardware/avr/libraries/SD/utility/Sd2PinMap.h
similarity index 100%
rename from libraries/SD/utility/Sd2PinMap.h
rename to hardware/avr/libraries/SD/utility/Sd2PinMap.h
diff --git a/libraries/SD/utility/SdFat.h b/hardware/avr/libraries/SD/utility/SdFat.h
similarity index 100%
rename from libraries/SD/utility/SdFat.h
rename to hardware/avr/libraries/SD/utility/SdFat.h
diff --git a/libraries/SD/utility/SdFatUtil.h b/hardware/avr/libraries/SD/utility/SdFatUtil.h
similarity index 100%
rename from libraries/SD/utility/SdFatUtil.h
rename to hardware/avr/libraries/SD/utility/SdFatUtil.h
diff --git a/libraries/SD/utility/SdFatmainpage.h b/hardware/avr/libraries/SD/utility/SdFatmainpage.h
similarity index 100%
rename from libraries/SD/utility/SdFatmainpage.h
rename to hardware/avr/libraries/SD/utility/SdFatmainpage.h
diff --git a/libraries/SD/utility/SdFile.cpp b/hardware/avr/libraries/SD/utility/SdFile.cpp
similarity index 100%
rename from libraries/SD/utility/SdFile.cpp
rename to hardware/avr/libraries/SD/utility/SdFile.cpp
diff --git a/libraries/SD/utility/SdInfo.h b/hardware/avr/libraries/SD/utility/SdInfo.h
similarity index 100%
rename from libraries/SD/utility/SdInfo.h
rename to hardware/avr/libraries/SD/utility/SdInfo.h
diff --git a/libraries/SD/utility/SdVolume.cpp b/hardware/avr/libraries/SD/utility/SdVolume.cpp
similarity index 100%
rename from libraries/SD/utility/SdVolume.cpp
rename to hardware/avr/libraries/SD/utility/SdVolume.cpp
diff --git a/libraries/SPI/SPI.cpp b/hardware/avr/libraries/SPI/SPI.cpp
similarity index 100%
rename from libraries/SPI/SPI.cpp
rename to hardware/avr/libraries/SPI/SPI.cpp
diff --git a/libraries/SPI/SPI.h b/hardware/avr/libraries/SPI/SPI.h
similarity index 100%
rename from libraries/SPI/SPI.h
rename to hardware/avr/libraries/SPI/SPI.h
diff --git a/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde b/hardware/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde
similarity index 100%
rename from libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde
rename to hardware/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde
diff --git a/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.pde b/hardware/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.pde
similarity index 100%
rename from libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.pde
rename to hardware/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.pde
diff --git a/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde b/hardware/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde
similarity index 100%
rename from libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde
rename to hardware/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde
diff --git a/libraries/SPI/keywords.txt b/hardware/avr/libraries/SPI/keywords.txt
similarity index 100%
rename from libraries/SPI/keywords.txt
rename to hardware/avr/libraries/SPI/keywords.txt
diff --git a/libraries/Servo/Servo.cpp b/hardware/avr/libraries/Servo/Servo.cpp
similarity index 100%
rename from libraries/Servo/Servo.cpp
rename to hardware/avr/libraries/Servo/Servo.cpp
diff --git a/libraries/Servo/Servo.h b/hardware/avr/libraries/Servo/Servo.h
similarity index 100%
rename from libraries/Servo/Servo.h
rename to hardware/avr/libraries/Servo/Servo.h
diff --git a/libraries/Servo/examples/Knob/Knob.pde b/hardware/avr/libraries/Servo/examples/Knob/Knob.pde
similarity index 100%
rename from libraries/Servo/examples/Knob/Knob.pde
rename to hardware/avr/libraries/Servo/examples/Knob/Knob.pde
diff --git a/libraries/Servo/examples/Sweep/Sweep.pde b/hardware/avr/libraries/Servo/examples/Sweep/Sweep.pde
similarity index 100%
rename from libraries/Servo/examples/Sweep/Sweep.pde
rename to hardware/avr/libraries/Servo/examples/Sweep/Sweep.pde
diff --git a/libraries/Servo/keywords.txt b/hardware/avr/libraries/Servo/keywords.txt
similarity index 100%
rename from libraries/Servo/keywords.txt
rename to hardware/avr/libraries/Servo/keywords.txt
diff --git a/libraries/SoftwareSerial/SoftwareSerial.cpp b/hardware/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
similarity index 100%
rename from libraries/SoftwareSerial/SoftwareSerial.cpp
rename to hardware/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
diff --git a/libraries/SoftwareSerial/SoftwareSerial.h b/hardware/avr/libraries/SoftwareSerial/SoftwareSerial.h
similarity index 100%
rename from libraries/SoftwareSerial/SoftwareSerial.h
rename to hardware/avr/libraries/SoftwareSerial/SoftwareSerial.h
diff --git a/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino b/hardware/avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
similarity index 100%
rename from libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
rename to hardware/avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
diff --git a/libraries/SoftwareSerial/examples/TwoPortRXExample/TwoPortRXExample.pde b/hardware/avr/libraries/SoftwareSerial/examples/TwoPortRXExample/TwoPortRXExample.pde
similarity index 100%
rename from libraries/SoftwareSerial/examples/TwoPortRXExample/TwoPortRXExample.pde
rename to hardware/avr/libraries/SoftwareSerial/examples/TwoPortRXExample/TwoPortRXExample.pde
diff --git a/libraries/SoftwareSerial/icrmacros.h b/hardware/avr/libraries/SoftwareSerial/icrmacros.h
similarity index 100%
rename from libraries/SoftwareSerial/icrmacros.h
rename to hardware/avr/libraries/SoftwareSerial/icrmacros.h
diff --git a/libraries/SoftwareSerial/keywords.txt b/hardware/avr/libraries/SoftwareSerial/keywords.txt
similarity index 100%
rename from libraries/SoftwareSerial/keywords.txt
rename to hardware/avr/libraries/SoftwareSerial/keywords.txt
diff --git a/libraries/Wire/Wire.cpp b/hardware/avr/libraries/Wire/Wire.cpp
similarity index 100%
rename from libraries/Wire/Wire.cpp
rename to hardware/avr/libraries/Wire/Wire.cpp
diff --git a/libraries/Wire/Wire.h b/hardware/avr/libraries/Wire/Wire.h
similarity index 100%
rename from libraries/Wire/Wire.h
rename to hardware/avr/libraries/Wire/Wire.h
diff --git a/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde b/hardware/avr/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
similarity index 100%
rename from libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
rename to hardware/avr/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
diff --git a/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde b/hardware/avr/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
similarity index 100%
rename from libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
rename to hardware/avr/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
diff --git a/libraries/Wire/examples/master_reader/master_reader.pde b/hardware/avr/libraries/Wire/examples/master_reader/master_reader.pde
similarity index 100%
rename from libraries/Wire/examples/master_reader/master_reader.pde
rename to hardware/avr/libraries/Wire/examples/master_reader/master_reader.pde
diff --git a/libraries/Wire/examples/master_writer/master_writer.pde b/hardware/avr/libraries/Wire/examples/master_writer/master_writer.pde
similarity index 100%
rename from libraries/Wire/examples/master_writer/master_writer.pde
rename to hardware/avr/libraries/Wire/examples/master_writer/master_writer.pde
diff --git a/libraries/Wire/examples/slave_receiver/slave_receiver.pde b/hardware/avr/libraries/Wire/examples/slave_receiver/slave_receiver.pde
similarity index 100%
rename from libraries/Wire/examples/slave_receiver/slave_receiver.pde
rename to hardware/avr/libraries/Wire/examples/slave_receiver/slave_receiver.pde
diff --git a/libraries/Wire/examples/slave_sender/slave_sender.pde b/hardware/avr/libraries/Wire/examples/slave_sender/slave_sender.pde
similarity index 100%
rename from libraries/Wire/examples/slave_sender/slave_sender.pde
rename to hardware/avr/libraries/Wire/examples/slave_sender/slave_sender.pde
diff --git a/libraries/Wire/keywords.txt b/hardware/avr/libraries/Wire/keywords.txt
similarity index 100%
rename from libraries/Wire/keywords.txt
rename to hardware/avr/libraries/Wire/keywords.txt
diff --git a/libraries/Wire/utility/twi.c b/hardware/avr/libraries/Wire/utility/twi.c
similarity index 100%
rename from libraries/Wire/utility/twi.c
rename to hardware/avr/libraries/Wire/utility/twi.c
diff --git a/libraries/Wire/utility/twi.h b/hardware/avr/libraries/Wire/utility/twi.h
similarity index 100%
rename from libraries/Wire/utility/twi.h
rename to hardware/avr/libraries/Wire/utility/twi.h