diff --git a/hardware/arduino/sam/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde b/hardware/arduino/sam/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde
deleted file mode 100644
index 9d77a4261..000000000
--- a/hardware/arduino/sam/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- SCP1000 Barometric Pressure Sensor Display
- 
- Shows the output of a Barometric Pressure Sensor on a
- Uses the SPI library. For details on the sensor, see:
- http://www.sparkfun.com/commerce/product_info.php?products_id=8161
- http://www.vti.fi/en/support/obsolete_products/pressure_sensors/
- 
- This sketch adapted from Nathan Seidle's SCP1000 example for PIC:
- http://www.sparkfun.com/datasheets/Sensors/SCP1000-Testing.zip
- 
- Circuit:
- SCP1000 sensor attached to pins 6, 7, 10 - 13:
- DRDY: pin 6
- CSB: pin 7
- MOSI: pin 11
- MISO: pin 12
- SCK: pin 13
- 
- created 31 July 2010
- modified 14 August 2010
- by Tom Igoe
- */
-
-// the sensor communicates using SPI, so include the library:
-#include <SPI.h>
-
-//Sensor's memory register addresses:
-const int PRESSURE = 0x1F;      //3 most significant bits of pressure
-const int PRESSURE_LSB = 0x20;  //16 least significant bits of pressure
-const int TEMPERATURE = 0x21;   //16 bit temperature reading
-const byte READ = 0b11111100;     // SCP1000's read command
-const byte WRITE = 0b00000010;   // SCP1000's write command
-
-// pins used for the connection with the sensor
-// the other you need are controlled by the SPI library):
-const int dataReadyPin = 6;
-const int chipSelectPin = 7;
-
-void setup() {
-  Serial.begin(9600);
-
-  // start the SPI library:
-  SPI.begin();
-
-  // initalize the  data ready and chip select pins:
-  pinMode(dataReadyPin, INPUT);
-  pinMode(chipSelectPin, OUTPUT);
-
-  //Configure SCP1000 for low noise configuration:
-  writeRegister(0x02, 0x2D);
-  writeRegister(0x01, 0x03);
-  writeRegister(0x03, 0x02);
-  // give the sensor time to set up:
-  delay(100);
-}
-
-void loop() {
-  //Select High Resolution Mode
-  writeRegister(0x03, 0x0A);
-
-  // don't do anything until the data ready pin is high:
-  if (digitalRead(dataReadyPin) == HIGH) {
-    //Read the temperature data
-    int tempData = readRegister(0x21, 2);
-
-    // convert the temperature to celsius and display it:
-    float realTemp = (float)tempData / 20.0;
-    Serial.print("Temp[C]=");
-    Serial.print(realTemp);
-
-
-    //Read the pressure data highest 3 bits:
-    byte  pressure_data_high = readRegister(0x1F, 1);
-    pressure_data_high &= 0b00000111; //you only needs bits 2 to 0
-
-    //Read the pressure data lower 16 bits:
-    unsigned int pressure_data_low = readRegister(0x20, 2);
-    //combine the two parts into one 19-bit number:
-    long pressure = ((pressure_data_high << 16) | pressure_data_low)/4;
-
-    // display the temperature:
-    Serial.println("\tPressure [Pa]=" + String(pressure));
-  }
-}
-
-//Read from or write to register from the SCP1000:
-unsigned int readRegister(byte thisRegister, int bytesToRead ) {
-  byte inByte = 0;           // incoming byte from the SPI
-  unsigned int result = 0;   // result to return
-  Serial.print(thisRegister, BIN);
-  Serial.print("\t");
-  // SCP1000 expects the register name in the upper 6 bits
-  // of the byte. So shift the bits left by two bits:
-  thisRegister = thisRegister << 2;
-  // now combine the address and the command into one byte
-  byte dataToSend = thisRegister & READ;
-  Serial.println(thisRegister, BIN);
-  // take the chip select low to select the device:
-  digitalWrite(chipSelectPin, LOW);
-  // send the device the register you want to read:
-  SPI.transfer(dataToSend);
-  // send a value of 0 to read the first byte returned:
-  result = SPI.transfer(0x00);
-  // decrement the number of bytes left to read:
-  bytesToRead--;
-  // if you still have another byte to read:
-  if (bytesToRead > 0) {
-    // shift the first byte left, then get the second byte:
-    result = result << 8;
-    inByte = SPI.transfer(0x00);
-    // combine the byte you just got with the previous one:
-    result = result | inByte;
-    // decrement the number of bytes left to read:
-    bytesToRead--;
-  }
-  // take the chip select high to de-select:
-  digitalWrite(chipSelectPin, HIGH);
-  // return the result:
-  return(result);
-}
-
-
-//Sends a write command to SCP1000
-
-void writeRegister(byte thisRegister, byte thisValue) {
-
-  // SCP1000 expects the register address in the upper 6 bits
-  // of the byte. So shift the bits left by two bits:
-  thisRegister = thisRegister << 2;
-  // now combine the register address and the command into one byte:
-  byte dataToSend = thisRegister | WRITE;
-
-  // take the chip select low to select the device:
-  digitalWrite(chipSelectPin, LOW);
-
-  SPI.transfer(dataToSend); //Send register location
-  SPI.transfer(thisValue);  //Send value to record into register
-
-  // take the chip select high to de-select:
-  digitalWrite(chipSelectPin, HIGH);
-}
-
diff --git a/hardware/arduino/sam/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde b/hardware/arduino/sam/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde
deleted file mode 100644
index ef97dae88..000000000
--- a/hardware/arduino/sam/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-  Digital Pot Control
-  
-  This example controls an Analog Devices AD5206 digital potentiometer.
-  The AD5206 has 6 potentiometer channels. Each channel's pins are labeled
-  A - connect this to voltage
-  W - this is the pot's wiper, which changes when you set it
-  B - connect this to ground.
- 
- The AD5206 is SPI-compatible,and to command it, you send two bytes, 
- one with the channel number (0 - 5) and one with the resistance value for the
- channel (0 - 255).  
- 
- The circuit:
-  * All A pins  of AD5206 connected to +5V
-  * All B pins of AD5206 connected to ground
-  * An LED and a 220-ohm resisor in series connected from each W pin to ground
-  * CS - to digital pin 10  (SS pin)
-  * SDI - to digital pin 11 (MOSI pin)
-  * CLK - to digital pin 13 (SCK pin)
- 
- created 10 Aug 2010 
- by Tom Igoe
- 
- Thanks to Heather Dewey-Hagborg for the original tutorial, 2005
- 
-*/
-
-
-// inslude the SPI library:
-#include <SPI.h>
-
-
-// set pin 10 as the slave select for the digital pot:
-const int slaveSelectPin = 10;
-
-void setup() {
-  // set the slaveSelectPin as an output:
-  pinMode (slaveSelectPin, OUTPUT);
-  // initialize SPI:
-  SPI.begin(); 
-}
-
-void loop() {
-  // go through the six channels of the digital pot:
-  for (int channel = 0; channel < 6; channel++) { 
-    // change the resistance on this channel from min to max:
-    for (int level = 0; level < 255; level++) {
-      digitalPotWrite(channel, level);
-      delay(10);
-    }
-    // wait a second at the top:
-    delay(100);
-    // change the resistance on this channel from max to min:
-    for (int level = 0; level < 255; level++) {
-      digitalPotWrite(channel, 255 - level);
-      delay(10);
-    }
-  }
-
-}
-
-int digitalPotWrite(int address, int value) {
-  // take the SS pin low to select the chip:
-  digitalWrite(slaveSelectPin,LOW);
-  //  send in the address and value via SPI:
-  SPI.transfer(address);
-  SPI.transfer(value);
-  // take the SS pin high to de-select the chip:
-  digitalWrite(slaveSelectPin,HIGH); 
-}
\ No newline at end of file
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Adafruit_GFX.cpp b/libraries/Robot_Control/Adafruit_GFX.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Adafruit_GFX.cpp
rename to libraries/Robot_Control/Adafruit_GFX.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Adafruit_GFX.h b/libraries/Robot_Control/Adafruit_GFX.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Adafruit_GFX.h
rename to libraries/Robot_Control/Adafruit_GFX.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/ArduinoRobot.cpp b/libraries/Robot_Control/ArduinoRobot.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/ArduinoRobot.cpp
rename to libraries/Robot_Control/ArduinoRobot.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/ArduinoRobot.h b/libraries/Robot_Control/ArduinoRobot.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/ArduinoRobot.h
rename to libraries/Robot_Control/ArduinoRobot.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Arduino_LCD.cpp b/libraries/Robot_Control/Arduino_LCD.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Arduino_LCD.cpp
rename to libraries/Robot_Control/Arduino_LCD.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Arduino_LCD.h b/libraries/Robot_Control/Arduino_LCD.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Arduino_LCD.h
rename to libraries/Robot_Control/Arduino_LCD.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Compass.cpp b/libraries/Robot_Control/Compass.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Compass.cpp
rename to libraries/Robot_Control/Compass.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Compass.h b/libraries/Robot_Control/Compass.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Compass.h
rename to libraries/Robot_Control/Compass.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/EEPROM_I2C.cpp b/libraries/Robot_Control/EEPROM_I2C.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/EEPROM_I2C.cpp
rename to libraries/Robot_Control/EEPROM_I2C.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/EEPROM_I2C.h b/libraries/Robot_Control/EEPROM_I2C.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/EEPROM_I2C.h
rename to libraries/Robot_Control/EEPROM_I2C.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/EasyTransfer2.cpp b/libraries/Robot_Control/EasyTransfer2.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/EasyTransfer2.cpp
rename to libraries/Robot_Control/EasyTransfer2.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/EasyTransfer2.h b/libraries/Robot_Control/EasyTransfer2.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/EasyTransfer2.h
rename to libraries/Robot_Control/EasyTransfer2.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Fat16.cpp b/libraries/Robot_Control/Fat16.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Fat16.cpp
rename to libraries/Robot_Control/Fat16.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Fat16.h b/libraries/Robot_Control/Fat16.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Fat16.h
rename to libraries/Robot_Control/Fat16.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Fat16Config.h b/libraries/Robot_Control/Fat16Config.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Fat16Config.h
rename to libraries/Robot_Control/Fat16Config.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Fat16mainpage.h b/libraries/Robot_Control/Fat16mainpage.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Fat16mainpage.h
rename to libraries/Robot_Control/Fat16mainpage.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Fat16util.h b/libraries/Robot_Control/Fat16util.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Fat16util.h
rename to libraries/Robot_Control/Fat16util.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/FatStructs.h b/libraries/Robot_Control/FatStructs.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/FatStructs.h
rename to libraries/Robot_Control/FatStructs.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Melody.cpp b/libraries/Robot_Control/Melody.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Melody.cpp
rename to libraries/Robot_Control/Melody.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Motors.cpp b/libraries/Robot_Control/Motors.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Motors.cpp
rename to libraries/Robot_Control/Motors.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Multiplexer.cpp b/libraries/Robot_Control/Multiplexer.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Multiplexer.cpp
rename to libraries/Robot_Control/Multiplexer.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Multiplexer.h b/libraries/Robot_Control/Multiplexer.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Multiplexer.h
rename to libraries/Robot_Control/Multiplexer.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/RobotSdCard.cpp b/libraries/Robot_Control/RobotSdCard.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/RobotSdCard.cpp
rename to libraries/Robot_Control/RobotSdCard.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/SPI.cpp b/libraries/Robot_Control/SPI.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/SPI.cpp
rename to libraries/Robot_Control/SPI.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/SPI.h b/libraries/Robot_Control/SPI.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/SPI.h
rename to libraries/Robot_Control/SPI.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/SdCard.cpp b/libraries/Robot_Control/SdCard.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/SdCard.cpp
rename to libraries/Robot_Control/SdCard.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/SdCard.h b/libraries/Robot_Control/SdCard.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/SdCard.h
rename to libraries/Robot_Control/SdCard.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/SdInfo.h b/libraries/Robot_Control/SdInfo.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/SdInfo.h
rename to libraries/Robot_Control/SdInfo.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Sensors.cpp b/libraries/Robot_Control/Sensors.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Sensors.cpp
rename to libraries/Robot_Control/Sensors.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Squawk.cpp b/libraries/Robot_Control/Squawk.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Squawk.cpp
rename to libraries/Robot_Control/Squawk.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Squawk.h b/libraries/Robot_Control/Squawk.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Squawk.h
rename to libraries/Robot_Control/Squawk.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/SquawkSD.cpp b/libraries/Robot_Control/SquawkSD.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/SquawkSD.cpp
rename to libraries/Robot_Control/SquawkSD.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/SquawkSD.h b/libraries/Robot_Control/SquawkSD.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/SquawkSD.h
rename to libraries/Robot_Control/SquawkSD.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Wire.cpp b/libraries/Robot_Control/Wire.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Wire.cpp
rename to libraries/Robot_Control/Wire.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/Wire.h b/libraries/Robot_Control/Wire.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/Wire.h
rename to libraries/Robot_Control/Wire.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/communication.cpp b/libraries/Robot_Control/communication.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/communication.cpp
rename to libraries/Robot_Control/communication.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/explore/R01_Logo/R01_Logo.ino b/libraries/Robot_Control/examples/explore/R01_Logo/R01_Logo.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/explore/R01_Logo/R01_Logo.ino
rename to libraries/Robot_Control/examples/explore/R01_Logo/R01_Logo.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/explore/R02_Line_Follow/R02_Line_Follow.ino b/libraries/Robot_Control/examples/explore/R02_Line_Follow/R02_Line_Follow.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/explore/R02_Line_Follow/R02_Line_Follow.ino
rename to libraries/Robot_Control/examples/explore/R02_Line_Follow/R02_Line_Follow.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/explore/R03_Disco_Bot/R03_Disco_Bot.ino b/libraries/Robot_Control/examples/explore/R03_Disco_Bot/R03_Disco_Bot.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/explore/R03_Disco_Bot/R03_Disco_Bot.ino
rename to libraries/Robot_Control/examples/explore/R03_Disco_Bot/R03_Disco_Bot.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/explore/R04_Compass/R04_Compass.ino b/libraries/Robot_Control/examples/explore/R04_Compass/R04_Compass.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/explore/R04_Compass/R04_Compass.ino
rename to libraries/Robot_Control/examples/explore/R04_Compass/R04_Compass.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/explore/R05_Inputs/R05_Inputs.ino b/libraries/Robot_Control/examples/explore/R05_Inputs/R05_Inputs.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/explore/R05_Inputs/R05_Inputs.ino
rename to libraries/Robot_Control/examples/explore/R05_Inputs/R05_Inputs.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/explore/R06_Wheel_Calibration/R06_Wheel_Calibration.ino b/libraries/Robot_Control/examples/explore/R06_Wheel_Calibration/R06_Wheel_Calibration.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/explore/R06_Wheel_Calibration/R06_Wheel_Calibration.ino
rename to libraries/Robot_Control/examples/explore/R06_Wheel_Calibration/R06_Wheel_Calibration.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/explore/R07_Runaway_Robot/R07_Runaway_Robot.ino b/libraries/Robot_Control/examples/explore/R07_Runaway_Robot/R07_Runaway_Robot.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/explore/R07_Runaway_Robot/R07_Runaway_Robot.ino
rename to libraries/Robot_Control/examples/explore/R07_Runaway_Robot/R07_Runaway_Robot.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/explore/R08_Remote_Control/R08_Remote_Control.ino b/libraries/Robot_Control/examples/explore/R08_Remote_Control/R08_Remote_Control.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/explore/R08_Remote_Control/R08_Remote_Control.ino
rename to libraries/Robot_Control/examples/explore/R08_Remote_Control/R08_Remote_Control.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/explore/R09_Picture_Browser/R09_Picture_Browser.ino b/libraries/Robot_Control/examples/explore/R09_Picture_Browser/R09_Picture_Browser.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/explore/R09_Picture_Browser/R09_Picture_Browser.ino
rename to libraries/Robot_Control/examples/explore/R09_Picture_Browser/R09_Picture_Browser.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/explore/R10_Rescue/R10_Rescue.ino b/libraries/Robot_Control/examples/explore/R10_Rescue/R10_Rescue.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/explore/R10_Rescue/R10_Rescue.ino
rename to libraries/Robot_Control/examples/explore/R10_Rescue/R10_Rescue.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/explore/R11_Hello_User/R11_Hello_User.ino b/libraries/Robot_Control/examples/explore/R11_Hello_User/R11_Hello_User.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/explore/R11_Hello_User/R11_Hello_User.ino
rename to libraries/Robot_Control/examples/explore/R11_Hello_User/R11_Hello_User.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/AllIOPorts/AllIOPorts.ino b/libraries/Robot_Control/examples/learn/AllIOPorts/AllIOPorts.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/AllIOPorts/AllIOPorts.ino
rename to libraries/Robot_Control/examples/learn/AllIOPorts/AllIOPorts.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/Beep/Beep.ino b/libraries/Robot_Control/examples/learn/Beep/Beep.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/Beep/Beep.ino
rename to libraries/Robot_Control/examples/learn/Beep/Beep.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/CleanEEPROM/CleanEEPROM.ino b/libraries/Robot_Control/examples/learn/CleanEEPROM/CleanEEPROM.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/CleanEEPROM/CleanEEPROM.ino
rename to libraries/Robot_Control/examples/learn/CleanEEPROM/CleanEEPROM.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/Compass/Compass.ino b/libraries/Robot_Control/examples/learn/Compass/Compass.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/Compass/Compass.ino
rename to libraries/Robot_Control/examples/learn/Compass/Compass.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/IRArray/IRArray.ino b/libraries/Robot_Control/examples/learn/IRArray/IRArray.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/IRArray/IRArray.ino
rename to libraries/Robot_Control/examples/learn/IRArray/IRArray.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/LCDDebugPrint/LCDDebugPrint.ino b/libraries/Robot_Control/examples/learn/LCDDebugPrint/LCDDebugPrint.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/LCDDebugPrint/LCDDebugPrint.ino
rename to libraries/Robot_Control/examples/learn/LCDDebugPrint/LCDDebugPrint.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/LCDPrint/LCDPrint.ino b/libraries/Robot_Control/examples/learn/LCDPrint/LCDPrint.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/LCDPrint/LCDPrint.ino
rename to libraries/Robot_Control/examples/learn/LCDPrint/LCDPrint.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/LCDWriteText/LCDWriteText.ino b/libraries/Robot_Control/examples/learn/LCDWriteText/LCDWriteText.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/LCDWriteText/LCDWriteText.ino
rename to libraries/Robot_Control/examples/learn/LCDWriteText/LCDWriteText.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/LineFollowWithPause/LineFollowWithPause.ino b/libraries/Robot_Control/examples/learn/LineFollowWithPause/LineFollowWithPause.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/LineFollowWithPause/LineFollowWithPause.ino
rename to libraries/Robot_Control/examples/learn/LineFollowWithPause/LineFollowWithPause.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/Melody/Melody.ino b/libraries/Robot_Control/examples/learn/Melody/Melody.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/Melody/Melody.ino
rename to libraries/Robot_Control/examples/learn/Melody/Melody.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/MotorTest/MotorTest.ino b/libraries/Robot_Control/examples/learn/MotorTest/MotorTest.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/MotorTest/MotorTest.ino
rename to libraries/Robot_Control/examples/learn/MotorTest/MotorTest.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/SpeedByPotentiometer/SpeedByPotentiometer.ino b/libraries/Robot_Control/examples/learn/SpeedByPotentiometer/SpeedByPotentiometer.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/SpeedByPotentiometer/SpeedByPotentiometer.ino
rename to libraries/Robot_Control/examples/learn/SpeedByPotentiometer/SpeedByPotentiometer.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino b/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino
rename to libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino.orig b/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino.orig
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino.orig
rename to libraries/Robot_Control/examples/learn/TurnTest/TurnTest.ino.orig
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino b/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino
rename to libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino.orig b/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino.orig
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino.orig
rename to libraries/Robot_Control/examples/learn/keyboardTest/keyboardTest.ino.orig
diff --git a/hardware/arduino/avr/libraries/Robot_Control/glcdfont.c b/libraries/Robot_Control/glcdfont.c
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/glcdfont.c
rename to libraries/Robot_Control/glcdfont.c
diff --git a/hardware/arduino/avr/libraries/Robot_Control/helper.cpp b/libraries/Robot_Control/helper.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/helper.cpp
rename to libraries/Robot_Control/helper.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/information.cpp b/libraries/Robot_Control/information.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/information.cpp
rename to libraries/Robot_Control/information.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/keyboard.cpp b/libraries/Robot_Control/keyboard.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/keyboard.cpp
rename to libraries/Robot_Control/keyboard.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/lcd.cpp b/libraries/Robot_Control/lcd.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/lcd.cpp
rename to libraries/Robot_Control/lcd.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/utility/RobotTextManager.cpp b/libraries/Robot_Control/utility/RobotTextManager.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/utility/RobotTextManager.cpp
rename to libraries/Robot_Control/utility/RobotTextManager.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/utility/RobotTextManager.h b/libraries/Robot_Control/utility/RobotTextManager.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/utility/RobotTextManager.h
rename to libraries/Robot_Control/utility/RobotTextManager.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/utility/VirtualKeyboard.cpp b/libraries/Robot_Control/utility/VirtualKeyboard.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/utility/VirtualKeyboard.cpp
rename to libraries/Robot_Control/utility/VirtualKeyboard.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Control/utility/VirtualKeyboard.h b/libraries/Robot_Control/utility/VirtualKeyboard.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/utility/VirtualKeyboard.h
rename to libraries/Robot_Control/utility/VirtualKeyboard.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/utility/scripts_Hello_User.h b/libraries/Robot_Control/utility/scripts_Hello_User.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/utility/scripts_Hello_User.h
rename to libraries/Robot_Control/utility/scripts_Hello_User.h
diff --git a/hardware/arduino/avr/libraries/Robot_Control/utility/twi.c b/libraries/Robot_Control/utility/twi.c
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/utility/twi.c
rename to libraries/Robot_Control/utility/twi.c
diff --git a/hardware/arduino/avr/libraries/Robot_Control/utility/twi.h b/libraries/Robot_Control/utility/twi.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Control/utility/twi.h
rename to libraries/Robot_Control/utility/twi.h
diff --git a/hardware/arduino/avr/libraries/Robot_Motor/ArduinoRobotMotorBoard.cpp b/libraries/Robot_Motor/ArduinoRobotMotorBoard.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Motor/ArduinoRobotMotorBoard.cpp
rename to libraries/Robot_Motor/ArduinoRobotMotorBoard.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Motor/ArduinoRobotMotorBoard.h b/libraries/Robot_Motor/ArduinoRobotMotorBoard.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Motor/ArduinoRobotMotorBoard.h
rename to libraries/Robot_Motor/ArduinoRobotMotorBoard.h
diff --git a/hardware/arduino/avr/libraries/Robot_Motor/EasyTransfer2.cpp b/libraries/Robot_Motor/EasyTransfer2.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Motor/EasyTransfer2.cpp
rename to libraries/Robot_Motor/EasyTransfer2.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Motor/EasyTransfer2.h b/libraries/Robot_Motor/EasyTransfer2.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Motor/EasyTransfer2.h
rename to libraries/Robot_Motor/EasyTransfer2.h
diff --git a/hardware/arduino/avr/libraries/Robot_Motor/LineFollow.h b/libraries/Robot_Motor/LineFollow.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Motor/LineFollow.h
rename to libraries/Robot_Motor/LineFollow.h
diff --git a/hardware/arduino/avr/libraries/Robot_Motor/Multiplexer.cpp b/libraries/Robot_Motor/Multiplexer.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Motor/Multiplexer.cpp
rename to libraries/Robot_Motor/Multiplexer.cpp
diff --git a/hardware/arduino/avr/libraries/Robot_Motor/Multiplexer.h b/libraries/Robot_Motor/Multiplexer.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Motor/Multiplexer.h
rename to libraries/Robot_Motor/Multiplexer.h
diff --git a/hardware/arduino/avr/libraries/Robot_Motor/examples/Robot_IR_Array_Test/Robot_IR_Array_Test.ino b/libraries/Robot_Motor/examples/Robot_IR_Array_Test/Robot_IR_Array_Test.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Motor/examples/Robot_IR_Array_Test/Robot_IR_Array_Test.ino
rename to libraries/Robot_Motor/examples/Robot_IR_Array_Test/Robot_IR_Array_Test.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Motor/examples/Robot_Motor_Core/Robot_Motor_Core.ino b/libraries/Robot_Motor/examples/Robot_Motor_Core/Robot_Motor_Core.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Motor/examples/Robot_Motor_Core/Robot_Motor_Core.ino
rename to libraries/Robot_Motor/examples/Robot_Motor_Core/Robot_Motor_Core.ino
diff --git a/hardware/arduino/avr/libraries/Robot_Motor/lineFollow.cpp b/libraries/Robot_Motor/lineFollow.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Robot_Motor/lineFollow.cpp
rename to libraries/Robot_Motor/lineFollow.cpp
diff --git a/hardware/arduino/avr/libraries/SPI/SPI.cpp b/libraries/SPI/arch/avr/SPI.cpp
similarity index 98%
rename from hardware/arduino/avr/libraries/SPI/SPI.cpp
rename to libraries/SPI/arch/avr/SPI.cpp
index 5e48073f7..5a37404df 100644
--- a/hardware/arduino/avr/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/arch/avr/SPI.cpp
@@ -9,7 +9,7 @@
  */
 
 #include "pins_arduino.h"
-#include "SPI.h"
+#include "SPI_Class.h"
 
 SPIClass SPI;
 
diff --git a/hardware/arduino/avr/libraries/SPI/SPI.h b/libraries/SPI/arch/avr/SPI_Class.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SPI/SPI.h
rename to libraries/SPI/arch/avr/SPI_Class.h
diff --git a/hardware/arduino/avr/libraries/SPI/keywords.txt b/libraries/SPI/arch/avr/keywords.txt
similarity index 100%
rename from hardware/arduino/avr/libraries/SPI/keywords.txt
rename to libraries/SPI/arch/avr/keywords.txt
diff --git a/hardware/arduino/sam/libraries/SPI/SPI.cpp b/libraries/SPI/arch/sam/SPI.cpp
similarity index 99%
rename from hardware/arduino/sam/libraries/SPI/SPI.cpp
rename to libraries/SPI/arch/sam/SPI.cpp
index 017ec4edb..7494c21e2 100644
--- a/hardware/arduino/sam/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/arch/sam/SPI.cpp
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation.
  */
 
-#include "SPI.h"
+#include "SPI_Class.h"
 
 SPIClass::SPIClass(Spi *_spi, uint32_t _id, void(*_initCb)(void)) :
 	spi(_spi), id(_id), initCb(_initCb)
diff --git a/hardware/arduino/sam/libraries/SPI/SPI.h b/libraries/SPI/arch/sam/SPI_Class.h
similarity index 100%
rename from hardware/arduino/sam/libraries/SPI/SPI.h
rename to libraries/SPI/arch/sam/SPI_Class.h
diff --git a/hardware/arduino/sam/libraries/SPI/keywords.txt b/libraries/SPI/arch/sam/keywords.txt
similarity index 100%
rename from hardware/arduino/sam/libraries/SPI/keywords.txt
rename to libraries/SPI/arch/sam/keywords.txt
diff --git a/hardware/arduino/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino b/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
rename to libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
diff --git a/hardware/arduino/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.ino b/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.ino
rename to libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.ino
diff --git a/hardware/arduino/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino b/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
rename to libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
diff --git a/libraries/SPI/library.properties b/libraries/SPI/library.properties
new file mode 100644
index 000000000..fd9195cbc
--- /dev/null
+++ b/libraries/SPI/library.properties
@@ -0,0 +1,11 @@
+
+name=SPI
+author=cmaglie
+email=Cristian Maglie <c.maglie@arduino.cc>
+sentence=With this library you can use the SPI interface of your Arduino board.
+paragraph=This library implements the standard function available for the SPI bus.
+url=http://arduino.cc/en/Reference/SPI
+architectures=avr, sam
+version=1.0
+dependencies= none
+core-dependencies=arduino (>=1.5.0)
diff --git a/libraries/SPI/src/SPI.h b/libraries/SPI/src/SPI.h
new file mode 100644
index 000000000..e1afcb432
--- /dev/null
+++ b/libraries/SPI/src/SPI.h
@@ -0,0 +1 @@
+#include <SPI_Class.h>