diff --git a/libraries/Robot_Control/library.properties b/libraries/Robot_Control/library.properties
index f4d18e818..f1ccf8213 100644
--- a/libraries/Robot_Control/library.properties
+++ b/libraries/Robot_Control/library.properties
@@ -1,10 +1,8 @@
 name=Robot Control
+version=1.0
 author=Arduino
-email=info@arduino.cc
+maintainer=Arduino <info@arduino.cc>
 sentence=This is the library for programming the Control Board of the Arduino Robot.
 paragraph=The Arduino robot is made by two independent boards. The Control Board is the top board of the Arduino Robot, with this library you can easily write sketches to control the robot.
 url=http://arduino.cc/en/Reference/RobotLibrary
 architectures=avr
-version=1.0
-dependencies=
-core-dependencies=arduino (>=1.5.0)
diff --git a/libraries/Robot_Control/arch/avr/ArduinoRobot.cpp b/libraries/Robot_Control/src/ArduinoRobot.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/ArduinoRobot.cpp
rename to libraries/Robot_Control/src/ArduinoRobot.cpp
diff --git a/libraries/Robot_Control/arch/avr/Arduino_LCD.cpp b/libraries/Robot_Control/src/Arduino_LCD.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Arduino_LCD.cpp
rename to libraries/Robot_Control/src/Arduino_LCD.cpp
diff --git a/libraries/Robot_Control/arch/avr/Arduino_LCD.h b/libraries/Robot_Control/src/Arduino_LCD.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Arduino_LCD.h
rename to libraries/Robot_Control/src/Arduino_LCD.h
diff --git a/libraries/Robot_Control/arch/avr/Compass.cpp b/libraries/Robot_Control/src/Compass.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Compass.cpp
rename to libraries/Robot_Control/src/Compass.cpp
diff --git a/libraries/Robot_Control/arch/avr/Compass.h b/libraries/Robot_Control/src/Compass.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Compass.h
rename to libraries/Robot_Control/src/Compass.h
diff --git a/libraries/Robot_Control/arch/avr/EEPROM_I2C.cpp b/libraries/Robot_Control/src/EEPROM_I2C.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/EEPROM_I2C.cpp
rename to libraries/Robot_Control/src/EEPROM_I2C.cpp
diff --git a/libraries/Robot_Control/arch/avr/EEPROM_I2C.h b/libraries/Robot_Control/src/EEPROM_I2C.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/EEPROM_I2C.h
rename to libraries/Robot_Control/src/EEPROM_I2C.h
diff --git a/libraries/Robot_Control/arch/avr/EasyTransfer2.cpp b/libraries/Robot_Control/src/EasyTransfer2.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/EasyTransfer2.cpp
rename to libraries/Robot_Control/src/EasyTransfer2.cpp
diff --git a/libraries/Robot_Control/arch/avr/EasyTransfer2.h b/libraries/Robot_Control/src/EasyTransfer2.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/EasyTransfer2.h
rename to libraries/Robot_Control/src/EasyTransfer2.h
diff --git a/libraries/Robot_Control/arch/avr/Fat16.cpp b/libraries/Robot_Control/src/Fat16.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Fat16.cpp
rename to libraries/Robot_Control/src/Fat16.cpp
diff --git a/libraries/Robot_Control/arch/avr/Fat16.h b/libraries/Robot_Control/src/Fat16.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Fat16.h
rename to libraries/Robot_Control/src/Fat16.h
diff --git a/libraries/Robot_Control/arch/avr/Fat16Config.h b/libraries/Robot_Control/src/Fat16Config.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Fat16Config.h
rename to libraries/Robot_Control/src/Fat16Config.h
diff --git a/libraries/Robot_Control/arch/avr/Fat16mainpage.h b/libraries/Robot_Control/src/Fat16mainpage.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Fat16mainpage.h
rename to libraries/Robot_Control/src/Fat16mainpage.h
diff --git a/libraries/Robot_Control/arch/avr/Fat16util.h b/libraries/Robot_Control/src/Fat16util.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Fat16util.h
rename to libraries/Robot_Control/src/Fat16util.h
diff --git a/libraries/Robot_Control/arch/avr/FatStructs.h b/libraries/Robot_Control/src/FatStructs.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/FatStructs.h
rename to libraries/Robot_Control/src/FatStructs.h
diff --git a/libraries/Robot_Control/arch/avr/Melody.cpp b/libraries/Robot_Control/src/Melody.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Melody.cpp
rename to libraries/Robot_Control/src/Melody.cpp
diff --git a/libraries/Robot_Control/arch/avr/Motors.cpp b/libraries/Robot_Control/src/Motors.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Motors.cpp
rename to libraries/Robot_Control/src/Motors.cpp
diff --git a/libraries/Robot_Control/arch/avr/Multiplexer.cpp b/libraries/Robot_Control/src/Multiplexer.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Multiplexer.cpp
rename to libraries/Robot_Control/src/Multiplexer.cpp
diff --git a/libraries/Robot_Control/arch/avr/Multiplexer.h b/libraries/Robot_Control/src/Multiplexer.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Multiplexer.h
rename to libraries/Robot_Control/src/Multiplexer.h
diff --git a/libraries/Robot_Control/arch/avr/RobotSdCard.cpp b/libraries/Robot_Control/src/RobotSdCard.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/RobotSdCard.cpp
rename to libraries/Robot_Control/src/RobotSdCard.cpp
diff --git a/libraries/Robot_Control/arch/avr/SPI.cpp b/libraries/Robot_Control/src/SPI.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/SPI.cpp
rename to libraries/Robot_Control/src/SPI.cpp
diff --git a/libraries/Robot_Control/arch/avr/SPI.h b/libraries/Robot_Control/src/SPI.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/SPI.h
rename to libraries/Robot_Control/src/SPI.h
diff --git a/libraries/Robot_Control/arch/avr/SdCard.cpp b/libraries/Robot_Control/src/SdCard.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/SdCard.cpp
rename to libraries/Robot_Control/src/SdCard.cpp
diff --git a/libraries/Robot_Control/arch/avr/SdCard.h b/libraries/Robot_Control/src/SdCard.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/SdCard.h
rename to libraries/Robot_Control/src/SdCard.h
diff --git a/libraries/Robot_Control/arch/avr/SdInfo.h b/libraries/Robot_Control/src/SdInfo.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/SdInfo.h
rename to libraries/Robot_Control/src/SdInfo.h
diff --git a/libraries/Robot_Control/arch/avr/Sensors.cpp b/libraries/Robot_Control/src/Sensors.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Sensors.cpp
rename to libraries/Robot_Control/src/Sensors.cpp
diff --git a/libraries/Robot_Control/arch/avr/Squawk.cpp b/libraries/Robot_Control/src/Squawk.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Squawk.cpp
rename to libraries/Robot_Control/src/Squawk.cpp
diff --git a/libraries/Robot_Control/arch/avr/Squawk.h b/libraries/Robot_Control/src/Squawk.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Squawk.h
rename to libraries/Robot_Control/src/Squawk.h
diff --git a/libraries/Robot_Control/arch/avr/SquawkSD.cpp b/libraries/Robot_Control/src/SquawkSD.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/SquawkSD.cpp
rename to libraries/Robot_Control/src/SquawkSD.cpp
diff --git a/libraries/Robot_Control/arch/avr/SquawkSD.h b/libraries/Robot_Control/src/SquawkSD.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/SquawkSD.h
rename to libraries/Robot_Control/src/SquawkSD.h
diff --git a/libraries/Robot_Control/arch/avr/Wire.cpp b/libraries/Robot_Control/src/Wire.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Wire.cpp
rename to libraries/Robot_Control/src/Wire.cpp
diff --git a/libraries/Robot_Control/arch/avr/Wire.h b/libraries/Robot_Control/src/Wire.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/Wire.h
rename to libraries/Robot_Control/src/Wire.h
diff --git a/libraries/Robot_Control/arch/avr/communication.cpp b/libraries/Robot_Control/src/communication.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/communication.cpp
rename to libraries/Robot_Control/src/communication.cpp
diff --git a/libraries/Robot_Control/arch/avr/glcdfont.c b/libraries/Robot_Control/src/glcdfont.c
similarity index 100%
rename from libraries/Robot_Control/arch/avr/glcdfont.c
rename to libraries/Robot_Control/src/glcdfont.c
diff --git a/libraries/Robot_Control/arch/avr/helper.cpp b/libraries/Robot_Control/src/helper.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/helper.cpp
rename to libraries/Robot_Control/src/helper.cpp
diff --git a/libraries/Robot_Control/arch/avr/information.cpp b/libraries/Robot_Control/src/information.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/information.cpp
rename to libraries/Robot_Control/src/information.cpp
diff --git a/libraries/Robot_Control/arch/avr/keyboard.cpp b/libraries/Robot_Control/src/keyboard.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/keyboard.cpp
rename to libraries/Robot_Control/src/keyboard.cpp
diff --git a/libraries/Robot_Control/arch/avr/lcd.cpp b/libraries/Robot_Control/src/lcd.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/lcd.cpp
rename to libraries/Robot_Control/src/lcd.cpp
diff --git a/libraries/Robot_Control/arch/avr/utility/Adafruit_GFX.cpp b/libraries/Robot_Control/src/utility/Adafruit_GFX.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/utility/Adafruit_GFX.cpp
rename to libraries/Robot_Control/src/utility/Adafruit_GFX.cpp
diff --git a/libraries/Robot_Control/arch/avr/utility/Adafruit_GFX.h b/libraries/Robot_Control/src/utility/Adafruit_GFX.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/utility/Adafruit_GFX.h
rename to libraries/Robot_Control/src/utility/Adafruit_GFX.h
diff --git a/libraries/Robot_Control/arch/avr/utility/RobotTextManager.cpp b/libraries/Robot_Control/src/utility/RobotTextManager.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/utility/RobotTextManager.cpp
rename to libraries/Robot_Control/src/utility/RobotTextManager.cpp
diff --git a/libraries/Robot_Control/arch/avr/utility/RobotTextManager.h b/libraries/Robot_Control/src/utility/RobotTextManager.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/utility/RobotTextManager.h
rename to libraries/Robot_Control/src/utility/RobotTextManager.h
diff --git a/libraries/Robot_Control/arch/avr/utility/VirtualKeyboard.cpp b/libraries/Robot_Control/src/utility/VirtualKeyboard.cpp
similarity index 100%
rename from libraries/Robot_Control/arch/avr/utility/VirtualKeyboard.cpp
rename to libraries/Robot_Control/src/utility/VirtualKeyboard.cpp
diff --git a/libraries/Robot_Control/arch/avr/utility/VirtualKeyboard.h b/libraries/Robot_Control/src/utility/VirtualKeyboard.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/utility/VirtualKeyboard.h
rename to libraries/Robot_Control/src/utility/VirtualKeyboard.h
diff --git a/libraries/Robot_Control/arch/avr/utility/scripts_Hello_User.h b/libraries/Robot_Control/src/utility/scripts_Hello_User.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/utility/scripts_Hello_User.h
rename to libraries/Robot_Control/src/utility/scripts_Hello_User.h
diff --git a/libraries/Robot_Control/arch/avr/utility/twi.c b/libraries/Robot_Control/src/utility/twi.c
similarity index 100%
rename from libraries/Robot_Control/arch/avr/utility/twi.c
rename to libraries/Robot_Control/src/utility/twi.c
diff --git a/libraries/Robot_Control/arch/avr/utility/twi.h b/libraries/Robot_Control/src/utility/twi.h
similarity index 100%
rename from libraries/Robot_Control/arch/avr/utility/twi.h
rename to libraries/Robot_Control/src/utility/twi.h