diff --git a/libraries/EEPROM/arch/avr/EEPROM.cpp b/hardware/arduino/avr/libraries/EEPROM/EEPROM.cpp
similarity index 100%
rename from libraries/EEPROM/arch/avr/EEPROM.cpp
rename to hardware/arduino/avr/libraries/EEPROM/EEPROM.cpp
diff --git a/libraries/EEPROM/src/EEPROM.h b/hardware/arduino/avr/libraries/EEPROM/EEPROM.h
similarity index 100%
rename from libraries/EEPROM/src/EEPROM.h
rename to hardware/arduino/avr/libraries/EEPROM/EEPROM.h
diff --git a/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino b/hardware/arduino/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
similarity index 100%
rename from libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
rename to hardware/arduino/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
diff --git a/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino b/hardware/arduino/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
similarity index 100%
rename from libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
rename to hardware/arduino/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
diff --git a/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino b/hardware/arduino/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
similarity index 100%
rename from libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
rename to hardware/arduino/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
diff --git a/libraries/EEPROM/keywords.txt b/hardware/arduino/avr/libraries/EEPROM/keywords.txt
similarity index 100%
rename from libraries/EEPROM/keywords.txt
rename to hardware/arduino/avr/libraries/EEPROM/keywords.txt
diff --git a/libraries/EEPROM/library.properties b/libraries/EEPROM/library.properties
deleted file mode 100644
index 9aae53767..000000000
--- a/libraries/EEPROM/library.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-name=EEPROM
-author=Arduino
-email=info@arduino.cc
-sentence=Read/Write the EEPROM memory on the AVR-based Arduino boards.
-paragraph=With this library you can read and write bytes to the EEPROM memory, that is available on the AVR microcontrollers mounted on the Arduino boards.
-url=http://arduino.cc/en/Reference/EEPROM
-architectures=avr
-version=1.0
-dependencies=
-core-dependencies=arduino (>=1.5.0)