diff --git a/CMakeLists.txt b/CMakeLists.txt
index d59a8b8e210..227a5568638 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ set(LIBRARY_SRCS
   libraries/AsyncUDP/src/AsyncUDP.cpp
   libraries/BluetoothSerial/src/BluetoothSerial.cpp
   libraries/DNSServer/src/DNSServer.cpp
-  libraries/EEPROM/EEPROM.cpp
+  libraries/EEPROM/src/EEPROM.cpp
   libraries/ESPmDNS/src/ESPmDNS.cpp
   libraries/FFat/src/FFat.cpp
   libraries/FS/src/FS.cpp
@@ -181,6 +181,7 @@ set(COMPONENT_ADD_INCLUDEDIRS
   libraries/BLE/src
   libraries/BluetoothSerial/src
   libraries/DNSServer/src
+  libraries/EEPROM/src
   libraries/ESP32/src
   libraries/ESPmDNS/src
   libraries/FFat/src
diff --git a/libraries/EEPROM/EEPROM.cpp b/libraries/EEPROM/src/EEPROM.cpp
similarity index 100%
rename from libraries/EEPROM/EEPROM.cpp
rename to libraries/EEPROM/src/EEPROM.cpp
diff --git a/libraries/EEPROM/EEPROM.h b/libraries/EEPROM/src/EEPROM.h
similarity index 100%
rename from libraries/EEPROM/EEPROM.h
rename to libraries/EEPROM/src/EEPROM.h