diff --git a/hardware/core/libraries/EEPROM/EEPROM.cpp b/hardware/libraries/EEPROM/EEPROM.cpp
similarity index 100%
rename from hardware/core/libraries/EEPROM/EEPROM.cpp
rename to hardware/libraries/EEPROM/EEPROM.cpp
diff --git a/hardware/core/libraries/EEPROM/EEPROM.h b/hardware/libraries/EEPROM/EEPROM.h
similarity index 100%
rename from hardware/core/libraries/EEPROM/EEPROM.h
rename to hardware/libraries/EEPROM/EEPROM.h
diff --git a/hardware/core/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde b/hardware/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
similarity index 100%
rename from hardware/core/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
rename to hardware/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
diff --git a/hardware/core/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde b/hardware/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
similarity index 100%
rename from hardware/core/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
rename to hardware/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
diff --git a/hardware/core/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde b/hardware/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
similarity index 100%
rename from hardware/core/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
rename to hardware/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
diff --git a/hardware/core/libraries/EEPROM/keywords.txt b/hardware/libraries/EEPROM/keywords.txt
similarity index 100%
rename from hardware/core/libraries/EEPROM/keywords.txt
rename to hardware/libraries/EEPROM/keywords.txt
diff --git a/hardware/core/libraries/Firmata/Firmata.cpp b/hardware/libraries/Firmata/Firmata.cpp
similarity index 100%
rename from hardware/core/libraries/Firmata/Firmata.cpp
rename to hardware/libraries/Firmata/Firmata.cpp
diff --git a/hardware/core/libraries/Firmata/Firmata.h b/hardware/libraries/Firmata/Firmata.h
similarity index 100%
rename from hardware/core/libraries/Firmata/Firmata.h
rename to hardware/libraries/Firmata/Firmata.h
diff --git a/hardware/core/libraries/Firmata/keywords.txt b/hardware/libraries/Firmata/keywords.txt
similarity index 100%
rename from hardware/core/libraries/Firmata/keywords.txt
rename to hardware/libraries/Firmata/keywords.txt
diff --git a/hardware/core/libraries/Matrix/Matrix.cpp b/hardware/libraries/Matrix/Matrix.cpp
similarity index 100%
rename from hardware/core/libraries/Matrix/Matrix.cpp
rename to hardware/libraries/Matrix/Matrix.cpp
diff --git a/hardware/core/libraries/Matrix/Matrix.h b/hardware/libraries/Matrix/Matrix.h
similarity index 100%
rename from hardware/core/libraries/Matrix/Matrix.h
rename to hardware/libraries/Matrix/Matrix.h
diff --git a/hardware/core/libraries/Matrix/examples/hello_matrix/hello_matrix.pde b/hardware/libraries/Matrix/examples/hello_matrix/hello_matrix.pde
similarity index 100%
rename from hardware/core/libraries/Matrix/examples/hello_matrix/hello_matrix.pde
rename to hardware/libraries/Matrix/examples/hello_matrix/hello_matrix.pde
diff --git a/hardware/core/libraries/Matrix/examples/sprite_animation/sprite_animation.pde b/hardware/libraries/Matrix/examples/sprite_animation/sprite_animation.pde
similarity index 100%
rename from hardware/core/libraries/Matrix/examples/sprite_animation/sprite_animation.pde
rename to hardware/libraries/Matrix/examples/sprite_animation/sprite_animation.pde
diff --git a/hardware/core/libraries/Matrix/keywords.txt b/hardware/libraries/Matrix/keywords.txt
similarity index 100%
rename from hardware/core/libraries/Matrix/keywords.txt
rename to hardware/libraries/Matrix/keywords.txt
diff --git a/hardware/core/libraries/SoftwareSerial/SoftwareSerial.cpp b/hardware/libraries/SoftwareSerial/SoftwareSerial.cpp
similarity index 100%
rename from hardware/core/libraries/SoftwareSerial/SoftwareSerial.cpp
rename to hardware/libraries/SoftwareSerial/SoftwareSerial.cpp
diff --git a/hardware/core/libraries/SoftwareSerial/SoftwareSerial.h b/hardware/libraries/SoftwareSerial/SoftwareSerial.h
similarity index 100%
rename from hardware/core/libraries/SoftwareSerial/SoftwareSerial.h
rename to hardware/libraries/SoftwareSerial/SoftwareSerial.h
diff --git a/hardware/core/libraries/SoftwareSerial/keywords.txt b/hardware/libraries/SoftwareSerial/keywords.txt
similarity index 100%
rename from hardware/core/libraries/SoftwareSerial/keywords.txt
rename to hardware/libraries/SoftwareSerial/keywords.txt
diff --git a/hardware/core/libraries/Sprite/Sprite.cpp b/hardware/libraries/Sprite/Sprite.cpp
similarity index 100%
rename from hardware/core/libraries/Sprite/Sprite.cpp
rename to hardware/libraries/Sprite/Sprite.cpp
diff --git a/hardware/core/libraries/Sprite/Sprite.h b/hardware/libraries/Sprite/Sprite.h
similarity index 100%
rename from hardware/core/libraries/Sprite/Sprite.h
rename to hardware/libraries/Sprite/Sprite.h
diff --git a/hardware/core/libraries/Sprite/binary.h b/hardware/libraries/Sprite/binary.h
similarity index 100%
rename from hardware/core/libraries/Sprite/binary.h
rename to hardware/libraries/Sprite/binary.h
diff --git a/hardware/core/libraries/Sprite/keywords.txt b/hardware/libraries/Sprite/keywords.txt
similarity index 100%
rename from hardware/core/libraries/Sprite/keywords.txt
rename to hardware/libraries/Sprite/keywords.txt
diff --git a/hardware/core/libraries/Stepper/Stepper.cpp b/hardware/libraries/Stepper/Stepper.cpp
similarity index 100%
rename from hardware/core/libraries/Stepper/Stepper.cpp
rename to hardware/libraries/Stepper/Stepper.cpp
diff --git a/hardware/core/libraries/Stepper/Stepper.h b/hardware/libraries/Stepper/Stepper.h
similarity index 100%
rename from hardware/core/libraries/Stepper/Stepper.h
rename to hardware/libraries/Stepper/Stepper.h
diff --git a/hardware/core/libraries/Stepper/examples/MotorKnob/MotorKnob.pde b/hardware/libraries/Stepper/examples/MotorKnob/MotorKnob.pde
similarity index 100%
rename from hardware/core/libraries/Stepper/examples/MotorKnob/MotorKnob.pde
rename to hardware/libraries/Stepper/examples/MotorKnob/MotorKnob.pde
diff --git a/hardware/core/libraries/Stepper/keywords.txt b/hardware/libraries/Stepper/keywords.txt
similarity index 100%
rename from hardware/core/libraries/Stepper/keywords.txt
rename to hardware/libraries/Stepper/keywords.txt
diff --git a/hardware/core/libraries/Wire/Wire.cpp b/hardware/libraries/Wire/Wire.cpp
similarity index 100%
rename from hardware/core/libraries/Wire/Wire.cpp
rename to hardware/libraries/Wire/Wire.cpp
diff --git a/hardware/core/libraries/Wire/Wire.h b/hardware/libraries/Wire/Wire.h
similarity index 100%
rename from hardware/core/libraries/Wire/Wire.h
rename to hardware/libraries/Wire/Wire.h
diff --git a/hardware/core/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde b/hardware/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
similarity index 100%
rename from hardware/core/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
rename to hardware/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
diff --git a/hardware/core/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde b/hardware/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
similarity index 100%
rename from hardware/core/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
rename to hardware/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
diff --git a/hardware/core/libraries/Wire/examples/master_reader/master_reader.pde b/hardware/libraries/Wire/examples/master_reader/master_reader.pde
similarity index 100%
rename from hardware/core/libraries/Wire/examples/master_reader/master_reader.pde
rename to hardware/libraries/Wire/examples/master_reader/master_reader.pde
diff --git a/hardware/core/libraries/Wire/examples/master_writer/master_writer.pde b/hardware/libraries/Wire/examples/master_writer/master_writer.pde
similarity index 100%
rename from hardware/core/libraries/Wire/examples/master_writer/master_writer.pde
rename to hardware/libraries/Wire/examples/master_writer/master_writer.pde
diff --git a/hardware/core/libraries/Wire/examples/slave_receiver/slave_receiver.pde b/hardware/libraries/Wire/examples/slave_receiver/slave_receiver.pde
similarity index 100%
rename from hardware/core/libraries/Wire/examples/slave_receiver/slave_receiver.pde
rename to hardware/libraries/Wire/examples/slave_receiver/slave_receiver.pde
diff --git a/hardware/core/libraries/Wire/examples/slave_sender/slave_sender.pde b/hardware/libraries/Wire/examples/slave_sender/slave_sender.pde
similarity index 100%
rename from hardware/core/libraries/Wire/examples/slave_sender/slave_sender.pde
rename to hardware/libraries/Wire/examples/slave_sender/slave_sender.pde
diff --git a/hardware/core/libraries/Wire/keywords.txt b/hardware/libraries/Wire/keywords.txt
similarity index 100%
rename from hardware/core/libraries/Wire/keywords.txt
rename to hardware/libraries/Wire/keywords.txt
diff --git a/hardware/core/libraries/Wire/utility/twi.c b/hardware/libraries/Wire/utility/twi.c
similarity index 100%
rename from hardware/core/libraries/Wire/utility/twi.c
rename to hardware/libraries/Wire/utility/twi.c
diff --git a/hardware/core/libraries/Wire/utility/twi.h b/hardware/libraries/Wire/utility/twi.h
similarity index 100%
rename from hardware/core/libraries/Wire/utility/twi.h
rename to hardware/libraries/Wire/utility/twi.h