diff --git a/hardware/arduino/sam/libraries/Audio/DAC.cpp b/libraries/Audio/arch/sam/DAC.cpp
similarity index 100%
rename from hardware/arduino/sam/libraries/Audio/DAC.cpp
rename to libraries/Audio/arch/sam/DAC.cpp
diff --git a/hardware/arduino/sam/libraries/Audio/DAC.h b/libraries/Audio/arch/sam/DAC.h
similarity index 100%
rename from hardware/arduino/sam/libraries/Audio/DAC.h
rename to libraries/Audio/arch/sam/DAC.h
diff --git a/hardware/arduino/sam/libraries/Audio/examples/SimpleAudioPlayer/SimpleAudioPlayer.ino b/libraries/Audio/examples/SimpleAudioPlayer/SimpleAudioPlayer.ino
similarity index 100%
rename from hardware/arduino/sam/libraries/Audio/examples/SimpleAudioPlayer/SimpleAudioPlayer.ino
rename to libraries/Audio/examples/SimpleAudioPlayer/SimpleAudioPlayer.ino
diff --git a/hardware/arduino/sam/libraries/Audio/keywords.txt b/libraries/Audio/keywords.txt
similarity index 100%
rename from hardware/arduino/sam/libraries/Audio/keywords.txt
rename to libraries/Audio/keywords.txt
diff --git a/libraries/Audio/library.properties b/libraries/Audio/library.properties
new file mode 100644
index 000000000..03127a1e6
--- /dev/null
+++ b/libraries/Audio/library.properties
@@ -0,0 +1,10 @@
+name=Audio
+author=cmaglie
+email=Cristian Maglie <c.maglie@bug.st>
+sentence=The libary to play audio files through the DAC outputs of the Arduino Due.
+paragraph=With this library you can use the Arduino Due DAC outputs to play audio files.<br />The audio files must be in the raw .wav format.
+url=http://arduino.cc/en/Reference/Audio
+architectures=sam
+version=1.0
+dependencies=
+core-dependencies=arduino (>=1.5.0)
diff --git a/hardware/arduino/sam/libraries/Audio/Audio.cpp b/libraries/Audio/src/Audio.cpp
similarity index 100%
rename from hardware/arduino/sam/libraries/Audio/Audio.cpp
rename to libraries/Audio/src/Audio.cpp
diff --git a/hardware/arduino/sam/libraries/Audio/Audio.h b/libraries/Audio/src/Audio.h
similarity index 100%
rename from hardware/arduino/sam/libraries/Audio/Audio.h
rename to libraries/Audio/src/Audio.h
diff --git a/libraries/SD/library.properties b/libraries/SD/library.properties
index beaabacf3..8f274ad14 100644
--- a/libraries/SD/library.properties
+++ b/libraries/SD/library.properties
@@ -1,10 +1,10 @@
 name=SD
 author=SparkFun Electronics
 email=info@arduino.cc
-sentence=The libary to use the Arduino Ethernet shield or the Arduino Ethernet based on the WizNet W5100 ic.
-paragraph=With this library you can use the Arduino Ethernet (shield or board) to connect to Internet. The library provides both Client and server functionalities. The library permits you to connect to a local network also with DHCP and to resolve DNS.
+sentence=With this library you can use an SD card to save data and operate on files.
+paragraph=Once an SD memory card is connected to the SPI interfare of the Arduino board you are enabled to create files and read/write on them. You can also move through directories on the SD card.
 url=http://arduino.cc/en/Reference/SD
-architectures=avr, sam
+architectures=*
 version=1.0
-dependencies= IPAddress, SPI
+dependencies= SPI
 core-dependencies=arduino (>=1.5.0)
diff --git a/libraries/SD/src/utility/SdFile.cpp b/libraries/SD/src/utility/SdFile.cpp
index c19500e59..e7b6f0971 100644
--- a/libraries/SD/src/utility/SdFile.cpp
+++ b/libraries/SD/src/utility/SdFile.cpp
@@ -17,7 +17,7 @@
  * along with the Arduino SdFat Library.  If not, see
  * <http://www.gnu.org/licenses/>.
  */
-#include <SdFat.h>
+#include "SdFat.h"
 #ifdef __AVR__
 #include <avr/pgmspace.h>
 #endif
diff --git a/libraries/SD/src/utility/SdVolume.cpp b/libraries/SD/src/utility/SdVolume.cpp
index ece4acbac..2fbb8100b 100644
--- a/libraries/SD/src/utility/SdVolume.cpp
+++ b/libraries/SD/src/utility/SdVolume.cpp
@@ -17,7 +17,7 @@
  * along with the Arduino SdFat Library.  If not, see
  * <http://www.gnu.org/licenses/>.
  */
-#include <SdFat.h>
+#include "SdFat.h"
 //------------------------------------------------------------------------------
 // raw block cache
 // init cacheBlockNumber_to invalid SD block number
diff --git a/libraries/Servo/library.properties b/libraries/Servo/library.properties
index 72d8bf6fc..40b038c36 100644
--- a/libraries/Servo/library.properties
+++ b/libraries/Servo/library.properties
@@ -2,8 +2,8 @@ name=Servo
 author=cmaglie
 email=Cristian Maglie <c.maglie@bug.st>
 sentence=Controls a lot of Servos.
-paragraph=This library can control a great number of servos.<br />It makes careful use of timers: the library can control 12 servos with only 1 timer!<br />
-url=http://github.com/cmaglie/Servo
+paragraph=This library can control a great number of servos.<br />It makes careful use of timers: the library can control 12 servos with only 1 timer!<br />On the Arduino Due you can control up to 60 servos.<br />
+url=http://arduino.cc/en/Reference/Servo
 architectures=avr,sam
 version=1.0
 dependencies=