diff --git a/libraries/CurieTimerOne/CurieTimerOne.cpp b/libraries/CurieTimerOne/src/CurieTimerOne.cpp
similarity index 100%
rename from libraries/CurieTimerOne/CurieTimerOne.cpp
rename to libraries/CurieTimerOne/src/CurieTimerOne.cpp
diff --git a/libraries/CurieTimerOne/CurieTimerOne.h b/libraries/CurieTimerOne/src/CurieTimerOne.h
similarity index 100%
rename from libraries/CurieTimerOne/CurieTimerOne.h
rename to libraries/CurieTimerOne/src/CurieTimerOne.h
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/src/SPI.cpp
similarity index 100%
rename from libraries/SPI/SPI.cpp
rename to libraries/SPI/src/SPI.cpp
diff --git a/libraries/SPI/SPI.h b/libraries/SPI/src/SPI.h
similarity index 100%
rename from libraries/SPI/SPI.h
rename to libraries/SPI/src/SPI.h
diff --git a/libraries/SPI/SPI_registers.h b/libraries/SPI/src/SPI_registers.h
similarity index 100%
rename from libraries/SPI/SPI_registers.h
rename to libraries/SPI/src/SPI_registers.h
diff --git a/libraries/Servo/Servo.cpp b/libraries/Servo/src/Servo.cpp
similarity index 100%
rename from libraries/Servo/Servo.cpp
rename to libraries/Servo/src/Servo.cpp
diff --git a/libraries/Servo/Servo.h b/libraries/Servo/src/Servo.h
similarity index 100%
rename from libraries/Servo/Servo.h
rename to libraries/Servo/src/Servo.h
diff --git a/libraries/Wire/libraries.properties b/libraries/Wire/library.properties
similarity index 100%
rename from libraries/Wire/libraries.properties
rename to libraries/Wire/library.properties
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/src/Wire.cpp
similarity index 100%
rename from libraries/Wire/Wire.cpp
rename to libraries/Wire/src/Wire.cpp
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/src/Wire.h
similarity index 100%
rename from libraries/Wire/Wire.h
rename to libraries/Wire/src/Wire.h