diff --git a/hardware/arduino/avr/libraries/HID/HID.cpp b/hardware/arduino/avr/libraries/HID/src/HID.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/HID/HID.cpp
rename to hardware/arduino/avr/libraries/HID/src/HID.cpp
diff --git a/hardware/arduino/avr/libraries/HID/HID.h b/hardware/arduino/avr/libraries/HID/src/HID.h
similarity index 100%
rename from hardware/arduino/avr/libraries/HID/HID.h
rename to hardware/arduino/avr/libraries/HID/src/HID.h
diff --git a/hardware/arduino/avr/libraries/SPI/SPI.cpp b/hardware/arduino/avr/libraries/SPI/src/SPI.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/SPI/SPI.cpp
rename to hardware/arduino/avr/libraries/SPI/src/SPI.cpp
diff --git a/hardware/arduino/avr/libraries/SPI/SPI.h b/hardware/arduino/avr/libraries/SPI/src/SPI.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SPI/SPI.h
rename to hardware/arduino/avr/libraries/SPI/src/SPI.h
diff --git a/hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp b/hardware/arduino/avr/libraries/SoftwareSerial/src/SoftwareSerial.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
rename to hardware/arduino/avr/libraries/SoftwareSerial/src/SoftwareSerial.cpp
diff --git a/hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.h b/hardware/arduino/avr/libraries/SoftwareSerial/src/SoftwareSerial.h
similarity index 100%
rename from hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.h
rename to hardware/arduino/avr/libraries/SoftwareSerial/src/SoftwareSerial.h
diff --git a/hardware/arduino/avr/libraries/Wire/Wire.cpp b/hardware/arduino/avr/libraries/Wire/src/Wire.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Wire/Wire.cpp
rename to hardware/arduino/avr/libraries/Wire/src/Wire.cpp
diff --git a/hardware/arduino/avr/libraries/Wire/Wire.h b/hardware/arduino/avr/libraries/Wire/src/Wire.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Wire/Wire.h
rename to hardware/arduino/avr/libraries/Wire/src/Wire.h
diff --git a/hardware/arduino/sam/libraries/HID/HID.cpp b/hardware/arduino/sam/libraries/HID/src/HID.cpp
similarity index 100%
rename from hardware/arduino/sam/libraries/HID/HID.cpp
rename to hardware/arduino/sam/libraries/HID/src/HID.cpp
diff --git a/hardware/arduino/sam/libraries/HID/HID.h b/hardware/arduino/sam/libraries/HID/src/HID.h
similarity index 100%
rename from hardware/arduino/sam/libraries/HID/HID.h
rename to hardware/arduino/sam/libraries/HID/src/HID.h
diff --git a/hardware/arduino/sam/libraries/SPI/SPI.cpp b/hardware/arduino/sam/libraries/SPI/src/SPI.cpp
similarity index 100%
rename from hardware/arduino/sam/libraries/SPI/SPI.cpp
rename to hardware/arduino/sam/libraries/SPI/src/SPI.cpp
diff --git a/hardware/arduino/sam/libraries/SPI/SPI.h b/hardware/arduino/sam/libraries/SPI/src/SPI.h
similarity index 100%
rename from hardware/arduino/sam/libraries/SPI/SPI.h
rename to hardware/arduino/sam/libraries/SPI/src/SPI.h
diff --git a/hardware/arduino/sam/libraries/Wire/Wire.cpp b/hardware/arduino/sam/libraries/Wire/src/Wire.cpp
similarity index 100%
rename from hardware/arduino/sam/libraries/Wire/Wire.cpp
rename to hardware/arduino/sam/libraries/Wire/src/Wire.cpp
diff --git a/hardware/arduino/sam/libraries/Wire/Wire.h b/hardware/arduino/sam/libraries/Wire/src/Wire.h
similarity index 100%
rename from hardware/arduino/sam/libraries/Wire/Wire.h
rename to hardware/arduino/sam/libraries/Wire/src/Wire.h