diff --git a/targets/arduino/HardwareSerial.cpp b/hardware/core/arduino/HardwareSerial.cpp
similarity index 100%
rename from targets/arduino/HardwareSerial.cpp
rename to hardware/core/arduino/HardwareSerial.cpp
diff --git a/targets/arduino/HardwareSerial.h b/hardware/core/arduino/HardwareSerial.h
similarity index 100%
rename from targets/arduino/HardwareSerial.h
rename to hardware/core/arduino/HardwareSerial.h
diff --git a/targets/arduino/Makefile b/hardware/core/arduino/Makefile
similarity index 100%
rename from targets/arduino/Makefile
rename to hardware/core/arduino/Makefile
diff --git a/targets/arduino/WConstants.h b/hardware/core/arduino/WConstants.h
similarity index 100%
rename from targets/arduino/WConstants.h
rename to hardware/core/arduino/WConstants.h
diff --git a/targets/arduino/WInterrupts.c b/hardware/core/arduino/WInterrupts.c
similarity index 100%
rename from targets/arduino/WInterrupts.c
rename to hardware/core/arduino/WInterrupts.c
diff --git a/targets/arduino/WProgram.h b/hardware/core/arduino/WProgram.h
similarity index 100%
rename from targets/arduino/WProgram.h
rename to hardware/core/arduino/WProgram.h
diff --git a/targets/arduino/WRandom.cpp b/hardware/core/arduino/WRandom.cpp
similarity index 100%
rename from targets/arduino/WRandom.cpp
rename to hardware/core/arduino/WRandom.cpp
diff --git a/targets/arduino/binary.h b/hardware/core/arduino/binary.h
similarity index 100%
rename from targets/arduino/binary.h
rename to hardware/core/arduino/binary.h
diff --git a/targets/arduino/main.cxx b/hardware/core/arduino/main.cxx
similarity index 100%
rename from targets/arduino/main.cxx
rename to hardware/core/arduino/main.cxx
diff --git a/targets/arduino/pins_arduino.c b/hardware/core/arduino/pins_arduino.c
similarity index 100%
rename from targets/arduino/pins_arduino.c
rename to hardware/core/arduino/pins_arduino.c
diff --git a/targets/arduino/pins_arduino.h b/hardware/core/arduino/pins_arduino.h
similarity index 100%
rename from targets/arduino/pins_arduino.h
rename to hardware/core/arduino/pins_arduino.h
diff --git a/targets/arduino/wiring.c b/hardware/core/arduino/wiring.c
similarity index 100%
rename from targets/arduino/wiring.c
rename to hardware/core/arduino/wiring.c
diff --git a/targets/arduino/wiring.h b/hardware/core/arduino/wiring.h
similarity index 100%
rename from targets/arduino/wiring.h
rename to hardware/core/arduino/wiring.h
diff --git a/targets/arduino/wiring_analog.c b/hardware/core/arduino/wiring_analog.c
similarity index 100%
rename from targets/arduino/wiring_analog.c
rename to hardware/core/arduino/wiring_analog.c
diff --git a/targets/arduino/wiring_digital.c b/hardware/core/arduino/wiring_digital.c
similarity index 100%
rename from targets/arduino/wiring_digital.c
rename to hardware/core/arduino/wiring_digital.c
diff --git a/targets/arduino/wiring_private.h b/hardware/core/arduino/wiring_private.h
similarity index 100%
rename from targets/arduino/wiring_private.h
rename to hardware/core/arduino/wiring_private.h
diff --git a/targets/arduino/wiring_pulse.c b/hardware/core/arduino/wiring_pulse.c
similarity index 100%
rename from targets/arduino/wiring_pulse.c
rename to hardware/core/arduino/wiring_pulse.c
diff --git a/targets/arduino/wiring_serial.c b/hardware/core/arduino/wiring_serial.c
similarity index 100%
rename from targets/arduino/wiring_serial.c
rename to hardware/core/arduino/wiring_serial.c
diff --git a/targets/arduino/wiring_shift.c b/hardware/core/arduino/wiring_shift.c
similarity index 100%
rename from targets/arduino/wiring_shift.c
rename to hardware/core/arduino/wiring_shift.c
diff --git a/targets/atmega8/pins_atmega8.c b/hardware/core/atmega8/pins_atmega8.c
similarity index 100%
rename from targets/atmega8/pins_atmega8.c
rename to hardware/core/atmega8/pins_atmega8.c
diff --git a/targets/blank/WProgram.h b/hardware/core/blank/WProgram.h
similarity index 100%
rename from targets/blank/WProgram.h
rename to hardware/core/blank/WProgram.h
diff --git a/targets/blank/main.cxx b/hardware/core/blank/main.cxx
similarity index 100%
rename from targets/blank/main.cxx
rename to hardware/core/blank/main.cxx
diff --git a/targets/libraries/EEPROM/EEPROM.cpp b/hardware/core/libraries/EEPROM/EEPROM.cpp
similarity index 100%
rename from targets/libraries/EEPROM/EEPROM.cpp
rename to hardware/core/libraries/EEPROM/EEPROM.cpp
diff --git a/targets/libraries/EEPROM/EEPROM.h b/hardware/core/libraries/EEPROM/EEPROM.h
similarity index 100%
rename from targets/libraries/EEPROM/EEPROM.h
rename to hardware/core/libraries/EEPROM/EEPROM.h
diff --git a/targets/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde b/hardware/core/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
similarity index 100%
rename from targets/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
rename to hardware/core/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
diff --git a/targets/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde b/hardware/core/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
similarity index 100%
rename from targets/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
rename to hardware/core/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
diff --git a/targets/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde b/hardware/core/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
similarity index 100%
rename from targets/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
rename to hardware/core/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
diff --git a/targets/libraries/EEPROM/keywords.txt b/hardware/core/libraries/EEPROM/keywords.txt
similarity index 100%
rename from targets/libraries/EEPROM/keywords.txt
rename to hardware/core/libraries/EEPROM/keywords.txt
diff --git a/targets/libraries/Firmata/Firmata.cpp b/hardware/core/libraries/Firmata/Firmata.cpp
similarity index 100%
rename from targets/libraries/Firmata/Firmata.cpp
rename to hardware/core/libraries/Firmata/Firmata.cpp
diff --git a/targets/libraries/Firmata/Firmata.h b/hardware/core/libraries/Firmata/Firmata.h
similarity index 100%
rename from targets/libraries/Firmata/Firmata.h
rename to hardware/core/libraries/Firmata/Firmata.h
diff --git a/targets/libraries/Firmata/keywords.txt b/hardware/core/libraries/Firmata/keywords.txt
similarity index 100%
rename from targets/libraries/Firmata/keywords.txt
rename to hardware/core/libraries/Firmata/keywords.txt
diff --git a/targets/libraries/Matrix/Matrix.cpp b/hardware/core/libraries/Matrix/Matrix.cpp
similarity index 100%
rename from targets/libraries/Matrix/Matrix.cpp
rename to hardware/core/libraries/Matrix/Matrix.cpp
diff --git a/targets/libraries/Matrix/Matrix.h b/hardware/core/libraries/Matrix/Matrix.h
similarity index 100%
rename from targets/libraries/Matrix/Matrix.h
rename to hardware/core/libraries/Matrix/Matrix.h
diff --git a/targets/libraries/Matrix/examples/hello_matrix/hello_matrix.pde b/hardware/core/libraries/Matrix/examples/hello_matrix/hello_matrix.pde
similarity index 100%
rename from targets/libraries/Matrix/examples/hello_matrix/hello_matrix.pde
rename to hardware/core/libraries/Matrix/examples/hello_matrix/hello_matrix.pde
diff --git a/targets/libraries/Matrix/examples/sprite_animation/sprite_animation.pde b/hardware/core/libraries/Matrix/examples/sprite_animation/sprite_animation.pde
similarity index 100%
rename from targets/libraries/Matrix/examples/sprite_animation/sprite_animation.pde
rename to hardware/core/libraries/Matrix/examples/sprite_animation/sprite_animation.pde
diff --git a/targets/libraries/Matrix/keywords.txt b/hardware/core/libraries/Matrix/keywords.txt
similarity index 100%
rename from targets/libraries/Matrix/keywords.txt
rename to hardware/core/libraries/Matrix/keywords.txt
diff --git a/targets/libraries/SoftwareSerial/SoftwareSerial.cpp b/hardware/core/libraries/SoftwareSerial/SoftwareSerial.cpp
similarity index 100%
rename from targets/libraries/SoftwareSerial/SoftwareSerial.cpp
rename to hardware/core/libraries/SoftwareSerial/SoftwareSerial.cpp
diff --git a/targets/libraries/SoftwareSerial/SoftwareSerial.h b/hardware/core/libraries/SoftwareSerial/SoftwareSerial.h
similarity index 100%
rename from targets/libraries/SoftwareSerial/SoftwareSerial.h
rename to hardware/core/libraries/SoftwareSerial/SoftwareSerial.h
diff --git a/targets/libraries/SoftwareSerial/keywords.txt b/hardware/core/libraries/SoftwareSerial/keywords.txt
similarity index 100%
rename from targets/libraries/SoftwareSerial/keywords.txt
rename to hardware/core/libraries/SoftwareSerial/keywords.txt
diff --git a/targets/libraries/Sprite/Sprite.cpp b/hardware/core/libraries/Sprite/Sprite.cpp
similarity index 100%
rename from targets/libraries/Sprite/Sprite.cpp
rename to hardware/core/libraries/Sprite/Sprite.cpp
diff --git a/targets/libraries/Sprite/Sprite.h b/hardware/core/libraries/Sprite/Sprite.h
similarity index 100%
rename from targets/libraries/Sprite/Sprite.h
rename to hardware/core/libraries/Sprite/Sprite.h
diff --git a/targets/libraries/Sprite/binary.h b/hardware/core/libraries/Sprite/binary.h
similarity index 100%
rename from targets/libraries/Sprite/binary.h
rename to hardware/core/libraries/Sprite/binary.h
diff --git a/targets/libraries/Sprite/keywords.txt b/hardware/core/libraries/Sprite/keywords.txt
similarity index 100%
rename from targets/libraries/Sprite/keywords.txt
rename to hardware/core/libraries/Sprite/keywords.txt
diff --git a/targets/libraries/Stepper/Stepper.cpp b/hardware/core/libraries/Stepper/Stepper.cpp
similarity index 100%
rename from targets/libraries/Stepper/Stepper.cpp
rename to hardware/core/libraries/Stepper/Stepper.cpp
diff --git a/targets/libraries/Stepper/Stepper.h b/hardware/core/libraries/Stepper/Stepper.h
similarity index 100%
rename from targets/libraries/Stepper/Stepper.h
rename to hardware/core/libraries/Stepper/Stepper.h
diff --git a/targets/libraries/Stepper/examples/MotorKnob/MotorKnob.pde b/hardware/core/libraries/Stepper/examples/MotorKnob/MotorKnob.pde
similarity index 100%
rename from targets/libraries/Stepper/examples/MotorKnob/MotorKnob.pde
rename to hardware/core/libraries/Stepper/examples/MotorKnob/MotorKnob.pde
diff --git a/targets/libraries/Stepper/keywords.txt b/hardware/core/libraries/Stepper/keywords.txt
similarity index 100%
rename from targets/libraries/Stepper/keywords.txt
rename to hardware/core/libraries/Stepper/keywords.txt
diff --git a/targets/libraries/Wire/Wire.cpp b/hardware/core/libraries/Wire/Wire.cpp
similarity index 100%
rename from targets/libraries/Wire/Wire.cpp
rename to hardware/core/libraries/Wire/Wire.cpp
diff --git a/targets/libraries/Wire/Wire.h b/hardware/core/libraries/Wire/Wire.h
similarity index 100%
rename from targets/libraries/Wire/Wire.h
rename to hardware/core/libraries/Wire/Wire.h
diff --git a/targets/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde b/hardware/core/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
similarity index 100%
rename from targets/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
rename to hardware/core/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
diff --git a/targets/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde b/hardware/core/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
similarity index 100%
rename from targets/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
rename to hardware/core/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
diff --git a/targets/libraries/Wire/examples/master_reader/master_reader.pde b/hardware/core/libraries/Wire/examples/master_reader/master_reader.pde
similarity index 100%
rename from targets/libraries/Wire/examples/master_reader/master_reader.pde
rename to hardware/core/libraries/Wire/examples/master_reader/master_reader.pde
diff --git a/targets/libraries/Wire/examples/master_writer/master_writer.pde b/hardware/core/libraries/Wire/examples/master_writer/master_writer.pde
similarity index 100%
rename from targets/libraries/Wire/examples/master_writer/master_writer.pde
rename to hardware/core/libraries/Wire/examples/master_writer/master_writer.pde
diff --git a/targets/libraries/Wire/examples/slave_receiver/slave_receiver.pde b/hardware/core/libraries/Wire/examples/slave_receiver/slave_receiver.pde
similarity index 100%
rename from targets/libraries/Wire/examples/slave_receiver/slave_receiver.pde
rename to hardware/core/libraries/Wire/examples/slave_receiver/slave_receiver.pde
diff --git a/targets/libraries/Wire/examples/slave_sender/slave_sender.pde b/hardware/core/libraries/Wire/examples/slave_sender/slave_sender.pde
similarity index 100%
rename from targets/libraries/Wire/examples/slave_sender/slave_sender.pde
rename to hardware/core/libraries/Wire/examples/slave_sender/slave_sender.pde
diff --git a/targets/libraries/Wire/keywords.txt b/hardware/core/libraries/Wire/keywords.txt
similarity index 100%
rename from targets/libraries/Wire/keywords.txt
rename to hardware/core/libraries/Wire/keywords.txt
diff --git a/targets/libraries/Wire/utility/twi.c b/hardware/core/libraries/Wire/utility/twi.c
similarity index 100%
rename from targets/libraries/Wire/utility/twi.c
rename to hardware/core/libraries/Wire/utility/twi.c
diff --git a/targets/libraries/Wire/utility/twi.h b/hardware/core/libraries/Wire/utility/twi.h
similarity index 100%
rename from targets/libraries/Wire/utility/twi.h
rename to hardware/core/libraries/Wire/utility/twi.h
diff --git a/targets/wiring/Binary.h b/hardware/core/wiring/Binary.h
similarity index 100%
rename from targets/wiring/Binary.h
rename to hardware/core/wiring/Binary.h
diff --git a/targets/wiring/Encoder.h b/hardware/core/wiring/Encoder.h
similarity index 100%
rename from targets/wiring/Encoder.h
rename to hardware/core/wiring/Encoder.h
diff --git a/targets/wiring/Encoder.o b/hardware/core/wiring/Encoder.o
similarity index 100%
rename from targets/wiring/Encoder.o
rename to hardware/core/wiring/Encoder.o
diff --git a/targets/wiring/HardwareSerial.h b/hardware/core/wiring/HardwareSerial.h
similarity index 100%
rename from targets/wiring/HardwareSerial.h
rename to hardware/core/wiring/HardwareSerial.h
diff --git a/targets/wiring/HardwareSerial.o b/hardware/core/wiring/HardwareSerial.o
similarity index 100%
rename from targets/wiring/HardwareSerial.o
rename to hardware/core/wiring/HardwareSerial.o
diff --git a/targets/wiring/LiquidCrystal.h b/hardware/core/wiring/LiquidCrystal.h
similarity index 100%
rename from targets/wiring/LiquidCrystal.h
rename to hardware/core/wiring/LiquidCrystal.h
diff --git a/targets/wiring/LiquidCrystal.o b/hardware/core/wiring/LiquidCrystal.o
similarity index 100%
rename from targets/wiring/LiquidCrystal.o
rename to hardware/core/wiring/LiquidCrystal.o
diff --git a/targets/wiring/Matrix.h b/hardware/core/wiring/Matrix.h
similarity index 100%
rename from targets/wiring/Matrix.h
rename to hardware/core/wiring/Matrix.h
diff --git a/targets/wiring/Matrix.o b/hardware/core/wiring/Matrix.o
similarity index 100%
rename from targets/wiring/Matrix.o
rename to hardware/core/wiring/Matrix.o
diff --git a/targets/wiring/QSlide.h b/hardware/core/wiring/QSlide.h
similarity index 100%
rename from targets/wiring/QSlide.h
rename to hardware/core/wiring/QSlide.h
diff --git a/targets/wiring/QSlide.o b/hardware/core/wiring/QSlide.o
similarity index 100%
rename from targets/wiring/QSlide.o
rename to hardware/core/wiring/QSlide.o
diff --git a/targets/wiring/Servo.h b/hardware/core/wiring/Servo.h
similarity index 100%
rename from targets/wiring/Servo.h
rename to hardware/core/wiring/Servo.h
diff --git a/targets/wiring/Servo.o b/hardware/core/wiring/Servo.o
similarity index 100%
rename from targets/wiring/Servo.o
rename to hardware/core/wiring/Servo.o
diff --git a/targets/wiring/Sprite.h b/hardware/core/wiring/Sprite.h
similarity index 100%
rename from targets/wiring/Sprite.h
rename to hardware/core/wiring/Sprite.h
diff --git a/targets/wiring/Sprite.o b/hardware/core/wiring/Sprite.o
similarity index 100%
rename from targets/wiring/Sprite.o
rename to hardware/core/wiring/Sprite.o
diff --git a/targets/wiring/TwoWire.h b/hardware/core/wiring/TwoWire.h
similarity index 100%
rename from targets/wiring/TwoWire.h
rename to hardware/core/wiring/TwoWire.h
diff --git a/targets/wiring/TwoWire.o b/hardware/core/wiring/TwoWire.o
similarity index 100%
rename from targets/wiring/TwoWire.o
rename to hardware/core/wiring/TwoWire.o
diff --git a/targets/wiring/WApplet.o b/hardware/core/wiring/WApplet.o
similarity index 100%
rename from targets/wiring/WApplet.o
rename to hardware/core/wiring/WApplet.o
diff --git a/targets/wiring/WConstants.h b/hardware/core/wiring/WConstants.h
similarity index 100%
rename from targets/wiring/WConstants.h
rename to hardware/core/wiring/WConstants.h
diff --git a/targets/wiring/WInterrupts.o b/hardware/core/wiring/WInterrupts.o
similarity index 100%
rename from targets/wiring/WInterrupts.o
rename to hardware/core/wiring/WInterrupts.o
diff --git a/targets/wiring/WProgram.h b/hardware/core/wiring/WProgram.h
similarity index 100%
rename from targets/wiring/WProgram.h
rename to hardware/core/wiring/WProgram.h
diff --git a/targets/wiring/WRandom.o b/hardware/core/wiring/WRandom.o
similarity index 100%
rename from targets/wiring/WRandom.o
rename to hardware/core/wiring/WRandom.o
diff --git a/targets/wiring/WTimer.o b/hardware/core/wiring/WTimer.o
similarity index 100%
rename from targets/wiring/WTimer.o
rename to hardware/core/wiring/WTimer.o
diff --git a/targets/wiring/buffer.h b/hardware/core/wiring/buffer.h
similarity index 100%
rename from targets/wiring/buffer.h
rename to hardware/core/wiring/buffer.h
diff --git a/targets/wiring/buffer.o b/hardware/core/wiring/buffer.o
similarity index 100%
rename from targets/wiring/buffer.o
rename to hardware/core/wiring/buffer.o
diff --git a/targets/wiring/twi.h b/hardware/core/wiring/twi.h
similarity index 100%
rename from targets/wiring/twi.h
rename to hardware/core/wiring/twi.h
diff --git a/targets/wiring/twi.o b/hardware/core/wiring/twi.o
similarity index 100%
rename from targets/wiring/twi.o
rename to hardware/core/wiring/twi.o
diff --git a/targets/wiring/uart.h b/hardware/core/wiring/uart.h
similarity index 100%
rename from targets/wiring/uart.h
rename to hardware/core/wiring/uart.h
diff --git a/targets/wiring/uart.o b/hardware/core/wiring/uart.o
similarity index 100%
rename from targets/wiring/uart.o
rename to hardware/core/wiring/uart.o