diff --git a/platformio.ini b/platformio.ini
index aead63d9..ad27e294 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -84,7 +84,7 @@ src_filter =
 upload_speed = 921600
 debug_init_break = tbreak setup
 build_flags =
-  ${env.build_flags} -Wall -Wextra
+  ${env.build_flags} -Wall -Wextra -Isrc/esp32
 lib_ignore = segger_rtt
 
 ; The 1.0 release of the TBEAM board
diff --git a/lib/BluetoothOTA/src/BluetoothSoftwareUpdate.cpp b/src/esp32/BluetoothSoftwareUpdate.cpp
similarity index 100%
rename from lib/BluetoothOTA/src/BluetoothSoftwareUpdate.cpp
rename to src/esp32/BluetoothSoftwareUpdate.cpp
diff --git a/lib/BluetoothOTA/src/BluetoothSoftwareUpdate.h b/src/esp32/BluetoothSoftwareUpdate.h
similarity index 100%
rename from lib/BluetoothOTA/src/BluetoothSoftwareUpdate.h
rename to src/esp32/BluetoothSoftwareUpdate.h
diff --git a/lib/BluetoothOTA/src/BluetoothUtil.cpp b/src/esp32/BluetoothUtil.cpp
similarity index 100%
rename from lib/BluetoothOTA/src/BluetoothUtil.cpp
rename to src/esp32/BluetoothUtil.cpp
diff --git a/lib/BluetoothOTA/src/BluetoothUtil.h b/src/esp32/BluetoothUtil.h
similarity index 100%
rename from lib/BluetoothOTA/src/BluetoothUtil.h
rename to src/esp32/BluetoothUtil.h
diff --git a/lib/BluetoothOTA/src/CallbackCharacteristic.h b/src/esp32/CallbackCharacteristic.h
similarity index 100%
rename from lib/BluetoothOTA/src/CallbackCharacteristic.h
rename to src/esp32/CallbackCharacteristic.h
diff --git a/lib/BluetoothOTA/src/SimpleAllocator.cpp b/src/esp32/SimpleAllocator.cpp
similarity index 100%
rename from lib/BluetoothOTA/src/SimpleAllocator.cpp
rename to src/esp32/SimpleAllocator.cpp
diff --git a/lib/BluetoothOTA/src/SimpleAllocator.h b/src/esp32/SimpleAllocator.h
similarity index 100%
rename from lib/BluetoothOTA/src/SimpleAllocator.h
rename to src/esp32/SimpleAllocator.h