diff --git a/hardware/arduino/avr/libraries/SD/File.cpp b/libraries/SD/File.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/File.cpp
rename to libraries/SD/File.cpp
diff --git a/hardware/arduino/avr/libraries/SD/README.txt b/libraries/SD/README.txt
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/README.txt
rename to libraries/SD/README.txt
diff --git a/hardware/arduino/avr/libraries/SD/SD.cpp b/libraries/SD/SD.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/SD.cpp
rename to libraries/SD/SD.cpp
diff --git a/hardware/arduino/avr/libraries/SD/SD.h b/libraries/SD/SD.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/SD.h
rename to libraries/SD/SD.h
diff --git a/hardware/arduino/avr/libraries/SD/examples/CardInfo/CardInfo.ino b/libraries/SD/examples/CardInfo/CardInfo.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/examples/CardInfo/CardInfo.ino
rename to libraries/SD/examples/CardInfo/CardInfo.ino
diff --git a/hardware/arduino/avr/libraries/SD/examples/Datalogger/Datalogger.ino b/libraries/SD/examples/Datalogger/Datalogger.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/examples/Datalogger/Datalogger.ino
rename to libraries/SD/examples/Datalogger/Datalogger.ino
diff --git a/hardware/arduino/avr/libraries/SD/examples/DumpFile/DumpFile.ino b/libraries/SD/examples/DumpFile/DumpFile.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/examples/DumpFile/DumpFile.ino
rename to libraries/SD/examples/DumpFile/DumpFile.ino
diff --git a/hardware/arduino/avr/libraries/SD/examples/Files/Files.ino b/libraries/SD/examples/Files/Files.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/examples/Files/Files.ino
rename to libraries/SD/examples/Files/Files.ino
diff --git a/hardware/arduino/avr/libraries/SD/examples/ReadWrite/ReadWrite.ino b/libraries/SD/examples/ReadWrite/ReadWrite.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/examples/ReadWrite/ReadWrite.ino
rename to libraries/SD/examples/ReadWrite/ReadWrite.ino
diff --git a/hardware/arduino/avr/libraries/SD/examples/listfiles/listfiles.ino b/libraries/SD/examples/listfiles/listfiles.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/examples/listfiles/listfiles.ino
rename to libraries/SD/examples/listfiles/listfiles.ino
diff --git a/hardware/arduino/avr/libraries/SD/keywords.txt b/libraries/SD/keywords.txt
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/keywords.txt
rename to libraries/SD/keywords.txt
diff --git a/hardware/arduino/avr/libraries/SD/utility/FatStructs.h b/libraries/SD/utility/FatStructs.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/utility/FatStructs.h
rename to libraries/SD/utility/FatStructs.h
diff --git a/hardware/arduino/avr/libraries/SD/utility/Sd2Card.cpp b/libraries/SD/utility/Sd2Card.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/utility/Sd2Card.cpp
rename to libraries/SD/utility/Sd2Card.cpp
diff --git a/hardware/arduino/avr/libraries/SD/utility/Sd2Card.h b/libraries/SD/utility/Sd2Card.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/utility/Sd2Card.h
rename to libraries/SD/utility/Sd2Card.h
diff --git a/hardware/arduino/avr/libraries/SD/utility/Sd2PinMap.h b/libraries/SD/utility/Sd2PinMap.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/utility/Sd2PinMap.h
rename to libraries/SD/utility/Sd2PinMap.h
diff --git a/hardware/arduino/avr/libraries/SD/utility/SdFat.h b/libraries/SD/utility/SdFat.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/utility/SdFat.h
rename to libraries/SD/utility/SdFat.h
diff --git a/hardware/arduino/avr/libraries/SD/utility/SdFatUtil.h b/libraries/SD/utility/SdFatUtil.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/utility/SdFatUtil.h
rename to libraries/SD/utility/SdFatUtil.h
diff --git a/hardware/arduino/avr/libraries/SD/utility/SdFatmainpage.h b/libraries/SD/utility/SdFatmainpage.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/utility/SdFatmainpage.h
rename to libraries/SD/utility/SdFatmainpage.h
diff --git a/hardware/arduino/avr/libraries/SD/utility/SdFile.cpp b/libraries/SD/utility/SdFile.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/utility/SdFile.cpp
rename to libraries/SD/utility/SdFile.cpp
diff --git a/hardware/arduino/avr/libraries/SD/utility/SdInfo.h b/libraries/SD/utility/SdInfo.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/utility/SdInfo.h
rename to libraries/SD/utility/SdInfo.h
diff --git a/hardware/arduino/avr/libraries/SD/utility/SdVolume.cpp b/libraries/SD/utility/SdVolume.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/SD/utility/SdVolume.cpp
rename to libraries/SD/utility/SdVolume.cpp
diff --git a/libraries/keep b/libraries/keep
deleted file mode 100644
index 139597f9c..000000000
--- a/libraries/keep
+++ /dev/null
@@ -1,2 +0,0 @@
-
-