diff --git a/hardware/libraries/EEPROM/EEPROM.cpp b/hardware/arduino/libraries/EEPROM/EEPROM.cpp
similarity index 100%
rename from hardware/libraries/EEPROM/EEPROM.cpp
rename to hardware/arduino/libraries/EEPROM/EEPROM.cpp
diff --git a/hardware/libraries/EEPROM/EEPROM.h b/hardware/arduino/libraries/EEPROM/EEPROM.h
similarity index 100%
rename from hardware/libraries/EEPROM/EEPROM.h
rename to hardware/arduino/libraries/EEPROM/EEPROM.h
diff --git a/hardware/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde b/hardware/arduino/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
similarity index 100%
rename from hardware/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
rename to hardware/arduino/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
diff --git a/hardware/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde b/hardware/arduino/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
similarity index 100%
rename from hardware/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
rename to hardware/arduino/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
diff --git a/hardware/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde b/hardware/arduino/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
similarity index 100%
rename from hardware/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
rename to hardware/arduino/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
diff --git a/hardware/libraries/EEPROM/keywords.txt b/hardware/arduino/libraries/EEPROM/keywords.txt
similarity index 100%
rename from hardware/libraries/EEPROM/keywords.txt
rename to hardware/arduino/libraries/EEPROM/keywords.txt
diff --git a/hardware/libraries/Ethernet/Client.cpp b/hardware/arduino/libraries/Ethernet/Client.cpp
similarity index 100%
rename from hardware/libraries/Ethernet/Client.cpp
rename to hardware/arduino/libraries/Ethernet/Client.cpp
diff --git a/hardware/libraries/Ethernet/Client.h b/hardware/arduino/libraries/Ethernet/Client.h
similarity index 100%
rename from hardware/libraries/Ethernet/Client.h
rename to hardware/arduino/libraries/Ethernet/Client.h
diff --git a/hardware/libraries/Ethernet/Ethernet.cpp b/hardware/arduino/libraries/Ethernet/Ethernet.cpp
similarity index 100%
rename from hardware/libraries/Ethernet/Ethernet.cpp
rename to hardware/arduino/libraries/Ethernet/Ethernet.cpp
diff --git a/hardware/libraries/Ethernet/Ethernet.h b/hardware/arduino/libraries/Ethernet/Ethernet.h
similarity index 100%
rename from hardware/libraries/Ethernet/Ethernet.h
rename to hardware/arduino/libraries/Ethernet/Ethernet.h
diff --git a/hardware/libraries/Ethernet/Server.cpp b/hardware/arduino/libraries/Ethernet/Server.cpp
similarity index 100%
rename from hardware/libraries/Ethernet/Server.cpp
rename to hardware/arduino/libraries/Ethernet/Server.cpp
diff --git a/hardware/libraries/Ethernet/Server.h b/hardware/arduino/libraries/Ethernet/Server.h
similarity index 100%
rename from hardware/libraries/Ethernet/Server.h
rename to hardware/arduino/libraries/Ethernet/Server.h
diff --git a/hardware/libraries/Ethernet/examples/ChatServer/ChatServer.pde b/hardware/arduino/libraries/Ethernet/examples/ChatServer/ChatServer.pde
similarity index 100%
rename from hardware/libraries/Ethernet/examples/ChatServer/ChatServer.pde
rename to hardware/arduino/libraries/Ethernet/examples/ChatServer/ChatServer.pde
diff --git a/hardware/libraries/Ethernet/examples/WebClient/WebClient.pde b/hardware/arduino/libraries/Ethernet/examples/WebClient/WebClient.pde
similarity index 100%
rename from hardware/libraries/Ethernet/examples/WebClient/WebClient.pde
rename to hardware/arduino/libraries/Ethernet/examples/WebClient/WebClient.pde
diff --git a/hardware/libraries/Ethernet/examples/WebServer/WebServer.pde b/hardware/arduino/libraries/Ethernet/examples/WebServer/WebServer.pde
similarity index 100%
rename from hardware/libraries/Ethernet/examples/WebServer/WebServer.pde
rename to hardware/arduino/libraries/Ethernet/examples/WebServer/WebServer.pde
diff --git a/hardware/libraries/Ethernet/keywords.txt b/hardware/arduino/libraries/Ethernet/keywords.txt
similarity index 100%
rename from hardware/libraries/Ethernet/keywords.txt
rename to hardware/arduino/libraries/Ethernet/keywords.txt
diff --git a/hardware/libraries/Ethernet/utility/socket.c b/hardware/arduino/libraries/Ethernet/utility/socket.c
similarity index 100%
rename from hardware/libraries/Ethernet/utility/socket.c
rename to hardware/arduino/libraries/Ethernet/utility/socket.c
diff --git a/hardware/libraries/Ethernet/utility/socket.h b/hardware/arduino/libraries/Ethernet/utility/socket.h
similarity index 100%
rename from hardware/libraries/Ethernet/utility/socket.h
rename to hardware/arduino/libraries/Ethernet/utility/socket.h
diff --git a/hardware/libraries/Ethernet/utility/spi.h b/hardware/arduino/libraries/Ethernet/utility/spi.h
similarity index 100%
rename from hardware/libraries/Ethernet/utility/spi.h
rename to hardware/arduino/libraries/Ethernet/utility/spi.h
diff --git a/hardware/libraries/Ethernet/utility/types.h b/hardware/arduino/libraries/Ethernet/utility/types.h
similarity index 100%
rename from hardware/libraries/Ethernet/utility/types.h
rename to hardware/arduino/libraries/Ethernet/utility/types.h
diff --git a/hardware/libraries/Ethernet/utility/w5100.c b/hardware/arduino/libraries/Ethernet/utility/w5100.c
similarity index 100%
rename from hardware/libraries/Ethernet/utility/w5100.c
rename to hardware/arduino/libraries/Ethernet/utility/w5100.c
diff --git a/hardware/libraries/Ethernet/utility/w5100.h b/hardware/arduino/libraries/Ethernet/utility/w5100.h
similarity index 100%
rename from hardware/libraries/Ethernet/utility/w5100.h
rename to hardware/arduino/libraries/Ethernet/utility/w5100.h
diff --git a/hardware/libraries/Firmata/Firmata.cpp b/hardware/arduino/libraries/Firmata/Firmata.cpp
similarity index 100%
rename from hardware/libraries/Firmata/Firmata.cpp
rename to hardware/arduino/libraries/Firmata/Firmata.cpp
diff --git a/hardware/libraries/Firmata/Firmata.h b/hardware/arduino/libraries/Firmata/Firmata.h
similarity index 100%
rename from hardware/libraries/Firmata/Firmata.h
rename to hardware/arduino/libraries/Firmata/Firmata.h
diff --git a/hardware/libraries/Firmata/LICENSE.txt b/hardware/arduino/libraries/Firmata/LICENSE.txt
similarity index 100%
rename from hardware/libraries/Firmata/LICENSE.txt
rename to hardware/arduino/libraries/Firmata/LICENSE.txt
diff --git a/hardware/libraries/Firmata/TODO.txt b/hardware/arduino/libraries/Firmata/TODO.txt
similarity index 100%
rename from hardware/libraries/Firmata/TODO.txt
rename to hardware/arduino/libraries/Firmata/TODO.txt
diff --git a/hardware/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde b/hardware/arduino/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde
similarity index 100%
rename from hardware/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde
rename to hardware/arduino/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde
diff --git a/hardware/libraries/Firmata/examples/AnalogFirmata/Makefile b/hardware/arduino/libraries/Firmata/examples/AnalogFirmata/Makefile
similarity index 100%
rename from hardware/libraries/Firmata/examples/AnalogFirmata/Makefile
rename to hardware/arduino/libraries/Firmata/examples/AnalogFirmata/Makefile
diff --git a/hardware/libraries/Firmata/examples/EchoString/EchoString.pde b/hardware/arduino/libraries/Firmata/examples/EchoString/EchoString.pde
similarity index 100%
rename from hardware/libraries/Firmata/examples/EchoString/EchoString.pde
rename to hardware/arduino/libraries/Firmata/examples/EchoString/EchoString.pde
diff --git a/hardware/libraries/Firmata/examples/EchoString/Makefile b/hardware/arduino/libraries/Firmata/examples/EchoString/Makefile
similarity index 100%
rename from hardware/libraries/Firmata/examples/EchoString/Makefile
rename to hardware/arduino/libraries/Firmata/examples/EchoString/Makefile
diff --git a/hardware/libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde b/hardware/arduino/libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde
similarity index 100%
rename from hardware/libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde
rename to hardware/arduino/libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde
diff --git a/hardware/libraries/Firmata/examples/ServoFirmata/Makefile b/hardware/arduino/libraries/Firmata/examples/ServoFirmata/Makefile
similarity index 100%
rename from hardware/libraries/Firmata/examples/ServoFirmata/Makefile
rename to hardware/arduino/libraries/Firmata/examples/ServoFirmata/Makefile
diff --git a/hardware/libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde b/hardware/arduino/libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde
similarity index 100%
rename from hardware/libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde
rename to hardware/arduino/libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde
diff --git a/hardware/libraries/Firmata/examples/SimpleAnalogFirmata/Makefile b/hardware/arduino/libraries/Firmata/examples/SimpleAnalogFirmata/Makefile
similarity index 100%
rename from hardware/libraries/Firmata/examples/SimpleAnalogFirmata/Makefile
rename to hardware/arduino/libraries/Firmata/examples/SimpleAnalogFirmata/Makefile
diff --git a/hardware/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde b/hardware/arduino/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde
similarity index 100%
rename from hardware/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde
rename to hardware/arduino/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde
diff --git a/hardware/libraries/Firmata/examples/SimpleDigitalFirmata/Makefile b/hardware/arduino/libraries/Firmata/examples/SimpleDigitalFirmata/Makefile
similarity index 100%
rename from hardware/libraries/Firmata/examples/SimpleDigitalFirmata/Makefile
rename to hardware/arduino/libraries/Firmata/examples/SimpleDigitalFirmata/Makefile
diff --git a/hardware/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde b/hardware/arduino/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde
similarity index 100%
rename from hardware/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde
rename to hardware/arduino/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde
diff --git a/hardware/libraries/Firmata/examples/StandardFirmata/LICENSE.txt b/hardware/arduino/libraries/Firmata/examples/StandardFirmata/LICENSE.txt
similarity index 100%
rename from hardware/libraries/Firmata/examples/StandardFirmata/LICENSE.txt
rename to hardware/arduino/libraries/Firmata/examples/StandardFirmata/LICENSE.txt
diff --git a/hardware/libraries/Firmata/examples/StandardFirmata/Makefile b/hardware/arduino/libraries/Firmata/examples/StandardFirmata/Makefile
similarity index 100%
rename from hardware/libraries/Firmata/examples/StandardFirmata/Makefile
rename to hardware/arduino/libraries/Firmata/examples/StandardFirmata/Makefile
diff --git a/hardware/libraries/Firmata/examples/StandardFirmata/StandardFirmata.pde b/hardware/arduino/libraries/Firmata/examples/StandardFirmata/StandardFirmata.pde
similarity index 100%
rename from hardware/libraries/Firmata/examples/StandardFirmata/StandardFirmata.pde
rename to hardware/arduino/libraries/Firmata/examples/StandardFirmata/StandardFirmata.pde
diff --git a/hardware/libraries/Firmata/keywords.txt b/hardware/arduino/libraries/Firmata/keywords.txt
similarity index 100%
rename from hardware/libraries/Firmata/keywords.txt
rename to hardware/arduino/libraries/Firmata/keywords.txt
diff --git a/hardware/libraries/LiquidCrystal/LiquidCrystal.cpp b/hardware/arduino/libraries/LiquidCrystal/LiquidCrystal.cpp
similarity index 100%
rename from hardware/libraries/LiquidCrystal/LiquidCrystal.cpp
rename to hardware/arduino/libraries/LiquidCrystal/LiquidCrystal.cpp
diff --git a/hardware/libraries/LiquidCrystal/LiquidCrystal.h b/hardware/arduino/libraries/LiquidCrystal/LiquidCrystal.h
similarity index 100%
rename from hardware/libraries/LiquidCrystal/LiquidCrystal.h
rename to hardware/arduino/libraries/LiquidCrystal/LiquidCrystal.h
diff --git a/hardware/libraries/LiquidCrystal/examples/Autoscroll/Autoscroll.pde b/hardware/arduino/libraries/LiquidCrystal/examples/Autoscroll/Autoscroll.pde
similarity index 100%
rename from hardware/libraries/LiquidCrystal/examples/Autoscroll/Autoscroll.pde
rename to hardware/arduino/libraries/LiquidCrystal/examples/Autoscroll/Autoscroll.pde
diff --git a/hardware/libraries/LiquidCrystal/examples/Blink/Blink.pde b/hardware/arduino/libraries/LiquidCrystal/examples/Blink/Blink.pde
similarity index 100%
rename from hardware/libraries/LiquidCrystal/examples/Blink/Blink.pde
rename to hardware/arduino/libraries/LiquidCrystal/examples/Blink/Blink.pde
diff --git a/hardware/libraries/LiquidCrystal/examples/Cursor/Cursor.pde b/hardware/arduino/libraries/LiquidCrystal/examples/Cursor/Cursor.pde
similarity index 100%
rename from hardware/libraries/LiquidCrystal/examples/Cursor/Cursor.pde
rename to hardware/arduino/libraries/LiquidCrystal/examples/Cursor/Cursor.pde
diff --git a/hardware/libraries/LiquidCrystal/examples/Display/Display.pde b/hardware/arduino/libraries/LiquidCrystal/examples/Display/Display.pde
similarity index 100%
rename from hardware/libraries/LiquidCrystal/examples/Display/Display.pde
rename to hardware/arduino/libraries/LiquidCrystal/examples/Display/Display.pde
diff --git a/hardware/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde b/hardware/arduino/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde
similarity index 100%
rename from hardware/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde
rename to hardware/arduino/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.pde
diff --git a/hardware/libraries/LiquidCrystal/examples/Scroll/Scroll.pde b/hardware/arduino/libraries/LiquidCrystal/examples/Scroll/Scroll.pde
similarity index 100%
rename from hardware/libraries/LiquidCrystal/examples/Scroll/Scroll.pde
rename to hardware/arduino/libraries/LiquidCrystal/examples/Scroll/Scroll.pde
diff --git a/hardware/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde b/hardware/arduino/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde
similarity index 100%
rename from hardware/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde
rename to hardware/arduino/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.pde
diff --git a/hardware/libraries/LiquidCrystal/examples/TextDirection/TextDirection.pde b/hardware/arduino/libraries/LiquidCrystal/examples/TextDirection/TextDirection.pde
similarity index 100%
rename from hardware/libraries/LiquidCrystal/examples/TextDirection/TextDirection.pde
rename to hardware/arduino/libraries/LiquidCrystal/examples/TextDirection/TextDirection.pde
diff --git a/hardware/libraries/LiquidCrystal/examples/setCursor/setCursor.pde b/hardware/arduino/libraries/LiquidCrystal/examples/setCursor/setCursor.pde
similarity index 100%
rename from hardware/libraries/LiquidCrystal/examples/setCursor/setCursor.pde
rename to hardware/arduino/libraries/LiquidCrystal/examples/setCursor/setCursor.pde
diff --git a/hardware/libraries/LiquidCrystal/keywords.txt b/hardware/arduino/libraries/LiquidCrystal/keywords.txt
similarity index 100%
rename from hardware/libraries/LiquidCrystal/keywords.txt
rename to hardware/arduino/libraries/LiquidCrystal/keywords.txt
diff --git a/hardware/libraries/Matrix/Matrix.cpp b/hardware/arduino/libraries/Matrix/Matrix.cpp
similarity index 100%
rename from hardware/libraries/Matrix/Matrix.cpp
rename to hardware/arduino/libraries/Matrix/Matrix.cpp
diff --git a/hardware/libraries/Matrix/Matrix.h b/hardware/arduino/libraries/Matrix/Matrix.h
similarity index 100%
rename from hardware/libraries/Matrix/Matrix.h
rename to hardware/arduino/libraries/Matrix/Matrix.h
diff --git a/hardware/libraries/Matrix/examples/hello_matrix/hello_matrix.pde b/hardware/arduino/libraries/Matrix/examples/hello_matrix/hello_matrix.pde
similarity index 100%
rename from hardware/libraries/Matrix/examples/hello_matrix/hello_matrix.pde
rename to hardware/arduino/libraries/Matrix/examples/hello_matrix/hello_matrix.pde
diff --git a/hardware/libraries/Matrix/examples/sprite_animation/sprite_animation.pde b/hardware/arduino/libraries/Matrix/examples/sprite_animation/sprite_animation.pde
similarity index 100%
rename from hardware/libraries/Matrix/examples/sprite_animation/sprite_animation.pde
rename to hardware/arduino/libraries/Matrix/examples/sprite_animation/sprite_animation.pde
diff --git a/hardware/libraries/Matrix/keywords.txt b/hardware/arduino/libraries/Matrix/keywords.txt
similarity index 100%
rename from hardware/libraries/Matrix/keywords.txt
rename to hardware/arduino/libraries/Matrix/keywords.txt
diff --git a/hardware/libraries/Servo/Servo.cpp b/hardware/arduino/libraries/Servo/Servo.cpp
similarity index 100%
rename from hardware/libraries/Servo/Servo.cpp
rename to hardware/arduino/libraries/Servo/Servo.cpp
diff --git a/hardware/libraries/Servo/Servo.h b/hardware/arduino/libraries/Servo/Servo.h
similarity index 100%
rename from hardware/libraries/Servo/Servo.h
rename to hardware/arduino/libraries/Servo/Servo.h
diff --git a/hardware/libraries/Servo/examples/Knob/Knob.pde b/hardware/arduino/libraries/Servo/examples/Knob/Knob.pde
similarity index 100%
rename from hardware/libraries/Servo/examples/Knob/Knob.pde
rename to hardware/arduino/libraries/Servo/examples/Knob/Knob.pde
diff --git a/hardware/libraries/Servo/examples/Sweep/Sweep.pde b/hardware/arduino/libraries/Servo/examples/Sweep/Sweep.pde
similarity index 100%
rename from hardware/libraries/Servo/examples/Sweep/Sweep.pde
rename to hardware/arduino/libraries/Servo/examples/Sweep/Sweep.pde
diff --git a/hardware/libraries/Servo/keywords.txt b/hardware/arduino/libraries/Servo/keywords.txt
similarity index 100%
rename from hardware/libraries/Servo/keywords.txt
rename to hardware/arduino/libraries/Servo/keywords.txt
diff --git a/hardware/libraries/SoftwareSerial/SoftwareSerial.cpp b/hardware/arduino/libraries/SoftwareSerial/SoftwareSerial.cpp
similarity index 100%
rename from hardware/libraries/SoftwareSerial/SoftwareSerial.cpp
rename to hardware/arduino/libraries/SoftwareSerial/SoftwareSerial.cpp
diff --git a/hardware/libraries/SoftwareSerial/SoftwareSerial.h b/hardware/arduino/libraries/SoftwareSerial/SoftwareSerial.h
similarity index 100%
rename from hardware/libraries/SoftwareSerial/SoftwareSerial.h
rename to hardware/arduino/libraries/SoftwareSerial/SoftwareSerial.h
diff --git a/hardware/libraries/SoftwareSerial/keywords.txt b/hardware/arduino/libraries/SoftwareSerial/keywords.txt
similarity index 100%
rename from hardware/libraries/SoftwareSerial/keywords.txt
rename to hardware/arduino/libraries/SoftwareSerial/keywords.txt
diff --git a/hardware/libraries/Sprite/Sprite.cpp b/hardware/arduino/libraries/Sprite/Sprite.cpp
similarity index 100%
rename from hardware/libraries/Sprite/Sprite.cpp
rename to hardware/arduino/libraries/Sprite/Sprite.cpp
diff --git a/hardware/libraries/Sprite/Sprite.h b/hardware/arduino/libraries/Sprite/Sprite.h
similarity index 100%
rename from hardware/libraries/Sprite/Sprite.h
rename to hardware/arduino/libraries/Sprite/Sprite.h
diff --git a/hardware/libraries/Sprite/binary.h b/hardware/arduino/libraries/Sprite/binary.h
similarity index 100%
rename from hardware/libraries/Sprite/binary.h
rename to hardware/arduino/libraries/Sprite/binary.h
diff --git a/hardware/libraries/Sprite/keywords.txt b/hardware/arduino/libraries/Sprite/keywords.txt
similarity index 100%
rename from hardware/libraries/Sprite/keywords.txt
rename to hardware/arduino/libraries/Sprite/keywords.txt
diff --git a/hardware/libraries/Stepper/Stepper.cpp b/hardware/arduino/libraries/Stepper/Stepper.cpp
similarity index 100%
rename from hardware/libraries/Stepper/Stepper.cpp
rename to hardware/arduino/libraries/Stepper/Stepper.cpp
diff --git a/hardware/libraries/Stepper/Stepper.h b/hardware/arduino/libraries/Stepper/Stepper.h
similarity index 100%
rename from hardware/libraries/Stepper/Stepper.h
rename to hardware/arduino/libraries/Stepper/Stepper.h
diff --git a/hardware/libraries/Stepper/examples/MotorKnob/MotorKnob.pde b/hardware/arduino/libraries/Stepper/examples/MotorKnob/MotorKnob.pde
similarity index 100%
rename from hardware/libraries/Stepper/examples/MotorKnob/MotorKnob.pde
rename to hardware/arduino/libraries/Stepper/examples/MotorKnob/MotorKnob.pde
diff --git a/hardware/libraries/Stepper/keywords.txt b/hardware/arduino/libraries/Stepper/keywords.txt
similarity index 100%
rename from hardware/libraries/Stepper/keywords.txt
rename to hardware/arduino/libraries/Stepper/keywords.txt
diff --git a/hardware/libraries/Wire/Wire.cpp b/hardware/arduino/libraries/Wire/Wire.cpp
similarity index 100%
rename from hardware/libraries/Wire/Wire.cpp
rename to hardware/arduino/libraries/Wire/Wire.cpp
diff --git a/hardware/libraries/Wire/Wire.h b/hardware/arduino/libraries/Wire/Wire.h
similarity index 100%
rename from hardware/libraries/Wire/Wire.h
rename to hardware/arduino/libraries/Wire/Wire.h
diff --git a/hardware/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde b/hardware/arduino/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
similarity index 100%
rename from hardware/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
rename to hardware/arduino/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
diff --git a/hardware/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde b/hardware/arduino/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
similarity index 100%
rename from hardware/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
rename to hardware/arduino/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
diff --git a/hardware/libraries/Wire/examples/master_reader/master_reader.pde b/hardware/arduino/libraries/Wire/examples/master_reader/master_reader.pde
similarity index 100%
rename from hardware/libraries/Wire/examples/master_reader/master_reader.pde
rename to hardware/arduino/libraries/Wire/examples/master_reader/master_reader.pde
diff --git a/hardware/libraries/Wire/examples/master_writer/master_writer.pde b/hardware/arduino/libraries/Wire/examples/master_writer/master_writer.pde
similarity index 100%
rename from hardware/libraries/Wire/examples/master_writer/master_writer.pde
rename to hardware/arduino/libraries/Wire/examples/master_writer/master_writer.pde
diff --git a/hardware/libraries/Wire/examples/slave_receiver/slave_receiver.pde b/hardware/arduino/libraries/Wire/examples/slave_receiver/slave_receiver.pde
similarity index 100%
rename from hardware/libraries/Wire/examples/slave_receiver/slave_receiver.pde
rename to hardware/arduino/libraries/Wire/examples/slave_receiver/slave_receiver.pde
diff --git a/hardware/libraries/Wire/examples/slave_sender/slave_sender.pde b/hardware/arduino/libraries/Wire/examples/slave_sender/slave_sender.pde
similarity index 100%
rename from hardware/libraries/Wire/examples/slave_sender/slave_sender.pde
rename to hardware/arduino/libraries/Wire/examples/slave_sender/slave_sender.pde
diff --git a/hardware/libraries/Wire/keywords.txt b/hardware/arduino/libraries/Wire/keywords.txt
similarity index 100%
rename from hardware/libraries/Wire/keywords.txt
rename to hardware/arduino/libraries/Wire/keywords.txt
diff --git a/hardware/libraries/Wire/utility/twi.c b/hardware/arduino/libraries/Wire/utility/twi.c
similarity index 100%
rename from hardware/libraries/Wire/utility/twi.c
rename to hardware/arduino/libraries/Wire/utility/twi.c
diff --git a/hardware/libraries/Wire/utility/twi.h b/hardware/arduino/libraries/Wire/utility/twi.h
similarity index 100%
rename from hardware/libraries/Wire/utility/twi.h
rename to hardware/arduino/libraries/Wire/utility/twi.h